pgdevkit 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

pgdevkit/db/complex_types.py

@@ -9,7 +9,18 @@ from psycopg.types.composite import CompositeInfo, register_composite
 from psycopg.types.enum import EnumInfo, register_enum
 from psycopg.types.json import Jsonb
 
-ComplexTypeInfo = CompositeInfo | EnumInfo | type[Jsonb] | None
+
+class JsonbArray:
+    """Sentinel for a `jsonb[]` column (a Postgres ARRAY of jsonb) — distinct
+    from `Jsonb` (a scalar jsonb column) so `recursive_convert` knows whether
+    an incoming Python list *is* the array (each element needs its own
+    `Jsonb(...)` wrapper) or is JSON array *content* for one scalar jsonb
+    value (the whole list gets wrapped once). Both cases arrive from
+    `information_schema.columns` looking identical (a plain Python list) —
+    only the column's own array-ness disambiguates them."""
+
+
+ComplexTypeInfo = CompositeInfo | EnumInfo | type[Jsonb] | type[JsonbArray] | None
 
 
 class ComplexHelper:
@@ -67,7 +78,7 @@ class ComplexHelper:
         if res["data_type"].lower() == "jsonb":
             return Jsonb
         if res["data_type"].upper() == "ARRAY" and res["udt_name"] == "_jsonb":
