querymodelling 0.0.15__tar.gz → 0.0.16__tar.gz

{querymodelling-0.0.15 → querymodelling-0.0.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: querymodelling
-Version: 0.0.15
+Version: 0.0.16
 Summary: build consistent api query models for fastapi
 Author: George Haddad
 Author-email: George Haddad <georgeh87@live.de>

{querymodelling-0.0.15 → querymodelling-0.0.16}/querymodelling/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.0.15'
-__version_tuple__ = version_tuple = (0, 0, 15)
+__version__ = version = '0.0.16'
+__version_tuple__ = version_tuple = (0, 0, 16)
 
-__commit_id__ = commit_id = 'gb75ac8b99'
+__commit_id__ = commit_id = 'g1c20fef9c'

{querymodelling-0.0.15 → querymodelling-0.0.16}/querymodelling/sql.py

@@ -1,6 +1,6 @@
 from datetime import datetime
-from sqlmodel import Session, select, func, and_
 from sqlmodel.sql.expression import Select
+from sqlmodel import Session, select, func, and_, or_
 from sqlalchemy.orm.attributes import InstrumentedAttribute
 from typing import TypeVar, Sequence, Type, Callable, ParamSpec
 
@@ -48,7 +48,13 @@ def retrieve_paged_entries(
         t_index = [t_index]
 
     sub_statement = select(*t_index)
-    
+
+    if order_clause:
+        order_clause = [
+            *order_clause,
+            *[index.asc() for index in t_index]
+        ]
+
     if search_clause:
         sub_statement = sub_statement.where(*search_clause)
     
@@ -64,7 +70,13 @@ def retrieve_paged_entries(
 
     statement = select(t).join(
         sub_query, and_(*[
-            getattr(t, idx.key) == getattr(sub_query.c, idx.key)
+            or_(
+                getattr(t, idx.key) == getattr(sub_query.c, idx.key),
+                and_(
+                    getattr(t, idx.key).is_(None),
+                    getattr(sub_query.c, idx.key).is_(None)
+                )
+            )
             for idx in t_index
         ])
     ).order_by(*order_clause)

{querymodelling-0.0.15 → querymodelling-0.0.16}/querymodelling.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: querymodelling
-Version: 0.0.15
+Version: 0.0.16
 Summary: build consistent api query models for fastapi
 Author: George Haddad
 Author-email: George Haddad <georgeh87@live.de>

{querymodelling-0.0.15 → querymodelling-0.0.16}/querymodelling.egg-info/SOURCES.txt

@@ -30,6 +30,8 @@ querymodelling.egg-info/PKG-INFO
 querymodelling.egg-info/SOURCES.txt
 querymodelling.egg-info/dependency_links.txt
 querymodelling.egg-info/requires.txt
+querymodelling.egg-info/scm_file_list.json
+querymodelling.egg-info/scm_version.json
 querymodelling.egg-info/top_level.txt
 tests/__init__.py
 tests/__main__.py

querymodelling-0.0.16/querymodelling.egg-info/scm_file_list.json

@@ -0,0 +1,34 @@
+{
+  "files": [
+    ".github/workflows/run-publish.yml",
+    ".github/workflows/run-tests.yml",
+    ".gitignore",
+    ".readthedocs.yaml",
+    ".vscode/extensions.json",
+    ".vscode/settings.json",
+    "AUTHORS.rst",
+    "HISTORY.md",
+    "LICENSE",
+    "README.md",
+    "docs/Makefile",
+    "docs/conf.py",
+    "docs/index.rst",
+    "docs/make.bat",
+    "docs/requirements.txt",
+    "docs/user/install.rst",
+    "pyproject.toml",
+    "querymodelling/__helper__.py",
+    "querymodelling/__init__.py",
+    "querymodelling/__version__.py",
+    "querymodelling/base.py",
+    "querymodelling/fields.py",
+    "querymodelling/model.py",
+    "querymodelling/pydantic.py",
+    "querymodelling/redis_om.py",
+    "querymodelling/sql.py",
+    "setup.py",
+    "tests/__init__.py",
+    "tests/__main__.py",
+    "tests/basic_test.py"
+  ]
+}

querymodelling-0.0.16/querymodelling.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.0.16",
+  "distance": 0,
+  "node": "g1c20fef9cbe58fd5460e6aba8c2e1f350f90c64c",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-08-14"
+}