diff --git a/src/zot/table/attachments.py b/src/zot/table/attachments.py index 1c01d5a..b41b001 100644 --- a/src/zot/table/attachments.py +++ b/src/zot/table/attachments.py @@ -68,6 +68,8 @@ class ItemAnnotations(SQLTable): sortIndex: str | None = None position: str | None = None isExternal: int | None = None + textNormalized: str | None = None + commentNormalized: str | None = None class RetractedItems(SQLTable): diff --git a/src/zot/table/collections.py b/src/zot/table/collections.py index be42c2f..1f4e252 100644 --- a/src/zot/table/collections.py +++ b/src/zot/table/collections.py @@ -24,6 +24,7 @@ class Collections(SQLTable): key: str version: int = 0 synced: int = 0 + clientVersion: int = 0 class CollectionItems(SQLTable): diff --git a/src/zot/table/core.py b/src/zot/table/core.py index f6f6668..b025faf 100644 --- a/src/zot/table/core.py +++ b/src/zot/table/core.py @@ -32,6 +32,7 @@ class Libraries(SQLTable): lastSync: int = 0 archived: int = 0 isAdmin: int = 0 + clientVersion: int = 0 class Items(SQLTable): @@ -48,6 +49,7 @@ class Items(SQLTable): key: str version: int = 0 synced: int = 0 + clientVersion: int = 0 class ItemTypes(SQLTable): diff --git a/src/zot/table/creators.py b/src/zot/table/creators.py index 77081ad..9d563a8 100644 --- a/src/zot/table/creators.py +++ b/src/zot/table/creators.py @@ -21,6 +21,8 @@ class Creators(SQLTable): firstName: str | None = None lastName: str | None = None fieldMode: int | None = None + firstNameNormalized: str | None = None + lastNameNormalized: str | None = None class CreatorTypes(SQLTable): diff --git a/src/zot/table/fields.py b/src/zot/table/fields.py index 449d11d..4b83004 100644 --- a/src/zot/table/fields.py +++ b/src/zot/table/fields.py @@ -70,6 +70,7 @@ class ItemDataValues(SQLTable): valueID: int | None = None value: str | int | float | None = None + valueNormalized: str | None = None class ItemTypeFields(SQLTable): diff --git a/src/zot/table/search.py b/src/zot/table/search.py index 321424d..2a25553 100644 --- a/src/zot/table/search.py +++ b/src/zot/table/search.py @@ -5,9 +5,7 @@ from __future__ import annotations from conf.table_base import SQLTable __all__ = [ - "FulltextWords", "FulltextItems", - "FulltextItemWords", "SavedSearches", "SavedSearchConditions", "FileTypes", @@ -16,15 +14,6 @@ __all__ = [ ] -class FulltextWords(SQLTable): - """Zotero table ``fulltextWords`` (98,514 rows in host DB).""" - - __tablename__ = "fulltextWords" - - wordID: int | None = None - word: str | None = None - - class FulltextItems(SQLTable): """Zotero table ``fulltextItems`` (2,083 rows in host DB).""" @@ -39,15 +28,6 @@ class FulltextItems(SQLTable): synced: int = 0 -class FulltextItemWords(SQLTable): - """Zotero table ``fulltextItemWords`` (2,048,235 rows in host DB).""" - - __tablename__ = "fulltextItemWords" - - wordID: int | None = None - itemID: int | None = None - - class SavedSearches(SQLTable): """Zotero table ``savedSearches`` (3 rows in host DB).""" @@ -60,6 +40,7 @@ class SavedSearches(SQLTable): key: str version: int = 0 synced: int = 0 + clientVersion: int = 0 class SavedSearchConditions(SQLTable): @@ -72,7 +53,6 @@ class SavedSearchConditions(SQLTable): condition: str operator: str | None = None value: str | None = None - required: str | int | float | None = None class FileTypes(SQLTable): diff --git a/src/zot/table/tags.py b/src/zot/table/tags.py index 358f980..6323742 100644 --- a/src/zot/table/tags.py +++ b/src/zot/table/tags.py @@ -17,6 +17,7 @@ class Tags(SQLTable): tagID: int | None = None name: str + nameNormalized: str | None = None class ItemTags(SQLTable): diff --git a/tests/zot/test_table.py b/tests/zot/test_table.py index 73bb92b..0abdc96 100644 --- a/tests/zot/test_table.py +++ b/tests/zot/test_table.py @@ -62,9 +62,8 @@ class TestImports: assert issubclass(ItemAnnotations, SQLTable) def test_search(self): - from zot.table.search import FulltextItems, FulltextWords, SavedSearches + from zot.table.search import FulltextItems, SavedSearches - assert issubclass(FulltextWords, SQLTable) assert issubclass(FulltextItems, SQLTable) assert issubclass(SavedSearches, SQLTable) @@ -87,7 +86,7 @@ class TestImports: and issubclass(getattr(zt, name), SQLTable) and getattr(zt, name) is not SQLTable ] - assert len(models) == 61 + assert len(models) == 59 # ── Model correctness ───────────────────────────────────────────────