@an5/adapters 0.1.1 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@an5/adapters",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Standalone language adapters for AN5 ORM - TypeScript, Python, .NET query execution.",
   "license": "MIT",
   "main": "typescript/index.js",

package/python/table_client.py

@@ -1,7 +1,10 @@
 import json
 import uuid
 from typing import Dict, List, Optional
-from .base import DIALECT_MSSQL, DIALECT_POSTGRES, model_fields, _build_order_by, _parse_where, _quote, _quote_table, _resolve_table
+try:
+    from .base import DIALECT_MSSQL, DIALECT_POSTGRES, model_fields, _build_order_by, _parse_where, _quote, _quote_table, _resolve_table
+except ImportError:
+    from base import DIALECT_MSSQL, DIALECT_POSTGRES, model_fields, _build_order_by, _parse_where, _quote, _quote_table, _resolve_table
 
 # ─── Table Client ───────────────────────────────────────────────────────────────────
 
@@ -23,13 +26,26 @@ class AdapterTableClient:
     def _nolock(self) -> str:
         return "" if self._dialect == DIALECT_POSTGRES else " WITH (NOLOCK)"
 
+    @property
+    def _fields(self) -> List[Dict]:
+        fields = model_fields.get(self._model, [])
+        if isinstance(fields, dict):
+            normalized = []
+            for name, value in fields.items():
+                if isinstance(value, dict):
+                    normalized.append({"name": name, **value})
+                else:
+                    normalized.append({"name": name, "type": value})
+            return normalized
+        return fields
+
     def _pagination(self, take: Optional[int], skip: int, order_sql: str) -> str:
         if take is None:
             return ""
         if self._dialect == DIALECT_POSTGRES:
             return f" LIMIT {take} OFFSET {skip}"
-        o = order_sql or " ORDER BY (SELECT NULL)"
-        return f"{o} OFFSET {skip} ROWS FETCH NEXT {take} ROWS ONLY"
+        order_prefix = "" if order_sql else " ORDER BY (SELECT NULL)"
+        return f"{order_prefix} OFFSET {skip} ROWS FETCH NEXT {take} ROWS ONLY"
 
     def find_many(self, where=None, order_by=None, skip: int = 0, take: Optional[int] = None, select=None) -> List[Dict]:
         params: Dict = {}
@@ -39,12 +55,9 @@ class AdapterTableClient:
         query = f"SELECT * FROM {self._table_sql}{self._nolock}"
         if where_sql:
             query += f" WHERE {where_sql}"
-        if take is not None and self._dialect == DIALECT_POSTGRES:
-            query += self._pagination(take, skip, order_sql)
-        else:
-            if order_sql:
-                query += f" {order_sql}"
-            query += self._pagination(take, skip, order_sql)
+        if order_sql:
+            query += f" {order_sql}"
+        query += self._pagination(take, skip, order_sql)
         return self._adapter.exec(query, list(params.values()))
 
     def find_first(self, where=None, order_by=None, select=None) -> Optional[Dict]:
@@ -64,8 +77,7 @@ class AdapterTableClient:
         return int(rows[0]["cnt"]) if rows else 0
 
     def create(self, data: Dict) -> Dict:
-        fields = model_fields.get(self._model, [])
-        id_field = next((f for f in fields if f.get("isId")), None)
+        id_field = next((f for f in self._fields if f.get("isId")), None)
         if id_field and id_field["name"] not in data:
             data = {**data, id_field["name"]: str(uuid.uuid4())}
 
@@ -205,5 +217,3 @@ class AdapterTableClient:
 
         scored.sort(key=lambda x: x[1])
         return [{**row, "distance": dist} for row, dist in scored[:take]]
-
-