@ai-devtools/dbspec-linux-x64 1.5.7 → 1.5.8

package/bin/dbspec/_internal/dbspec.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbspec
-Version: 1.5.7
+Version: 1.5.8
 Summary: DBSpec: CLI/TUI for database design (Excel as DSL)
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

package/bin/dbspec/_internal/dbspec.egg-info/SOURCES.txt

@@ -88,6 +88,7 @@ src/migrations/autogenerate_enums.py
 src/migrations/autogenerate_pk.py
 src/migrations/autogenerate_renames.py
 src/migrations/collation_catalog.py
+src/migrations/collation_rendering.py
 src/migrations/collations.py
 src/migrations/commands.py
 src/migrations/defaults.py
@@ -126,6 +127,7 @@ src/resources/__init__.py
 src/resources/sqlalchemy_templates/README.md
 src/resources/sqlalchemy_templates/__init__.py
 src/resources/sqlalchemy_templates/base.py.j2
+src/resources/sqlalchemy_templates/collation_helper.py.j2
 src/resources/sqlalchemy_templates/domain_init.py.j2
 src/resources/sqlalchemy_templates/model.py.j2
 src/resources/sqlalchemy_templates/package_init.py.j2
@@ -253,6 +255,7 @@ src/utils/postgres_types.py
 src/utils/progress.py
 src/utils/reference_sheets.py
 src/utils/sheets.py
+src/utils/sqlalchemy_collations.py
 src/utils/type_casting.py
 src/xlsx/__init__.py
 src/xlsx/formatting.py

package/bin/dbspec/_internal/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dbspec"
-version = "1.5.7"
+version = "1.5.8"
 description = "DBSpec: CLI/TUI for database design (Excel as DSL)"
 readme = "README.md"
 requires-python = ">=3.11"

package/bin/dbspec/_internal/src/resources/sqlalchemy_templates/collation_helper.py.j2

@@ -0,0 +1,16 @@
+import sqlalchemy as sa
+
+
+def _dbspec_collation_kwargs(name: str, schema: str | None = None) -> dict[str, str]:
+    """Keep schema qualification compatible with SQLAlchemy 2.0 and 2.1."""
+    if hasattr(sa.String(), "collation_schema"):
+        result = {"collation": sa.sql.quoted_name(name, quote=True)}
+        if schema is not None:
+            result["collation_schema"] = sa.sql.quoted_name(schema, quote=True)
+        return result
+    escaped_name = name.replace('"', '""')
+    if schema is not None:
+        escaped_schema = schema.replace('"', '""')
+        escaped_name = f'{escaped_schema}"."{escaped_name}'
+    return {"collation": escaped_name}
+

package/package.json

@@ -24,5 +24,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.7"
+  "version": "1.5.8"
 }