dataclassdb 0.1.0__tar.gz → 0.1.2__tar.gz

{dataclassdb-0.1.0/src/dataclassdb.egg-info → dataclassdb-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataclassdb
-Version: 0.1.0
+Version: 0.1.2
 Summary: This module provides a lightweight sqlite3 ORM using normal dataclass.
 Author-email: "@stuarts-art" <stuartsartemail@gmail.com>
 Maintainer-email: "@stuarts-art" <stuartsartemail@gmail.com>

{dataclassdb-0.1.0 → dataclassdb-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dataclassdb"
-version = "0.1.0"
+version = "0.1.2"
 description = "This module provides a lightweight sqlite3 ORM using normal dataclass."
 readme = "README.md"
 requires-python = ">=3.11"

{dataclassdb-0.1.0 → dataclassdb-0.1.2}/src/dataclassdb/dataclass_db.py

@@ -252,7 +252,7 @@ class DataclassDb(QueryBuilder):
                 )
                 self.execute_script(sql_script=str(query))
             logger.info(
-                "Table creation for %s successful.", self.table_name, overlapping_fields
+                "Table creation for %s successful with overlapping fields %s", self.table_name, overlapping_fields
             )
         else:
             logger.info("Table has not changed.")

{dataclassdb-0.1.0 → dataclassdb-0.1.2}/src/dataclassdb/dataclass_field_codec.py

@@ -8,18 +8,14 @@ from typing import Any, TypeVar, Union, get_args, get_origin
 import dacite
 
 from dataclassdb.dataclass_types import Codec, IsDataclass
-from dataclassdb.utils import is_enum_class, is_strenum
+from dataclassdb.utils import get_absolute_origin, is_enum_class, is_strenum
 
 logger = logging.getLogger(__name__)
 
 DataclassT = TypeVar("DataclassT", bound=IsDataclass)
 T = TypeVar("T")
 def create_field_codec(field_class: T, sql_type: str) -> Codec:
-    if origin := get_origin(field_class):
-        if origin is Union:
-            field_class = get_args(field_class)[0]
-        else:
-            field_class = origin
+    field_class = get_absolute_origin(field_class)
 
     if sql_type == "BLOB":
         if dataclasses.is_dataclass(field_class):

{dataclassdb-0.1.0 → dataclassdb-0.1.2}/src/dataclassdb/dataclass_sqlite_field.py

@@ -9,6 +9,7 @@ from typing import Annotated, Union, get_args, get_origin
 from dataclassdb.builders.query_builder import QueryBuilder
 from dataclassdb.dataclass_field_codec import create_field_codec
 from dataclassdb.dataclass_types import Codec
+from dataclassdb.utils import get_absolute_origin
 
 logger = logging.getLogger(__name__)
 
@@ -135,31 +136,18 @@ class DataclassSqliteField:
         if self.type_override:
             return
 
-        if origin := get_origin(field_type):
-            if origin is Union:
-                field_type = get_args(field_type)[0]
-                self.origin = field_type
-            else:
-                field_type = origin
-                self.origin = field_type
+        self.origin = get_absolute_origin(field_type)
 
-        if inspect.isclass(self.type) and issubclass(field_type, set):
+        if inspect.isclass(self.origin) and issubclass(self.origin, set):
             raise TypeError(
                 "Sets cannot be encoded as text. Either override the type to BLOB, "
                 "override the codec, or change the datatype."
             )
 
         for mapped_type in self._type_map:
-            if issubclass(field_type, mapped_type):
-                # if isinstance(field_type, mapped_type):
-                # if issubclass(field_type, mapped_type):
+            if issubclass(self.origin, mapped_type):
                 self.sql_type = self._type_map[mapped_type]
                 break
-            # if inspect.isclass(field_type):
-            # else:
-            #     if isinstance(field_type, mapped_type):
-            #         self.sql_type = self._type_map[mapped_type]
-            #         break
 
     def parse_default(self, dc_field):
         if dc_field.default_factory is not MISSING:

{dataclassdb-0.1.0 → dataclassdb-0.1.2}/src/dataclassdb/utils.py

@@ -2,7 +2,7 @@ import logging
 import sqlite3
 from dataclasses import dataclass
 from enum import Enum, StrEnum
-from typing import Any, ClassVar
+from typing import Annotated, Any, ClassVar, Union, get_args, get_origin
 
 import dacite
 
@@ -17,6 +17,18 @@ class UpperStrEnum(StrEnum):
         return name.upper().replace("_", " ")
 
 
+def get_absolute_origin(field_type):
+    if origin := get_origin(field_type):
+        args = get_args(field_type)
+        if origin is Union:
+            return get_absolute_origin(args[0])
+        elif origin is Annotated:
+            return get_absolute_origin(args[0])
+        else:
+            return origin
+    return field_type
+
+
 def table_exists(connection: sqlite3.Connection, table_name):
     cursor = connection.cursor()
     cursor.execute(

{dataclassdb-0.1.0 → dataclassdb-0.1.2/src/dataclassdb.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataclassdb
-Version: 0.1.0
+Version: 0.1.2
 Summary: This module provides a lightweight sqlite3 ORM using normal dataclass.
 Author-email: "@stuarts-art" <stuartsartemail@gmail.com>
 Maintainer-email: "@stuarts-art" <stuartsartemail@gmail.com>

{dataclassdb-0.1.0 → dataclassdb-0.1.2}/tests/test_dataclass_db.py

@@ -16,7 +16,7 @@ class Example_Dataclass:
     score: int = 0
     tags: Annotated[list, "TEXT"] = field(default_factory=list)
     connections: Annotated[dict, "BLOB"] = field(default_factory=dict)
-
+    extras: list[str] | None = None
 
 @dataclass
 class XOR_Example_Dataclass:

{dataclassdb-0.1.0 → dataclassdb-0.1.2}/tests/test_utils.py

@@ -1,6 +1,12 @@
 from enum import Enum, StrEnum
+from typing import Annotated
 
-from dataclassdb.utils import is_enum_class, is_strenum, table_exists
+from dataclassdb.utils import (
+    get_absolute_origin,
+    is_enum_class,
+    is_strenum,
+    table_exists,
+)
 
 
 def test_table_exists(db_mem_connection):
@@ -28,3 +34,10 @@ def test_is_enum(db_mem_connection):
     for t in [str, int, list, dict, list[str]]:
         assert not is_enum_class(t)
         assert not is_strenum(t)
+
+
+def test_get_absolute_origin():
+    assert get_absolute_origin(list[str]) is list
+    assert get_absolute_origin(list[str] | None) is list
+    assert get_absolute_origin(Annotated[list[str], "str"]) is list
+    assert get_absolute_origin(Annotated[list[str] | None, "str"]) is list