sqlobjects 1.2.4__py3-none-any.whl → 1.2.5__py3-none-any.whl

sqlobjects/expressions/function.py

@@ -147,6 +147,8 @@ class FunctionExpression:
     for building complex database expressions.
     """
 
+    is_clause_element = False  # prevent __getattr__ from proxying this to expression.is_clause_element
+
     if TYPE_CHECKING:
         # Inherit all method hints for IDE support
         def __new__(cls, *args, **kwargs) -> "FunctionExpression & _FunctionMethods": ...  # type: ignore

sqlobjects/expressions/mixins.py

@@ -247,9 +247,25 @@ class ColumnAttributeFunctionMixin(FunctionMixin):
         def extract(self, field: str) -> "FunctionExpression": ...
         def date_trunc(self, precision: str) -> "FunctionExpression": ...
 
-        # JSON methods
-        def extract_path(self, path) -> "FunctionExpression": ...
-        def extract_text(self, path) -> "FunctionExpression": ...
+        # JSON methods (MySQL json type)
+        def json_extract(self, path: str) -> "FunctionExpression": ...
+        def json_unquote(self, path: str) -> "FunctionExpression": ...
+        def json_contains(self, other, path: str | None = None) -> "FunctionExpression": ...
+        def json_contains_path(self, *paths: str, match: str = "one") -> "FunctionExpression": ...
+        def json_length(self, path: str | None = None) -> "FunctionExpression": ...
+        def json_keys(self, path: str | None = None) -> "FunctionExpression": ...
+        def json_overlaps(self, other) -> "FunctionExpression": ...
+        def json_search(self, value: str, match: str = "one", path: str | None = None) -> "FunctionExpression": ...
+        def json_type(self) -> "FunctionExpression": ...
+
+        # JSONB methods (PostgreSQL jsonb type)
+        def contained_by(self, other) -> "FunctionExpression": ...
+        def has_key(self, other) -> "FunctionExpression": ...
+        def has_all(self, other) -> "FunctionExpression": ...
+        def has_any(self, other) -> "FunctionExpression": ...
+        def path_exists(self, other) -> "FunctionExpression": ...
+        def path_match(self, other) -> "FunctionExpression": ...
+        def delete_path(self, array) -> "FunctionExpression": ...
 
         # Common methods (all types)
         def sum(self) -> "FunctionExpression": ...

sqlobjects/fields/types/comparators.py

@@ -323,13 +323,62 @@ class DateTimeComparator(ComparatorMixin, DateTime.Comparator):  # type: ignore[
 
 
 class JSONComparator(ComparatorMixin, JSON.Comparator):  # type: ignore[reportIncompatibleMethodOverride]
-    """JSON type comparator with JSON extraction and manipulation methods."""
+    """MySQL JSON type comparator. For PostgreSQL, use jsonb type instead."""
 
-    def extract_path(self, path) -> FunctionExpression:
-        return FunctionExpression(func.json_extract_path(self, path))
+    def json_extract(self, path: str) -> FunctionExpression:
+        """JSON_EXTRACT(col, path) - e.g. json_extract('$.name')"""
+        return FunctionExpression(func.json_extract(self, path))
 
-    def extract_text(self, path) -> FunctionExpression:
-        return FunctionExpression(func.json_extract_path_text(self, path))
+    def json_unquote(self, path: str) -> FunctionExpression:
+        """JSON_UNQUOTE(JSON_EXTRACT(col, path)) - returns unquoted string value"""
+        return FunctionExpression(func.json_unquote(func.json_extract(self, path)))
+
+    def json_contains(self, other, path: str | None = None) -> FunctionExpression:
+        """JSON_CONTAINS(col, val[, path]) - check if JSON contains value"""
+        import json
+
+        from sqlalchemy import literal
+
+        value = [other] if not isinstance(other, (list, dict)) else other
+        json_val = literal(json.dumps(value))
+        if path is not None:
+            return FunctionExpression(func.json_contains(self, json_val, path))
+        return FunctionExpression(func.json_contains(self, json_val))
+
+    def json_contains_path(self, *paths: str, match: str = "one") -> FunctionExpression:
+        """JSON_CONTAINS_PATH(col, 'one'|'all', path, ...) - check if path(s) exist"""
+        return FunctionExpression(func.json_contains_path(self, match, *paths))
+
+    def json_length(self, path: str | None = None) -> FunctionExpression:
+        """JSON_LENGTH(col[, path]) - array/object length"""
+        if path is not None:
+            return FunctionExpression(func.json_length(self, path))
+        return FunctionExpression(func.json_length(self))
+
+    def json_keys(self, path: str | None = None) -> FunctionExpression:
+        """JSON_KEYS(col[, path]) - return all keys as JSON array"""
+        if path is not None:
+            return FunctionExpression(func.json_keys(self, path))
+        return FunctionExpression(func.json_keys(self))
+
+    def json_overlaps(self, other) -> FunctionExpression:
+        """JSON_OVERLAPS(col, val) - check if two JSON documents share any key-value pairs (MySQL 8.0+)"""
+        import json
+
+        from sqlalchemy import literal
+
+        value = other if isinstance(other, str) else json.dumps(other)
+        return FunctionExpression(func.json_overlaps(self, literal(value)))
+
+    def json_search(self, value: str, match: str = "one", path: str | None = None) -> FunctionExpression:
+        """JSON_SEARCH(col, 'one'|'all', val[, path]) - find path of value"""
+        if path is not None:
+            return FunctionExpression(func.json_search(self, match, value, None, path))
+        return FunctionExpression(func.json_search(self, match, value))
+
+    def json_type(self) -> FunctionExpression:
+        """JSON_TYPE(col) - return JSON value type as string"""
+        return FunctionExpression(func.json_type(self))
 
 
 class BooleanComparator(ComparatorMixin, Boolean.Comparator):  # type: ignore[reportIncompatibleMethodOverride]

sqlobjects/fields/types/registry.py

@@ -1,9 +1,10 @@
 import inspect
 from typing import Any, Callable, NotRequired, TypedDict
 
+from sqlalchemy.dialects.mysql import JSON
+from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.sql.sqltypes import (
     ARRAY,
-    JSON,
     BigInteger,
     Boolean,
     Date,
@@ -344,14 +345,15 @@ class TypeRegistry:
             (Interval, "interval", DateTimeComparator, [], {}),
             (LargeBinary, "binary", DefaultComparator, ["bytes"], {}),
             (Uuid, "uuid", StringComparator, [], {}),
-            (JSON, "json", JSONComparator, ["dict"], {}),
         ]
 
-        # Special types
+        # Special types: dialect-specific or non-standard types
         special_types = [
-            (ARRAY, "array", DefaultComparator, [], {}),
+            (ARRAY, "array", DefaultComparator, [], {}),  # PostgreSQL only
             (Enum, "enum", DefaultComparator, [], {}),
             (Auto, "auto", DefaultComparator, [], {}),
+            (JSON, "json", JSONComparator, ["dict"], {}),  # MySQL: contains -> JSON_CONTAINS
+            (JSONB, "jsonb", JSONB.Comparator, [], {}),  # PostgreSQL: contains -> @>
         ]
 
         for field_type, name, comparator, aliases, defaults in builtin_types + special_types:

{sqlobjects-1.2.4.dist-info → sqlobjects-1.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlobjects
-Version: 1.2.4
+Version: 1.2.5
 Summary: Django-style async ORM library based on SQLAlchemy with chainable queries, Q objects, and relationship loading
 Author-email: XtraVisions <gitadmin@xtravisions.com>, Chen Hao <chenhao@xtravisions.com>
 Maintainer-email: XtraVisions <gitadmin@xtravisions.com>, Chen Hao <chenhao@xtravisions.com>

{sqlobjects-1.2.4.dist-info → sqlobjects-1.2.5.dist-info}/RECORD

@@ -17,8 +17,8 @@ sqlobjects/expressions/aggregate.py,sha256=Gh4HekOaUmYDkS8O4QnmEhuf73QD44dBuAgUL
 sqlobjects/expressions/base.py,sha256=L9zHa9gb9M88sA9JmUSpR9k5tr-9Pgknbajo1ZmhOpk,5177
 sqlobjects/expressions/cte.py,sha256=9NAPpvBpxIoWmhc7eL3MyI3pmw65b9Hz6WzdNr2iVzc,4440
 sqlobjects/expressions/explain.py,sha256=GpfJq_JPgBfkNa9xlPi1wvkqYR6hlgT4V6lq5y6ftCE,1210
-sqlobjects/expressions/function.py,sha256=Dk5e_26ZKVdOqWdpQkC_XZWndUmYoq_iAMRFiK1O448,15113
-sqlobjects/expressions/mixins.py,sha256=pwqFXl7csdcou-O3ztfZ760XLdREqr4br0S475v2BSc,10469
+sqlobjects/expressions/function.py,sha256=vCDbZR2aSxwXPGn_S2d93pm4yc3Xd2N83Fgpu6HTyr4,15218
+sqlobjects/expressions/mixins.py,sha256=y430mXrJoz9dn7BNO74ZCtFvP1P5IDJAC3c5t4-Ex3s,11595
 sqlobjects/expressions/scalar.py,sha256=TRg1cg70m5kLKK2d-IOCHk0hPD2WWtXYErlMYSz6zio,6034
 sqlobjects/expressions/subquery.py,sha256=Jhhcl-EJbCvZmC91f7mZI4yeJqYVEyWtODHgB0_tNjk,15065
 sqlobjects/expressions/terminal.py,sha256=3R3LsRMoUazpd3EVNYi_m1LXwx6l42kyv4zlosgsrN0,15024
@@ -37,8 +37,8 @@ sqlobjects/fields/relations/strategies.py,sha256=X4KkeBxwpCcBHWhcL9EGH2WTQ2NdZWB
 sqlobjects/fields/relations/utils.py,sha256=G1PbW1heCShUSfjaDIbqj4I0yODdy4j3udf0Ex70cOg,12487
 sqlobjects/fields/types/__init__.py,sha256=PaEslOWuQVZVUoVnUFtqF-sNHOvF9AEVhuDseqRr-GA,651
 sqlobjects/fields/types/base.py,sha256=aK-8UDYtUcqJtwxw_emR-WefKDhrQyp0BK7s-UKx4yw,463
-sqlobjects/fields/types/comparators.py,sha256=d9azQGpUGg7eNF_aR0wWjZDzL3sFClHNh-fyObQudgY,15556
-sqlobjects/fields/types/registry.py,sha256=52niJnXdpqRewFKyOyiU-EhygR7SSZ1RQsflZ4u7evI,14529
+sqlobjects/fields/types/comparators.py,sha256=Q0w1O_b1nh7_47s2xV9PLZtZdStNc3hVk87LCcKgHD8,18000
+sqlobjects/fields/types/registry.py,sha256=6wNs-Fa18QA6o9u57eJ2yZyojOi4SdIu6Xd9ROsvM7I,14792
 sqlobjects/internal/__init__.py,sha256=Vam4blEYmPIgxMJY5YI32btY6Q2SD49OaGduwnaSDsM,447
 sqlobjects/internal/operations.py,sha256=IDB6XiIDZUFBfm_uub6Jr77hgOAEpCQbLNLBAcHeflA,3561
 sqlobjects/internal/results.py,sha256=rTX4sIG9Eo9Ik3eTWKV116MPtNzGjdLAJIy8FdVGWBA,2216
@@ -54,17 +54,17 @@ sqlobjects/utils/__init__.py,sha256=NsJ52Fl_PaB-2WlOIJVGNPmgOnqPmvYRmp7uaq5zfYs,
 sqlobjects/utils/inspect.py,sha256=u-Q9VBoSGYCE_3Soy8jMuCAdM-P7IkSzTxqrJop_Ilk,2612
 sqlobjects/utils/naming.py,sha256=PmfNuEz-Twly2qREjKfMNulJt8TmOUJaxzFTuts3COg,1411
 sqlobjects/utils/pattern.py,sha256=FGCgobTpnmKjdAtQidHIg4Xa2CQLeP35F0VuX_1T1dk,14740
-sqlobjects-1.2.4.data/data/share/sqlobjects/rules/01-database-session-guide.md,sha256=lnqRpcDhYKdH-f0avW1jXcWt3qi7XBwkMt7clTs9Zvg,7601
-sqlobjects-1.2.4.data/data/share/sqlobjects/rules/02-model-definition-guide.md,sha256=i5gNJM-0bIJ2xSUu3mij8uB9kJC9EAc_439sCBqRph8,10977
-sqlobjects-1.2.4.data/data/share/sqlobjects/rules/03-query-operations-guide.md,sha256=BEZE_WUUhY6sEZDiDtrbInlV_UVIhbYETABJTNhu2JQ,10550
-sqlobjects-1.2.4.data/data/share/sqlobjects/rules/04-crud-operations-guide.md,sha256=abUEvRPSiSjX8enclXO5Uryox9Rt0WFeRcFkvHXfPf8,10085
-sqlobjects-1.2.4.data/data/share/sqlobjects/rules/05-relationships-guide.md,sha256=MJ23fYOTWqrLd54ENZLu3S3QRqbLf7joq-YhF6-V8OQ,12204
-sqlobjects-1.2.4.data/data/share/sqlobjects/rules/06-validation-signals-guide.md,sha256=i9WLLhyCDoWGkIYqH2D_XLn98oMbF1pB3-L-b5gRbT4,14294
-sqlobjects-1.2.4.data/data/share/sqlobjects/rules/07-performance-guide.md,sha256=rjR0DjT39poEBVaUxAzJBEaMaBrZKLVer1zXaNNYfxg,12851
-sqlobjects-1.2.4.data/data/share/sqlobjects/rules/README.md,sha256=d2n5ZZT8LGvjL60u_HlzXn2uA8FwoCgqG3fuAhvMFvM,2280
-sqlobjects-1.2.4.dist-info/licenses/LICENSE,sha256=ScFR7nvWIhar0d32Y-LA4vqp9zNmy1HSJia7UX7jU6c,1068
-sqlobjects-1.2.4.dist-info/METADATA,sha256=Wql2U7dUxjC3mK9nGp7iF7YoVpHJBbynF798QO4Kc0c,13740
-sqlobjects-1.2.4.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-sqlobjects-1.2.4.dist-info/entry_points.txt,sha256=9Q3Ci55MawxkQhMlR_eLJui00_rYYIVO_Aq_Dm0u5MQ,76
-sqlobjects-1.2.4.dist-info/top_level.txt,sha256=brO5vDtCpn4L9dpX0EHpehbu4kcHaK_2Bbnwze35YKc,11
-sqlobjects-1.2.4.dist-info/RECORD,,
+sqlobjects-1.2.5.data/data/share/sqlobjects/rules/01-database-session-guide.md,sha256=lnqRpcDhYKdH-f0avW1jXcWt3qi7XBwkMt7clTs9Zvg,7601
+sqlobjects-1.2.5.data/data/share/sqlobjects/rules/02-model-definition-guide.md,sha256=i5gNJM-0bIJ2xSUu3mij8uB9kJC9EAc_439sCBqRph8,10977
+sqlobjects-1.2.5.data/data/share/sqlobjects/rules/03-query-operations-guide.md,sha256=BEZE_WUUhY6sEZDiDtrbInlV_UVIhbYETABJTNhu2JQ,10550
+sqlobjects-1.2.5.data/data/share/sqlobjects/rules/04-crud-operations-guide.md,sha256=abUEvRPSiSjX8enclXO5Uryox9Rt0WFeRcFkvHXfPf8,10085
+sqlobjects-1.2.5.data/data/share/sqlobjects/rules/05-relationships-guide.md,sha256=MJ23fYOTWqrLd54ENZLu3S3QRqbLf7joq-YhF6-V8OQ,12204
+sqlobjects-1.2.5.data/data/share/sqlobjects/rules/06-validation-signals-guide.md,sha256=i9WLLhyCDoWGkIYqH2D_XLn98oMbF1pB3-L-b5gRbT4,14294
+sqlobjects-1.2.5.data/data/share/sqlobjects/rules/07-performance-guide.md,sha256=rjR0DjT39poEBVaUxAzJBEaMaBrZKLVer1zXaNNYfxg,12851
+sqlobjects-1.2.5.data/data/share/sqlobjects/rules/README.md,sha256=d2n5ZZT8LGvjL60u_HlzXn2uA8FwoCgqG3fuAhvMFvM,2280
+sqlobjects-1.2.5.dist-info/licenses/LICENSE,sha256=ScFR7nvWIhar0d32Y-LA4vqp9zNmy1HSJia7UX7jU6c,1068
+sqlobjects-1.2.5.dist-info/METADATA,sha256=ex1EZKe_eq2x1rsSjnZZpgf5oIbTmQutoU6JTyTKx74,13740
+sqlobjects-1.2.5.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
+sqlobjects-1.2.5.dist-info/entry_points.txt,sha256=9Q3Ci55MawxkQhMlR_eLJui00_rYYIVO_Aq_Dm0u5MQ,76
+sqlobjects-1.2.5.dist-info/top_level.txt,sha256=brO5vDtCpn4L9dpX0EHpehbu4kcHaK_2Bbnwze35YKc,11
+sqlobjects-1.2.5.dist-info/RECORD,,