sqlite-database 0.7.5__tar.gz → 0.7.7__tar.gz

{sqlite_database-0.7.5/sqlite_database.egg-info → sqlite_database-0.7.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlite_database
-Version: 0.7.5
+Version: 0.7.7
 Summary: A weird wrapper for SQLite Connection
 Home-page: https://github.com/RimuEirnarn/sqlite_database
 Author: RimuEirnarn

{sqlite_database-0.7.5 → sqlite_database-0.7.7}/sqlite_database/__init__.py

@@ -2,7 +2,7 @@
 
 from .models import BaseModel, model, Foreign, Primary, Unique, hook, validate
 from .database import Database
-from ._utils import null, Row, Null
+from ._utils import Row, Null
 from .column import Column, text, integer, blob, real
 from .signature import op
 from .operators import this
@@ -14,14 +14,13 @@ def test_installed():
     return True
 
 
-__version__ = "0.7.5"
+__version__ = "0.7.7"
 __all__ = [
     "Database",
     "Table",
     "this",
     "op",
     "Column",
-    "null",
     "Null",
     "Row",
     "text",

{sqlite_database-0.7.5 → sqlite_database-0.7.7}/sqlite_database/_debug.py

@@ -39,7 +39,7 @@ def if_debug_print(*args, sep=" ", end="\n", flush=True):
         arg0 = args[0]
         print(
             arg0,
-            *(repr(arg) for arg in args if args.index(arg) != 0),
+            *(repr(arg) if arg != "\n" else "\n" for arg in args if args.index(arg) != 0),
             sep=sep,
             end=end,
             flush=flush,

{sqlite_database-0.7.5 → sqlite_database-0.7.7}/sqlite_database/models/__init__.py

@@ -155,7 +155,7 @@ class BaseModel:  # pylint: disable=too-few-public-methods,too-many-public-metho
     def create(cls, **kwargs):
         """Create data based on kwargs"""
         primary: str | None = cls._primary or kwargs.get("id", None)
-        id_present = bool(kwargs.get("id", None))
+        id_present = bool(kwargs.get(cls._primary or "id", None))
         if primary and cls.__auto_id__ and not id_present:  # type: ignore
             kwargs[primary] = cls.__auto_id__()  # type: ignore
         instance = cls(**kwargs)

{sqlite_database-0.7.5 → sqlite_database-0.7.7}/sqlite_database/models/query_builder.py

@@ -1,14 +1,17 @@
 """Model QueryBuilder"""
 
+# pylint: disable=protected-access
+
 from __future__ import annotations
 from typing import Any, Generic, Type, TypeVar
 from .errors import NoDataReturnedError
 from ..column import check_one
 from ..functions import Function
-from .. import models # pylint: disable=unused-import
+from .. import models  # pylint: disable=unused-import
 
 T = TypeVar("T", bound="models.BaseModel")
-count = Function('COUNT')
+count = Function("COUNT")
+
 
 class QueryBuilder(Generic[T]):
     # pylint: disable=protected-access
@@ -27,7 +30,7 @@ class QueryBuilder(Generic[T]):
         self._failing = True
         return self
 
-    def where(self, **kwargs):
+    def where(self, **kwargs: Any):
         """Sets conditioning"""
         self._filters.update(kwargs)
         return self
@@ -50,26 +53,51 @@ class QueryBuilder(Generic[T]):
     def fetch(self) -> list[T]:
         """Fetch data from table"""
         records = self._model._tbl.select(  # pylint: disable=protected-access
-                self._filters, limit=self._limit, offset=self._offset, order=self._order
-            )
+            self._filters, limit=self._limit, offset=self._offset, order=self._order
+        )
         if len(records) == 0 and self._failing:
-            raise NoDataReturnedError(f"Model {self._model.__name__} has no data for current scope")
-        return [
-            self._model(**record) for record in records
-        ]
+            raise NoDataReturnedError(
+                f"Model {self._model.__name__} has no data for current scope"
+            )
+        return [self._model(**record) for record in records]
 
     def fetch_one(self) -> T | None:
         """Fetch one data from table"""
         # pylint: disable=protected-access
-        record = self._model._tbl.select_one(
-            self._filters, order=self._order
-        )
+        record = self._model._tbl.select_one(self._filters, order=self._order)
         if not record and self._failing:
-            raise NoDataReturnedError(f"Model {self._model.__name__} has no data for current scope")
+            raise NoDataReturnedError(
+                f"Model {self._model.__name__} has no data for current scope"
+            )
         if not record:
             return None
         return self._model(**record)
 
+    def patch(self, **kwargs: Any):
+        """Update a data based on the filter according to passed keyword args"""
+        affected_rows = self._model._tbl.update(
+            self._filters, kwargs, self._limit, self._order
+        )
+
+        if affected_rows == 0 and self._failing:
+            raise NoDataReturnedError(
+                f"Model {self._model.__name__} updates no data for current scope"
+            )
+        return affected_rows
+
+    def delete(self):
+        """Delete data based on the filter"""
+        affected_rows = self._model._tbl.delete(self._filters, self._limit, self._order)
+
+        if affected_rows == 0 and self._failing:
+            raise NoDataReturnedError(
+                f"Model {self._model.__name__} delete exactly no rows"
+            )
+
+        return affected_rows
+
     def count(self) -> int:
         """Count how much data is within this operation"""
-        return self._model._tbl.select(self._filters, what=count('*'))
+        return self._model._tbl.select(self._filters, what=count("*"))
+
+    update = patch

{sqlite_database-0.7.5 → sqlite_database-0.7.7}/sqlite_database/query_builder.py

@@ -26,6 +26,8 @@ DEFAULT_MAPPINGS = {value: value for value in _SQLITETYPES}
 SQL_ACTIONS = {"null": "set null"}
 MAX_SUBQUERY_STACK_LIMIT = 10
 
+NAMING_FORMAT = "{key}{suffix}__{call_id}_{depth}_{condition_id}"
+
 
 def set_subquery_stack_limit(value: int):
     """Set subquery stack limit"""
@@ -200,7 +202,7 @@ def _handle_like(key, middle, val):
     return clause
 
 
-def extract_signature( # pylint: disable=too-many-locals
+def extract_signature(  # pylint: disable=too-many-locals
     filter_: Condition | CacheCond = None, suffix: str = "_check", depth: int = 0
 ):
     """Extract filter signature."""
@@ -227,7 +229,13 @@ def extract_signature( # pylint: disable=too-many-locals
 
         val = (
             Signature(
-                f":{key}_{call_id}_{depth}_{condition_id}_{suffix}",
+                ":"+NAMING_FORMAT.format(
+                    key=key,
+                    suffix=suffix,
+                    call_id=call_id,
+                    depth=depth,
+                    condition_id=condition_id,
+                ),
                 value.generate(),
                 value.data,
             )
@@ -257,7 +265,15 @@ def extract_signature( # pylint: disable=too-many-locals
             clauses.append(clause)
 
         if val.value is not null:
-            data[f"{key}_{call_id}_{depth}_{condition_id}_{suffix}"] = old_data
+            data[
+                NAMING_FORMAT.format(
+                    key=key,
+                    suffix=suffix,
+                    call_id=call_id,
+                    depth=depth,
+                    condition_id=condition_id,
+                )
+            ] = old_data
 
     if not clauses:
         return "", data

{sqlite_database-0.7.5 → sqlite_database-0.7.7/sqlite_database.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlite_database
-Version: 0.7.5
+Version: 0.7.7
 Summary: A weird wrapper for SQLite Connection
 Home-page: https://github.com/RimuEirnarn/sqlite_database
 Author: RimuEirnarn

{sqlite_database-0.7.5 → sqlite_database-0.7.7}/tests/database/model_api/test_model_api.py

@@ -9,6 +9,9 @@ from sqlite_database.models.errors import ValidationError, NoDataReturnedError
 
 from ..setup import setup_model_api
 
+def auto_id():
+    return str(uuid4())
+
 def test_model_api():
     # pylint: disable=protected-access
     """Test 1100 Model API"""
@@ -147,9 +150,6 @@ def test_model_auto_id():
 
     db = Database(":memory:")
 
-    def auto_id():
-        return str(uuid4())
-
     @model(db)
     class Users(BaseModel):
         """Base User class"""
@@ -172,9 +172,6 @@ def test_model_hidden():
 
     db = Database(":memory:")
 
-    def auto_id():
-        return str(uuid4())
-
     @model(db)
     class Users(BaseModel):
         """Base User class"""
@@ -196,9 +193,6 @@ def test_model_fail():
 
     db = Database(":memory:")
 
-    def auto_id():
-        return str(uuid4())
-
     @model(db)
     class Users(BaseModel):
         """Base User class"""
@@ -219,9 +213,6 @@ def test_model_api_runtime_typechecking():
 
     db = Database(":memory:")
 
-    def auto_id():
-        return str(uuid4())
-
     @model(db, True)
     class Users(BaseModel):
         """Base User class"""
@@ -237,3 +228,37 @@ def test_model_api_runtime_typechecking():
         Users.create(id=0, username=0, password=0)
 
     assert Users.first() is None, "How?"
+
+def test_model_api_query_builder_update():
+    """Test Model API Querybuilder update()"""
+
+    db = Database(":memory:")
+
+    Users, _ = setup_model_api(db)
+    admin = Users.create(id=auto_id(), username="admin", is_active=True)
+    assert Users.where(id=admin.id).throw().patch(username="system") == 1, "Changes should be 1"
+
+def test_model_api_query_builder_delete():
+    """Test Model API QueryBuilder delete()"""
+
+    db = Database(":memory:")
+
+    Users, _ = setup_model_api(db)
+    admin = Users.create(id=auto_id(), username='admin', is_active=True)
+
+    assert Users.where(id=admin.id).throw().delete() == 1, "Changes should be 1"
+
+def test_model_api_custom_id():
+    """Test Model API Custom Primary ID"""
+
+    db = Database(":memory:")
+    db.foreign_pragma('ON')
+
+    @model(db)
+    class Users(BaseModel):
+        __schema__ = (Primary('uid'),)
+
+        uid: str
+        username: str
+
+    assert Users.create(uid="1", username='admin')