sqlite-database 0.7.10__tar.gz → 0.7.11__tar.gz

{sqlite_database-0.7.10/sqlite_database.egg-info → sqlite_database-0.7.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlite_database
-Version: 0.7.10
+Version: 0.7.11
 Summary: Easy to use SQLite wrapper
 Home-page: https://github.com/RimuEirnarn/sqlite_database
 Author: RimuEirnarn

{sqlite_database-0.7.10 → sqlite_database-0.7.11}/sqlite_database/__init__.py

@@ -15,7 +15,7 @@ def test_installed():
     return True
 
 
-__version__ = "0.7.10"
+__version__ = "0.7.11"
 __all__ = [
     "Database",
     "Table",

{sqlite_database-0.7.10 → sqlite_database-0.7.11}/sqlite_database/_utils.py

@@ -108,22 +108,25 @@ def matches(pattern: Pattern, value: str):
     return True
 
 
-def check_one(data: str):
+def check_one(data: str, bypass_list: tuple[str, ...] | None = None):
     """check one to check if a string contains illegal character OR
     if it is a reserved SQL keyword"""
     if matches(_re_valid, data) is True:
         exc = SecurityError("Cannot parse unsafe data.")
         exc.add_note(f"Target: {data}")
         raise exc
+    bp = bypass_list or []
     if data.upper() in _SQLITE_KEYWORDS:
+        if data in bp:
+            return data
         raise SecurityError(f'"{data}" is a reserved SQL keyword and cannot be used.')
     return data
 
 
-def check_iter(data: Iterable[str]):
+def check_iter(data: Iterable[str], bypass_list: tuple[str, ...] | None = None):
     """An iterable checks as it's check_one"""
     for val in data:
-        yield check_one(val)
+        check_one(val, bypass_list)
 
 
 class WithCursor(Cursor):

{sqlite_database-0.7.10 → sqlite_database-0.7.11}/sqlite_database/query_builder.py

@@ -95,6 +95,12 @@ class QueryParams:
     order: Optional[CacheOrders] = None
     data: Optional[CacheData] = None
 
+    def __post_init__(self):
+        if not all(
+            (isinstance(getattr(self, item), int) for item in ("limit", "offset"))
+        ):
+            raise TypeError("Expected limit/offset to be integer")
+
     def __hash__(self):
         """Custom hash function to ensure compatibility with lru_cache."""
         return hash(
@@ -230,7 +236,8 @@ def extract_signature(  # pylint: disable=too-many-locals
 
         val = (
             Signature(
-                ":"+NAMING_FORMAT.format(
+                ":"
+                + NAMING_FORMAT.format(
                     key=key,
                     suffix=suffix,
                     call_id=call_id,
@@ -498,7 +505,8 @@ def extract_subquery(subquery: SubQuery, depth: int = 1):
             subquery.where,
             subquery.cols,
             subquery.limit,
-            subquery.orders,  # type: ignore
+            0,  # type: ignore
+            subquery.orders # type: ignore
         ),
         depth=depth,
     )
@@ -543,9 +551,16 @@ def _setup_limit_patch(table_name: str, condition: str, limit):
 def _parse_orders(order: CacheOrders):
     if isinstance(order, tuple) and not isinstance(order[0], tuple):
         ord_, order_by = order
+        # print('here')
+        check_iter(order, ("asc", "desc"))  # type: ignore
         return f"{ord_} {order_by}"
     if isinstance(order, tuple) and isinstance(order[0], tuple):
-        return ", ".join(f"{ord_} {order_by}" for ord_, order_by in order)
+
+        return ", ".join(
+            f"{ord_} {order_by}"
+            for ord_, order_by in order
+            if check_iter((ord_, order_by), ("asc", "desc"))
+        )
     raise TypeError("What?", type(order))
 
 
@@ -571,12 +586,14 @@ def _build_select(query_params: QueryParams, depth: int = 0):
         )
     check_one(query_params.table_name)
     cond, data = extract_signature(query_params.condition, depth=depth)
-    check_iter(query_params.only or ())  # type: ignore
     only_ = "*"
     if query_params.only and isinstance(query_params.only, ParsedFn):
         only_, _ = query_params.only.parse_sql()
+        check_iter(
+            (query_params.only.name, *(a for a in query_params.only.values if a != "*"))
+        )
     elif isinstance(query_params.only, tuple):
-        only_ = f"{', '.join(column_name for column_name in query_params.only)}"
+        only_ = f"{', '.join(column_name for column_name in query_params.only if check_one(column_name))}"
     elif query_params.only != "*" and isinstance(query_params.only, str):
         only_ = check_one(query_params.only)  # type: ignore
 

{sqlite_database-0.7.10 → sqlite_database-0.7.11/sqlite_database.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlite_database
-Version: 0.7.10
+Version: 0.7.11
 Summary: Easy to use SQLite wrapper
 Home-page: https://github.com/RimuEirnarn/sqlite_database
 Author: RimuEirnarn