dataclassdb 0.1.2__tar.gz → 0.1.3__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataclassdb
-Version: 0.1.2
+Version: 0.1.3
 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.2 → dataclassdb-0.1.3}/pyproject.toml

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

{dataclassdb-0.1.2 → dataclassdb-0.1.3}/src/dataclassdb/builders/query_builder.py

@@ -107,7 +107,21 @@ class QueryBuilder(DbEngine, StatementBuilder, FunctionBuilder):
         if not row:
             return []
 
-        cols = row[0].split("(", 1)[-1].rsplit(")", 1)[0].split(",")
+        cols_str: str = row[0].split("(", 1)[-1].rsplit(")", 1)[0]
+        cols = []
+        l_count = 0
+        last = 0
+        for i in range(len(cols_str)):
+            c = cols_str[i]
+            if c == "(":
+                l_count += 1
+            elif c == ")":
+                l_count -= 1
+            elif c == "," and l_count == 0:
+                cols.append(cols_str[last:i])
+                last = i + 1
+        if last < len(cols_str):
+            cols.append(cols_str[last:])
         cols = [col.replace("\n", "").strip() for col in cols]
         return cols
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataclassdb
-Version: 0.1.2
+Version: 0.1.3
 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.2 → dataclassdb-0.1.3}/src/dataclassdb.egg-info/SOURCES.txt

@@ -22,6 +22,7 @@ src/dataclassdb/builders/statement_builder.py
 src/dataclassdb/builders/string_builder.py
 tests/test_annotation_parsing.py
 tests/test_builders.py
+tests/test_current_cols.py
 tests/test_custom_codec.py
 tests/test_dataclass_db.py
 tests/test_dataclass_field_codec.py

dataclassdb-0.1.3/tests/test_current_cols.py

@@ -0,0 +1,59 @@
+from typing import Annotated
+
+import pytest
+from dataclasses import dataclass
+
+from dataclassdb.dataclass_db import DataclassDb
+
+
+
+@dataclass
+class No_Constraints:
+    id: int
+    name: str
+
+@dataclass
+class Multiple_Unique:
+    id: int
+    first_name: Annotated[str, "UNIQUE"]
+    last_name: Annotated[str, "UNIQUE"]
+
+@dataclass
+class Multiple_Primary:
+    id: Annotated[int, "PRIMARY KEY"]
+    region: Annotated[str, "PRIMARY KEY"]
+    name: str
+    # first_name: Annotated[str, "UNIQUE"]
+    # last_name: Annotated[str, "UNIQUE"]
+
+@dataclass
+class Multiple_Primary_and_Unique:
+    id: Annotated[int, "PRIMARY KEY"]
+    region: Annotated[str, "PRIMARY KEY"]
+    first_name: Annotated[str, "UNIQUE"]
+    last_name: Annotated[str, "UNIQUE"]
+
+@pytest.mark.parametrize(
+    "data_class, field_count", 
+    [
+        (No_Constraints, 2),
+        (Multiple_Unique, 4),
+        (Multiple_Primary, 4),
+        (Multiple_Primary_and_Unique, 6),
+    ],
+)
+def test_no_constraints(data_class, field_count, db_mem_connection):
+    with DataclassDb(data_class, db_mem_connection) as db:
+        assert len(db.get_curr_cols(db.data_class)) == field_count
+        assert len(db.dataclass_sql_cols()) == field_count
+
+        assert db.get_curr_cols(db.data_class) == db.dataclass_sql_cols()
+
+
+    
+
+
+
+
+
+