-            return Jsonb
+            return JsonbArray
         if (
             not res["is_enum"]
             and not res["is_user_defined"]
@@ -181,9 +192,16 @@ class ComplexHelper:
             return None
         if self.system_complex_type_dict is None:
             await self.load_complex_type_dict()
+        if info == JsonbArray:
+            # The value here *is* the jsonb[] array -- each element is its
+            # own scalar jsonb value, unlike the plain-Jsonb case below.
+            assert isinstance(value, list), f"Expected a list for a jsonb[] column, got {type(value)}"
+            return [Jsonb(item) for item in value]
         if info == Jsonb:
-            # A JSONB column's value is wrapped whole, even if it's a list —
-            # only an array-of-composite/enum column recurses per element.
+            # A scalar JSONB column's value is wrapped whole, even if it's a
+            # list — that list is JSON array *content* for the one jsonb
+            # value, not multiple array elements (see JsonbArray above for
+            # the jsonb[] column case).
             return Jsonb(value)
         if isinstance(value, list):
             return [await self.recursive_convert(item, info, con) for item in value]

pgdevkit/testdb/schema.py

@@ -94,7 +94,11 @@ def _get_sql_deps(sql: str) -> set[str]:
             continue
         for t in e.find_all(exp.Table):
             if t.args.get("this") is not None and t.args.get("db") is not None:
-                deps.add(str(t))
+                # exp.table_name(), not str(t): str() includes " AS alias" for
+                # an aliased reference (e.g. "FROM editing.visit v"), which
+                # would never match the plain declared name any dependent
+                # file's own CREATE target is recorded under.
+                deps.add(exp.table_name(t))
     return deps
 
 
@@ -119,7 +123,7 @@ def _iter_sql_files(database_dir: Path):
         deps = _get_sql_deps(content)
         if file.parent.name in _SCHEMA_QUALIFIED_TYPES:
             schema = _strip_layer_prefix(file.parent.parent.name)
-            full_name = f"{schema}.{file.stem}"
+            full_name = f"{schema}.{_strip_layer_prefix(file.stem)}"
             deps.discard(full_name)  # the file's own CREATE target is not a real dependency
             all_declared.add(full_name)
             if not deps or all(d in delivered for d in deps):
@@ -219,7 +223,8 @@ async def apply_schema(
         json_file = file.with_suffix(".test_data.json")
         if json_file.exists():
             schema_name = _strip_layer_prefix(file.parent.parent.name)
-            await _insert_test_data(json_file, f"{schema_name}.{file.stem}", force_reset, con, complex_helper)
+            table_stem = _strip_layer_prefix(file.stem)
+            await _insert_test_data(json_file, f"{schema_name}.{table_stem}", force_reset, con, complex_helper)
 
     failures: list[tuple[Path, str]] = []
     for file, sql in _iter_sql_files(database_dir):

{pgdevkit-0.2.2.dist-info → pgdevkit-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pgdevkit
-Version: 0.2.2
+Version: 0.2.4
 Summary: A helper for developing with Postgres
 Requires-Python: >=3.14
 Requires-Dist: docker>=7.1.0

{pgdevkit-0.2.2.dist-info → pgdevkit-0.2.4.dist-info}/RECORD

@@ -8,7 +8,7 @@ pgdevkit/lakebase.py,sha256=0PABOk4p-2klLTY8QAUibQf9QeyNHKywUWEWGdkUY8k,3165
 pgdevkit/models.py,sha256=dAZ8f7pgDsxoLVrDWsM4h0qwJ0pOzXDdWMGsnjrW80E,2103
 pgdevkit/parser.py,sha256=B3NRtcSBuEUcQNp5lxEMi6ApVedkbNUNdklCea-Ts40,12021
 pgdevkit/db/__init__.py,sha256=PlnMycSmQVqnzHue_uLQZuikbW6QAqs6p91IO5l6nfU,763
-pgdevkit/db/complex_types.py,sha256=t1y5_yIGLUtI_iuBUr7Es7e83OD9YVyvzInwLyaMfcM,10197
+pgdevkit/db/complex_types.py,sha256=bv3oMztSnrhz4-OJROBXfiouL2jJ8TxpSR_83HMLmTI,11197
 pgdevkit/db/connection.py,sha256=ylc_KVYsOvPeuW5GL1ebDDH0O3w93oe-EHwkUH4KoVs,5793
 pgdevkit/db/crud.py,sha256=RTRhum5GyfeRAw8p8kk_kFr9uKCeWe8wwrUZYLvzdZU,12103
 pgdevkit/db/loader.py,sha256=0Swmp0h0s7I4acG0Dv3cem2YD4lFvq8aFEbFQPPQrxg,616
@@ -20,12 +20,12 @@ pgdevkit/testdb/constants.py,sha256=xi8uIoEgN9LrRkr41j3mmWB9PqqU0r8aCUb2JJXBAs0,
 pgdevkit/testdb/container.py,sha256=R_IhazRw_c0HteDtESO6RY6XWHp995FP5RRA4LK7Fh0,4068
 pgdevkit/testdb/naming.py,sha256=Kyk5qEfxUkbggUG5bD7U7CJ_kAET332VPQNB-O5kvTY,1318
 pgdevkit/testdb/query.py,sha256=e4UbgdCKKIot3a8Qixg-OX-Af0rlQ4a8ODhJBD8mtVM,2318
-pgdevkit/testdb/schema.py,sha256=-whDO8JTggFPNZtymzQ7dpsqMdQ-wUYAlRdWuyT4CAQ,9590
+pgdevkit/testdb/schema.py,sha256=CpKee72evg9dngo744VXcbn8YHTq5AQIY0xgF-6eMkU,9970
 pgdevkit/docs/database-layout.md,sha256=dNvDH956xSXuAnLqkOopyOfaIm_A-RtUd57VTaZ1GQU,6035
 pgdevkit/skills/pgdevkit/SKILL.md,sha256=6uxe6BQwOLexGiBpf00VTFTHOiWJo5k2Qqzu172rb4I,12156
 pgdevkit/skills/pgdevkit/references/dynamic-sql.md,sha256=aTR1sx81moiTwaMaiOecaqk-9rT8y5Zxz7W1BoC3vK0,2774
 pgdevkit/skills/pgdevkit/references/temporal-tables.md,sha256=LwZnItvQWI7bB0oRHxIfUc0ynnq7N0V5Mnv-QHvFN3Q,1364
-pgdevkit-0.2.2.dist-info/METADATA,sha256=56tCcCKLAnudYqguZtBn60RMnmGmKt-sk0yeFEG-y8c,5915
-pgdevkit-0.2.2.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-pgdevkit-0.2.2.dist-info/entry_points.txt,sha256=FK2P55lf0WaGlOZJIINOGgCt8WB7ep0OnPsgnrp80bg,42
-pgdevkit-0.2.2.dist-info/RECORD,,
+pgdevkit-0.2.4.dist-info/METADATA,sha256=vM_8DEMsPyq7CSplDGBhDdWpPJLD_wrMNJk4GSvWRVA,5915
+pgdevkit-0.2.4.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+pgdevkit-0.2.4.dist-info/entry_points.txt,sha256=FK2P55lf0WaGlOZJIINOGgCt8WB7ep0OnPsgnrp80bg,42
+pgdevkit-0.2.4.dist-info/RECORD,,