@ai-devtools/dbspec-windows-x64 1.6.1 → 1.6.3

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbspec
-Version: 1.6.1
+Version: 1.6.3
 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

@@ -40,6 +40,7 @@ src/db_import/types.py
 src/db_import/validation.py
 src/generators/__init__.py
 src/generators/sqlalchemy/__init__.py
+src/generators/sqlalchemy/attribute_names.py
 src/generators/sqlalchemy/constraints.py
 src/generators/sqlalchemy/context.py
 src/generators/sqlalchemy/domains.py
@@ -54,6 +55,7 @@ src/generators/sqlalchemy/sequences.py
 src/generators/sqlalchemy/tables.py
 src/generators/sqlalchemy/templates.py
 src/generators/sqlalchemy/types.py
+src/generators/sqlalchemy/validation.py
 src/logic/__init__.py
 src/logic/check_rules.py
 src/logic/db_validation.py
@@ -135,6 +137,7 @@ src/resources/sqlalchemy_templates/package_init.py.j2
 src/reveng/__init__.py
 src/storage/__init__.py
 src/storage/alembic_env_patching.py
+src/storage/alembic_service_table.py
 src/storage/atomic.py
 src/storage/config.py
 src/storage/file_utils.py
@@ -252,6 +255,8 @@ src/tui/styles/__init__.py
 src/tui/styles/build.py
 src/tui/styles/tokens.py
 src/utils/__init__.py
+src/utils/default_comparison.py
+src/utils/default_literals.py
 src/utils/parsing.py
 src/utils/postgres_types.py
 src/utils/progress.py

package/bin/dbspec/_internal/{pydantic-2.14.1.dist-info → pydantic-2.14.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pydantic
-Version: 2.14.1
+Version: 2.14.2
 Summary: Data validation using Python type hints
 Project-URL: Homepage, https://github.com/pydantic/pydantic
 Project-URL: Documentation, https://pydantic.dev/docs/validation/latest/get-started/
@@ -31,7 +31,7 @@ Classifier: Topic :: Internet
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10
 Requires-Dist: annotated-types>=0.6.0
-Requires-Dist: pydantic-core==2.50.1
+Requires-Dist: pydantic-core==2.50.2
 Requires-Dist: typing-extensions>=4.16.0
 Requires-Dist: typing-inspection>=0.4.4
 Provides-Extra: email
@@ -117,6 +117,65 @@ See our [security policy](https://github.com/pydantic/pydantic/security/policy).
 <!-- markdownlint-disable descriptive-link-text -->
 <!-- markdownlint-disable-next-line first-line-heading -->
 
+## v2.14.2 (2026-10-29)
+
+[GitHub release](https://github.com/pydantic/pydantic/releases/tag/v2.14.2)
+
+### What's Changed
+
+#### Packaging
+
+* Bump PyO3 to 0.30.1, jiter to 0.18.0, use `PyFrozenDict` by [@Viicos](https://github.com/Viicos) in [#14003](https://github.com/pydantic/pydantic/pull/14003)
+* Bump speedate to v0.18.0 by [@Viicos](https://github.com/Viicos) in [#14007](https://github.com/pydantic/pydantic/pull/14007)
+* Publish `pydantic-core` wheels for PyPy 8.0 (`pp80` ABI) by [@Viicos](https://github.com/Viicos) in [#14083](https://github.com/pydantic/pydantic/pull/14083)
+
+#### Performance
+
+* Avoid Python tuple allocation during model fields validation by [@Viicos](https://github.com/Viicos) in [#13955](https://github.com/pydantic/pydantic/pull/13955)
+* Lazily call repr of values during nested union serialization by [@Viicos](https://github.com/Viicos) in [#14082](https://github.com/pydantic/pydantic/pull/14082)
+* Skip decorator field checks when no field decorators exist by [@alexmojaki](https://github.com/alexmojaki) in [#14111](https://github.com/pydantic/pydantic/pull/14111)
+* Avoid heap allocation for small JSON model field buffers by [@alexmojaki](https://github.com/alexmojaki) in [#14113](https://github.com/pydantic/pydantic/pull/14113)
+
+#### Fixes
+
+* Make JSON validation by iteration consistent with Python approach by [@davidhewitt](https://github.com/davidhewitt) in [#13275](https://github.com/pydantic/pydantic/pull/13275).
+
+  JSON validation now handles field lookup and extra data the same way as Python validation. In particular, keys that only match an
+  unused alias or field name are now treated as extra data, instead of being silently dropped:
+
+    ```python
+    from pydantic import BaseModel, ConfigDict
+    from pydantic.alias_generators import to_camel
+
+
+    class Page(BaseModel):
+        model_config = ConfigDict(extra='forbid', alias_generator=to_camel)
+
+        page_size: int = 10
+
+
+    Page.model_validate_json('{"page_size": 50}')
+    # Before: Page(page_size=10)
+    # After: ValidationError (extra_forbidden)
+    ```
+
+  See the [pull request](https://github.com/pydantic/pydantic/pull/13275) for the full list of behavior changes.
+
+* Fix unpickling of generic classes defined in separate module by [@Viicos](https://github.com/Viicos) in [#13994](https://github.com/pydantic/pydantic/pull/13994)
+* Support explicit `by_alias` overriding `validate_by_alias` in validation JSON schemas by [@Viicos](https://github.com/Viicos) in [#13997](https://github.com/pydantic/pydantic/pull/13997)
+* Fix mypy plugin crash on deferred empty model by [@ilevkivskyi](https://github.com/ilevkivskyi) in [#14027](https://github.com/pydantic/pydantic/pull/14027)
+* Fix infinite recursion when validating an invalid default with `PydanticUseDefault` by [@Viicos](https://github.com/Viicos) in [#14028](https://github.com/pydantic/pydantic/pull/14028)
+* Implement recursion guard for `validate_strings()` by [@Viicos](https://github.com/Viicos) in [#14029](https://github.com/pydantic/pydantic/pull/14029)
+* Support named tuples in `Sequence` serialization by [@Viicos](https://github.com/Viicos) in [#14033](https://github.com/pydantic/pydantic/pull/14033)
+* Take `preserve_empty_path` into account in URL types equality by [@Viicos](https://github.com/Viicos) in [#14035](https://github.com/pydantic/pydantic/pull/14035)
+* Fix pickling of `PydanticCustomError` and `ValidationError`s containing custom errors by [@Viicos](https://github.com/Viicos) in [#14051](https://github.com/pydantic/pydantic/pull/14051)
+* Do not extract attribute docstrings from nested classes and functions by [@Viicos](https://github.com/Viicos) in [#14052](https://github.com/pydantic/pydantic/pull/14052)
+* Fix forward annotations evaluation and type variables substitution when rebuilding parametrized generic models by [@Viicos](https://github.com/Viicos) in [#14054](https://github.com/pydantic/pydantic/pull/14054)
+* Fix `Self` resolution in parametrized generics by [@Viicos](https://github.com/Viicos) in [#14065](https://github.com/pydantic/pydantic/pull/14065)
+* Ignore extra data matching a field name in `TypedDict` and dataclasses with `extra=allow` by [@Viicos](https://github.com/Viicos) in [#14090](https://github.com/pydantic/pydantic/pull/14090)
+* Check mapping `max_length` constraint during validation by [@Viicos](https://github.com/Viicos) in [#14092](https://github.com/pydantic/pydantic/pull/14092)
+* Fix deep copy of self-referential models by [@Viicos](https://github.com/Viicos) in [#14116](https://github.com/pydantic/pydantic/pull/14116)
+
 ## v2.14.1 (2026-10-11)
 
 [GitHub release](https://github.com/pydantic/pydantic/releases/tag/v2.14.1)

package/bin/dbspec/_internal/{pydantic-2.14.1.dist-info → pydantic-2.14.2.dist-info}/RECORD

@@ -1,8 +1,8 @@
-pydantic-2.14.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
-pydantic-2.14.1.dist-info/METADATA,sha256=TUyOjV5qJ9Ugjw15SfJWKOZ0cTMDSWnU0TmbGtU5QDY,133006
-pydantic-2.14.1.dist-info/RECORD,,
-pydantic-2.14.1.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-pydantic-2.14.1.dist-info/licenses/LICENSE,sha256=qeGG88oWte74QxjnpwFyE1GgDLe4rjpDlLZ7SeNSnvM,1129
+pydantic-2.14.2.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
+pydantic-2.14.2.dist-info/METADATA,sha256=XidxXTUMyZvDOHdATeuiqUkSIa6XLbj4x59kAyvuOgE,137593
+pydantic-2.14.2.dist-info/RECORD,,
+pydantic-2.14.2.dist-info/WHEEL,sha256=2iZrJkDIkeDh0k9SikKMqFuRP-ua6mb4Ir1AsER4BEw,87
+pydantic-2.14.2.dist-info/licenses/LICENSE,sha256=qeGG88oWte74QxjnpwFyE1GgDLe4rjpDlLZ7SeNSnvM,1129
 pydantic/__init__.py,sha256=5SSMubvik7NTbb7X_qVDJtzfPAM3CuXwPXlMWEluwBs,15951
 pydantic/__pycache__/__init__.cpython-313.pyc,,
 pydantic/__pycache__/_migration.cpython-313.pyc,,
@@ -76,11 +76,11 @@ pydantic/_internal/_dataclasses.py,sha256=Oxv8s2EK-PQvYAe_9kD1yKg9cMNJtm1lg0SWtR
 pydantic/_internal/_decorators.py,sha256=ZqaoKcwtWudWa-WsopixHSZeA75YGIkI9GOigCmIzlk,35483
 pydantic/_internal/_decorators_v1.py,sha256=v7_cyEBvJceFO0aYa1AuvYeaMvjEYRQ3-TbW8U8Ghds,6198
 pydantic/_internal/_discriminated_union.py,sha256=HdRL2XOFoCeV95rK0YkxJWPhSdmZWnutRaaBkmQ60Hs,27686
-pydantic/_internal/_docs_extraction.py,sha256=8UYnAy-GxCePc0XoH43oIkdNAqFmICLyjp48SMtGoCw,4140
-pydantic/_internal/_fields.py,sha256=-lSyiply9Ttnx51WhUnaxXvnZ0Yem_qZxh7vUSptqyo,39627
+pydantic/_internal/_docs_extraction.py,sha256=V8_-TfG1oUHpEThCvNtZjJaPwd-zVodn4EqkAGv17hY,4708
+pydantic/_internal/_fields.py,sha256=OlKgiqVO6ITTezu46rIDkGdf0gh3qnphx92RhrP4m28,41083
 pydantic/_internal/_forward_ref.py,sha256=q6SQhW8wo9vPZiuXJ661Vfg7PgoqeJBQTA3dpInXWlA,641
-pydantic/_internal/_generate_schema.py,sha256=dZNxARwclDkMeG2j_S16MS8FvDA9GdnNh6VCaiEiFrA,141797
-pydantic/_internal/_generics.py,sha256=4WpBm518c-ZHOiT3ft1hK9JNocIuZkxzjXs8d1bnafg,24574
+pydantic/_internal/_generate_schema.py,sha256=_BIwnVrd3fVO9eSIOvP6-39o7kzsHii1Wbe8eVwJbwY,142174
+pydantic/_internal/_generics.py,sha256=LRATBwa-ezzQkFfTUXET4zfZaQT7U0hPUBioml_fIP0,24847
 pydantic/_internal/_git.py,sha256=IwPh3DPfa2Xq3rBuB9Nx8luR2A1i69QdeTfWWXIuCVg,809
 pydantic/_internal/_import_utils.py,sha256=TRhxD5OuY6CUosioBdBcJUs0om7IIONiZdYAV7zQ8jM,402
 pydantic/_internal/_known_annotated_metadata.py,sha256=KSObdJ3af4YRPEcLFR65XBizJF33h5Ypckeu9JAvKxQ,16863
@@ -90,7 +90,7 @@ pydantic/_internal/_namespace_utils.py,sha256=8_QlLr773kmPzIGCu8RjExBJhGwBn0RAjK
 pydantic/_internal/_repr.py,sha256=MNka4onC9u-tXJvV2rsz3JXsuxqlwKbKnd16-tgxriw,4981
 pydantic/_internal/_schema_gather.py,sha256=0qGbiz4pdcfvdMiH7JueJ10tQ8c750g1OkZ0xyP_20Q,1892
 pydantic/_internal/_schema_generation_shared.py,sha256=8nLsSaqgEebxeF26OwiPBt0ZVPipGqW1IV40agkRfxw,4869
-pydantic/_internal/_serializers.py,sha256=YIWvSmAR5fnbGSWCOQduWt1yB4ZQY42eAruc-enrb6c,1491
+pydantic/_internal/_serializers.py,sha256=evOucDhMiIjaik5f4yMLdDP08ODB0l2pCir22HuQ-Ag,1786
 pydantic/_internal/_signature.py,sha256=64JyRJJ8Gf-JOfrZa2xTNUdGpd7RGqdNLYFXYOFuPZU,7143
 pydantic/_internal/_type_refs.py,sha256=nxJgVhwwxiSOcQbrc1e5La-Dpm5wU_4SSKJUBkp0hOU,4521
 pydantic/_internal/_typing_extra.py,sha256=5WgRV0MVsZqah9pW4o_Bbmsu73BEmELVhO7k23NUNwQ,20967
@@ -139,9 +139,9 @@ pydantic/functional_serializers.py,sha256=wcF7l3ZzY4rEXBG0IkU3KLGr5_NIEKS6-CFq14
 pydantic/functional_validators.py,sha256=ungjnjugPxAh7vPhU7Yp7k6zdPUfKZrtOFbRzN064fw,33225
 pydantic/generics.py,sha256=0ZqZ9O9annIj_3mGBRqps4htey3b5lV1-d2tUxPMMnA,144
 pydantic/json.py,sha256=ZH8RkI7h4Bz-zp8OdTAxbJUoVvcoU-jhMdRZ0B-k0xc,140
-pydantic/json_schema.py,sha256=rRB_vFJULXrsTMsIVahTyIsa0nJX8oMYLe_mhPzqbSA,142234
-pydantic/main.py,sha256=hDNfwFoRKig0r0oEj3HGp8RrkPRGi-5UHaNuQ4o4cZA,91376
-pydantic/mypy.py,sha256=8qaRSTchUYqUln0bg8zojiTEKrO17Sjw5LSyhQSuGRk,64439
+pydantic/json_schema.py,sha256=OM7Qy6JgZ1Gr7ln_2-4lGbAa7N1ftl1-7pYVzO3jtok,143064
+pydantic/main.py,sha256=oYoupv4Cq9EDXdVrNQBv0psMkCJ_cdd-RfoOUq7Vruc,91726
+pydantic/mypy.py,sha256=qWTROdLlgp9sRNXTPd4F3nQke818LSWdr7r83_5lmv4,64611
 pydantic/networks.py,sha256=YIXsCaWUqE7FMwAO5ujYXClMLxI3KP6e2MdVwnP5X4s,44516
 pydantic/parse.py,sha256=wkd82dgtvWtD895U_I6E1htqMlGhBSYEV39cuBSeo3A,141
 pydantic/plugin/__init__.py,sha256=SrVX9XDbUKzt6BVNBRKXKmEqxecEREq6A4WoV_RMJhc,7263
@@ -151,10 +151,10 @@ pydantic/plugin/__pycache__/_schema_validator.cpython-313.pyc,,
 pydantic/plugin/_loader.py,sha256=hAjgSljoIhGx3AVpIpuqw5SPttBNNeGBSTrqSMnNiJk,2213
 pydantic/plugin/_schema_validator.py,sha256=__9f3t6adZxNgyzajuNda5siIvKWDDXssE6QD8hzXB4,5815
 pydantic/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pydantic/root_model.py,sha256=DlZVc2b8wLEYQD6ZmmxPSPMLxI-EnqHspBKysXGZSy0,8703
+pydantic/root_model.py,sha256=7enqbPZHFXk7DO-2H9wG9NxmIGeJcbHSewhKSLS8a4A,8777
 pydantic/schema.py,sha256=Vqqjvq_LnapVknebUd3Bp_J1p2gXZZnZRgL48bVEG7o,142
 pydantic/tools.py,sha256=iHQpd8SJ5DCTtPV5atAV06T89bjSaMFeZZ2LX9lasZY,141
-pydantic/type_adapter.py,sha256=woRrtEFtcoVTrfTyzQ_e2yoprISljsSQU6LzPVx8ZV4,36039
+pydantic/type_adapter.py,sha256=HuIrYnURDsX0TS1L8A_AKxymlqg9MA-ODuaCp99v-kc,36569
 pydantic/types.py,sha256=5IFO7vOYHyaPf4VE2bRi9aUdH1CY-NgADjpYDfwIWQQ,110280
 pydantic/typing.py,sha256=P7feA35MwTcLsR1uL7db0S-oydBxobmXa55YDoBgajQ,138
 pydantic/utils.py,sha256=15nR2QpqTBFlQV4TNtTItMyTJx_fbyV-gPmIEY1Gooc,141
@@ -190,8 +190,8 @@ pydantic/v1/annotated_types.py,sha256=uk2NAAxqiNELKjiHhyhxKaIOh8F1lYW_LzrW3X7oZB
 pydantic/v1/class_validators.py,sha256=ULOaIUgYUDBsHL7EEVEarcM-UubKUggoN8hSbDonsFE,14672
 pydantic/v1/color.py,sha256=iZABLYp6OVoo2AFkP9Ipri_wSc6-Kklu8YuhSartd5g,16844
 pydantic/v1/config.py,sha256=a6P0Wer9x4cbwKW7Xv8poSUqM4WP-RLWwX6YMpYq9AA,6532
-pydantic/v1/dataclasses.py,sha256=784cqvInbwIPWr9usfpX3ch7z4t3J2tTK6N067_wk1o,18172
-pydantic/v1/datetime_parse.py,sha256=4Qy1kQpq3rNVZJeIHeSPDpuS2Bvhp1KPtzJG1xu-H00,7724
+pydantic/v1/dataclasses.py,sha256=0Sfk-TNwm21SqiGhhpzs1DsXajhdWM6Eh5ZiSu4bjIA,18358
+pydantic/v1/datetime_parse.py,sha256=exzh-Ul0IWR4FwRVpvE5aoTQ69DK6R-vNCtUakowBxs,7728
 pydantic/v1/decorator.py,sha256=zaaxxxoWPCm818D1bs0yhapRjXm32V8G0ZHWCdM1uXA,10339
 pydantic/v1/env_settings.py,sha256=A9VXwtRl02AY-jH0C0ouy5VNw3fi6F_pkzuHDjgAAOM,14105
 pydantic/v1/error_wrappers.py,sha256=6625Mfw9qkC2NwitB_JFAWe8B-Xv6zBU7rL9k28tfyo,5196
@@ -200,18 +200,18 @@ pydantic/v1/fields.py,sha256=MjiQ6Q5RkE-koXfmx8tYJbfe97_QeYtnpkQf8OTve_s,50646
 pydantic/v1/generics.py,sha256=YzyKTZN6x5Q1RGJ3WQ9jN-uwHJxL3W4qoZqwcZXqxWg,17829
 pydantic/v1/json.py,sha256=WQ5Hy_hIpfdR3YS8k6N2E6KMJzsdbBi_ldWOPJaV81M,3390
 pydantic/v1/main.py,sha256=vRB1TbpkzPN3P5ijJlc-cjNuO-HciNOpC4b8K3zZnfc,45697
-pydantic/v1/mypy.py,sha256=Cl8XRfCmIcVE3j5AEU52C8iDh8lcX__D3hz2jIWxMAs,38860
+pydantic/v1/mypy.py,sha256=egR4NqF3clfaVYPP5nmj36jjdOHJpRPeGYS83mzNTJY,38898
 pydantic/v1/networks.py,sha256=HYNtKAfOmOnKJpsDg1g6SIkj9WPhU_-i8l5e2JKBpG4,22124
 pydantic/v1/parse.py,sha256=BJtdqiZRtav9VRFCmOxoY-KImQmjPy-A_NoojiFUZxY,1821
 pydantic/v1/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pydantic/v1/schema.py,sha256=aqBuA--cq8gAVkim5BJPFASHzOZ8dFtmFX_fNGr6ip4,47801
 pydantic/v1/tools.py,sha256=1lDdXHk0jL5uP3u5RCYAvUAlGClgAO-45lkq9j7fyBA,2881
-pydantic/v1/types.py,sha256=Bzl-RcnitPBHnqwwj9iv7JjHuN1GpnWH24dKkF3l9e8,35455
+pydantic/v1/types.py,sha256=RfJ19cNFhy-VKs2lzIIl9_dHYn8Vlabd7VktOvoQawI,35793
 pydantic/v1/typing.py,sha256=ovwtLpEZCbnghZaHfSNJupzetzHNkLXjn_66kgTnIV4,20102
 pydantic/v1/utils.py,sha256=1PqOIlz6OVWwGds3HBKlw4Et6asFou0UUpAto7jFOCs,26014
 pydantic/v1/validators.py,sha256=lyUkn1MWhHxlCX5ZfEgFj_CAHojoiPcaQeMdEM9XviU,22187
-pydantic/v1/version.py,sha256=YpHWOQKtGoxfyikzGrcmXJVKUVYB9EBdoCR994QxSnE,1039
+pydantic/v1/version.py,sha256=51ZPNC7FcsbAGRl-p2_vbJ0-bKUtjtwc6hiKrBoG4ZA,1039
 pydantic/validate_call_decorator.py,sha256=oktZNbH04RAEV99NSvl5ETPNLTEEE_HLkwj64TOsWd0,4749
 pydantic/validators.py,sha256=pwbIJXVb1CV2mAE4w_EGfNj7DwzsKaWw_tTL6cviTus,146
-pydantic/version.py,sha256=9afD-VnYJ0CS7G0FdXKCEWW5IPY-ZHRsbU-ETDyysiA,3985
+pydantic/version.py,sha256=mmIXsYMfk9459TcBRmYuHsYc6wO9c9iMFbAT8GZZUFs,3985
 pydantic/warnings.py,sha256=tIhE-YCNiWNgO53dwo7jYdOFv7AHzJmTkbMdEGZLEko,5177

package/bin/dbspec/_internal/{pydantic-2.14.1.dist-info → pydantic-2.14.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.32.4
+Generator: hatchling 1.33.0
 Root-Is-Purelib: true
 Tag: py3-none-any

package/bin/dbspec/_internal/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dbspec"
-version = "1.6.1"
+version = "1.6.3"
 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/README.md

@@ -70,3 +70,26 @@ Jinja-параметров, зависящий только от стандар
 изолированным subprocess без site-packages.
 
 В 1.6.0 IndexContext содержит directions (ASC/DESC/пустая строка) в порядке columns и has_directions. Для направленных unique indexes используйте Index(unique=True), а не UniqueConstraint. Направления передаются методами SQLAlchemy .asc()/.desc(). Проектные шаблоны обновляются отдельно.
+
+## Безопасные Python-атрибуты (1.6.2)
+
+`col.name` хранит исходное SQL-имя, `col.attr_name` — уникальный Python-атрибут.
+При различии передавайте `col.name` первым аргументом `mapped_column`, как в штатном
+шаблоне. Ключевые слова и служебные имена получают безопасные атрибуты; допустимые
+`match`, `case`, `type` сохраняются. Коллизии распределяются детерминированно в общей
+области колонок и связей, без изменения имён SQL-колонок или ограничений.
+
+`rel.fk_columns` сохраняет прежний контракт: локальные имена FK-атрибутов для
+дочерней связи и пустой список для обратной. Новое необязательное поле
+`rel.fk_expression` содержит строку списка class-qualified ссылок
+(`[Child.sender_id]`). Штатный шаблон передаёт её через `py_repr` в
+`relationship.foreign_keys`, разрешая обе стороны после импорта моделей.
+Прежние проектные шаблоны простых связей продолжают работать без обновления.
+
+До замены результата генератор проверяет синтаксис всех Python-файлов, импорт,
+настройку ORM, полноту колонок metadata и разрешение FK в отдельном процессе.
+Это изоляция состояния Python, а не security sandbox пользовательского кода.
+Внешний `base_import` должен импортироваться в окружении генерации; его существующие
+таблицы допустимы, но состав каждой генерируемой таблицы должен совпасть с SSOT.
+При ошибке прежний выходной каталог сохраняется. Установка приложения или соединение
+с БД для штатных шаблонов не требуются.

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

@@ -7,11 +7,12 @@ from collections.abc import Iterator as _DBSpecIterator
 
 _dbspec_NEXTVAL_RE = _dbspec_re.compile(
     r"\bnextval\s*\(\s*'((?:[^']|'')+)'\s*(?:::\s*(?:pg_catalog\.)?regclass)?\s*\)",
-    _dbspec_re.IGNORECASE,
+    _dbspec_re.IGNORECASE | _dbspec_re.ASCII,
 )
 _dbspec_SEQUENCE_IDENTIFIER_RE = _dbspec_re.compile(r'"((?:[^"]|"")+)"|([^\W\d][\w$]*)')
 _dbspec_DOLLAR_QUOTE_RE = _dbspec_re.compile(r"\$(?:[^\W\d]\w*)?\$")
 _dbspec_INVALID_SEQUENCE_IDENTIFIER = "Invalid nextval sequence identifier"
+_dbspec_SQL_WHITESPACE = " \t\n\r\f\v"
 
 
 def _dbspec_sequence_identity(value: str) -> tuple[str, ...]:
@@ -19,7 +20,7 @@ def _dbspec_sequence_identity(value: str) -> tuple[str, ...]:
     parts: list[str] = []
     end = 0
     for match in _dbspec_SEQUENCE_IDENTIFIER_RE.finditer(value):
-        separator = value[end : match.start()].strip()
+        separator = value[end : match.start()].strip(_dbspec_SQL_WHITESPACE)
         if separator != ("." if parts else ""):
             raise ValueError(f"{_dbspec_INVALID_SEQUENCE_IDENTIFIER}: {value!r}")
         quoted, unquoted = match.groups()
@@ -29,7 +30,7 @@ def _dbspec_sequence_identity(value: str) -> tuple[str, ...]:
             else "".join(char.lower() if char.isascii() else char for char in unquoted)
         )
         end = match.end()
-    if value[end:].strip() or len(parts) not in (1, 2):
+    if value[end:].strip(_dbspec_SQL_WHITESPACE) or len(parts) not in (1, 2):
         raise ValueError(f"{_dbspec_INVALID_SEQUENCE_IDENTIFIER}: {value!r}")
     return tuple(parts)
 
@@ -85,11 +86,7 @@ def _dbspec_executed_nextval_arguments(sql: str) -> _DBSpecIterator[str]:
             position += 1
 
 
-_dbspec_CAST_RE = _dbspec_re.compile(
-    r"::\s*(?:pg_catalog\.)?[a-z_][\w. ]*(?:\(\s*\d+\s*\))?$", _dbspec_re.I
-)
 _dbspec_INTEGER_RE = _dbspec_re.compile(r"[+-]?\d+")
-_dbspec_WHITESPACE_RE = _dbspec_re.compile(r"\s+")
 
 
 def dbspec_compare_server_default(
@@ -126,21 +123,21 @@ def _dbspec_normalize_default(
 ) -> tuple[str, tuple[str, ...] | str] | None:
     if value is None:
         return None
-    text = str(value).strip()
+    text = str(value).strip(_dbspec_SQL_WHITESPACE)
     if not text:
         return None
     sequence = _dbspec_normalize_nextval(text, column)
     if sequence is not None:
         return ("nextval", sequence)
-    return ("literal", _dbspec_normalize_literal_default(text))
+    return ("literal", _dbspec_normalize_literal_default(text, column))
 
 
 def _dbspec_normalize_nextval(value: str, column: _DBSpecAny) -> tuple[str, ...] | None:
     try:
-        arguments = list(_dbspec_executed_nextval_arguments(value))
-        if not arguments:
+        match = _dbspec_NEXTVAL_RE.fullmatch(_dbspec_strip_balanced_parentheses(value))
+        if match is None:
             return None
-        identity = _dbspec_sequence_identity(arguments[0].replace("''", "'"))
+        identity = _dbspec_sequence_identity(match[1].replace("''", "'"))
     except ValueError:
         return None
     if len(identity) == 1:
@@ -156,58 +153,143 @@ def _dbspec_column_schema(column: _DBSpecAny) -> str | None:
     return schema if isinstance(schema, str) and schema else None
 
 
-def _dbspec_normalize_literal_default(value: str) -> str:
-    text = value.strip()
-    lowered = text.lower()
-    if lowered.startswith("default "):
-        text = text[8:].strip()
-    text = _dbspec_strip_balanced_parentheses(text)
-    text = _dbspec_CAST_RE.sub("", text).strip()
-    text = _dbspec_strip_balanced_parentheses(text)
-    lowered = text.lower()
-    if lowered in {"true", "'true'", "1"}:
-        return "true"
-    if lowered in {"false", "'false'", "0"}:
-        return "false"
-    if _dbspec_INTEGER_RE.fullmatch(text):
-        return str(int(text))
-    return _dbspec_WHITESPACE_RE.sub(" ", lowered)
+def _dbspec_sql_tokens(value: str) -> list[str]:
+    """Tokenize enough PostgreSQL syntax to preserve literals and grouping."""
+    tokens: list[str] = []
+    position = 0
+    whitespace = ""
+    while position < len(value):
+        if value[position] in _dbspec_SQL_WHITESPACE:
+            whitespace += value[position]
+            position += 1
+            continue
+        start = position
+        if value.startswith("--", position):
+            end = value.find("\n", position)
+            position = len(value) if end < 0 else end + 1
+        elif value.startswith("/*", position):
+            depth = 1
+            position += 2
+            while position < len(value) and depth:
+                if value.startswith("/*", position):
+                    depth += 1
+                    position += 2
+                elif value.startswith("*/", position):
+                    depth -= 1
+                    position += 2
+                else:
+                    position += 1
+        elif match := _dbspec_DOLLAR_QUOTE_RE.match(value, position):
+            end = value.find(match[0], match.end())
+            position = len(value) if end < 0 else end + len(match[0])
+        elif value[position] in ("'", '"') or (
+            value[position] in "eEbBxXnN" and value[position + 1:position + 2] == "'"
+        ) or (
+            value[position] in "uU" and value[position + 1:position + 2] == "&"
+            and value[position + 2:position + 3] in ("'", '"')
+        ):
+            escaped = value[position] in "eE"
+            if value[position] in "uU":
+                position += 2
+            elif value[position] in "eEbBxXnN":
+                position += 1
+            quote = value[position]
+            position += 1
+            while position < len(value):
+                if value.startswith(quote * 2, position):
+                    position += 2
+                elif escaped and value[position] == "\\":
+                    position += 2
+                elif value[position] == quote:
+                    position += 1
+                    break
+                else:
+                    position += 1
+        else:
+            match = _dbspec_re.match(
+                r"(?:[A-Za-z_]|[^\x00-\x7f])(?:[A-Za-z_0-9$]|[^\x00-\x7f])*|[0-9]+(?:\.[0-9]+)?|[+*/<>=~!@#%^&|`?:-]+|.",
+                value[position:],
+            )
+            assert match is not None
+            position += len(match[0])
+        token = value[start:position]
+        # Adjacent string literals separated by a newline concatenate in PostgreSQL.
+        if whitespace and tokens and tokens[-1].endswith("'") and token.startswith("'"):
+            tokens.append("\n" if "\n" in whitespace else " ")
+        whitespace = ""
+        opaque = token.startswith(("'", '"', "$", "--", "/*")) or (
+            len(token) >= 2 and token[0] in "eEbBxXnN" and token[1] == "'"
+        ) or (len(token) >= 3 and token[0] in "uU" and token[1] == "&" and token[2] in ("'", '"'))
+        folded = "".join(char.lower() if char.isascii() else char for char in token)
+        tokens.append(token if opaque else folded)
+    return tokens
 
 
 def _dbspec_strip_balanced_parentheses(value: str) -> str:
-    text = value.strip()
-    while (
-        text.startswith("(")
-        and text.endswith(")")
-        and _dbspec_has_wrapping_parentheses(text)
-    ):
-        text = text[1:-1].strip()
-    return text
+    tokens = _dbspec_sql_tokens(value)
+    while len(tokens) >= 2 and tokens[0] == "(" and tokens[-1] == ")":
+        depth = 0
+        for position, token in enumerate(tokens):
+            if token == "(":
+                depth += 1
+            elif token == ")":
+                depth -= 1
+            if depth <= 0 and position != len(tokens) - 1:
+                return " ".join(tokens)
+        if depth != 0:
+            break
+        tokens = tokens[1:-1]
+    return " ".join(tokens)
 
 
-def _dbspec_has_wrapping_parentheses(value: str) -> bool:
-    depth = 0
-    quote: str | None = None
-    index = 0
-    while index < len(value):
-        char = value[index]
-        if quote is not None:
-            if char == quote:
-                if index + 1 < len(value) and value[index + 1] == quote:
-                    index += 2
-                    continue
-                quote = None
-            index += 1
-            continue
-        if char in {"'", '"'}:
-            quote = char
-        elif char == "(":
-            depth += 1
-        elif char == ")":
-            depth -= 1
-            if depth == 0 and index != len(value) - 1:
-                return False
-        if depth < 0:
-            return False
-        index += 1
-    return depth == 0
+def _dbspec_normalize_sql_expression(value: str) -> str:
+    return _dbspec_strip_balanced_parentheses(value)
+
+
+def _dbspec_string_literal(value: str) -> str | None:
+    match = _dbspec_re.fullmatch(
+        r"'((?:[^']|'')*)'(?:\s*::\s*(?:pg_catalog\s*\.\s*)?(?:text|varchar|character\s+varying))?",
+        value, _dbspec_re.IGNORECASE | _dbspec_re.ASCII,
+    )
+    return match[1].replace("''", "'") if match else None
+
+
+def _dbspec_normalize_literal_default(value: str, column: _DBSpecAny = None) -> str:
+    text = value.strip(_dbspec_SQL_WHITESPACE)
+    if text.lower().startswith("default "):
+        text = text[8:].strip(_dbspec_SQL_WHITESPACE)
+    text = _dbspec_strip_balanced_parentheses(text)
+    column_type = str(getattr(column, "type", "")).lower()
+    if _dbspec_re.fullmatch(r"(?:varchar|character varying|text)(?:\(\d+\))?", column_type):
+        literal = _dbspec_string_literal(text)
+        if literal is not None:
+            return "string:" + literal
+        return "sql:" + text
+    # Only normalize primitive casts; expressions and domain casts stay visible.
+    cast = _dbspec_re.fullmatch(
+        r"(.+?)\s*::\s*(?:pg_catalog\s*\.\s*)?(boolean|bool|integer|int|int4|bigint|int8|smallint|int2)",
+        text, _dbspec_re.IGNORECASE | _dbspec_re.ASCII,
+    )
+    primitive_text = _dbspec_strip_balanced_parentheses(cast[1]) if cast else text
+    cast_type = cast[2].lower() if cast else ""
+    boolean_casts = {"boolean", "bool"}
+    if cast_type in boolean_casts:
+        boolean = _dbspec_re.fullmatch(r"(?:'(true|false)'|(true|false))", primitive_text, _dbspec_re.IGNORECASE | _dbspec_re.ASCII)
+        if boolean:
+            return (boolean[1] or boolean[2]).lower()
+        return text
+    if cast:
+        # Quoted numeric literals are safe only with an explicit integer cast.
+        quoted = _dbspec_re.fullmatch(r"'([+-]?[0-9]+)'", primitive_text)
+        if quoted:
+            primitive_text = quoted[1]
+    integer = _dbspec_re.fullmatch(r"([+-]?)[ \t\n\r\f\v]*([0-9]+)", primitive_text)
+    if integer:
+        number = int(integer[1] + integer[2])
+        bit_width = {"smallint": 16, "int2": 16, "integer": 32, "int": 32, "int4": 32, "bigint": 64, "int8": 64}.get(cast_type)
+        if bit_width is not None and not -(2 ** (bit_width - 1)) <= number < 2 ** (bit_width - 1):
+            return text
+        return str(number)
+    if not cast and primitive_text.lower() in {"true", "false"}:
+        return primitive_text.lower()
+    return text

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

@@ -1,4 +1,4 @@
-# Domain package: {{ domain.name }}
+{{ ("Domain package: " ~ domain.name) | py_repr }}
 
 {% if model_mode == "core" %}
 {% for table in domain.tables %}
@@ -7,7 +7,7 @@ from .{{ table.module_name }} import {{ table.module_name }}
 
 __all__ = [
 {% for table in domain.tables %}
-    "{{ table.module_name }}",
+    {{ table.module_name | py_string }},
 {% endfor %}
 ]
 {% else %}
@@ -23,7 +23,7 @@ from .{{ table.module_name }} import {{ table.export_name }}
 
 __all__ = [
 {% for table in domain.tables %}
-    "{{ table.export_name }}",
+    {{ table.export_name | py_string }},
 {% endfor %}
 ]
 {% endif %}

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

@@ -1,4 +1,4 @@
-"""{{ table.description if include_comments and table.description else table.class_name ~ " model." }}"""
+{{ (table.description if include_comments and table.description else table.class_name ~ " model.") | py_repr }}
 
 from __future__ import annotations
 
@@ -32,11 +32,11 @@ from ..{{ common_dir_name }}.base import metadata
 {% for enum in table.enums %}
 {{ enum.var_name }} = ENUM(
     {% for v in enum.values %}
-    "{{ v | replace('"', '\\"') }}"{% if not loop.last %}, {% endif +%}
+    {{ v | py_string }}{% if not loop.last %}, {% endif +%}
     {% endfor %}
     ,
-    name="{{ enum.name }}",
-    schema="{{ enum.schema }}",
+    name={{ enum.name | py_string }},
+    schema={{ enum.schema | py_string }},
     create_type={{ "True" if enum.create_type else "False" }},
 )
 {% endfor %}
@@ -45,24 +45,24 @@ from ..{{ common_dir_name }}.base import metadata
 {% if table.sequences %}
 {% for seq in table.sequences %}
 {{ seq.var_name }} = Sequence(
-    "{{ seq.name }}",
+    {{ seq.name | py_string }},
 {% if seq.schema %}
-    schema="{{ seq.schema }}",
+    schema={{ seq.schema | py_string }},
 {% endif %}
 )
 {% endfor %}
 {% endif %}
 
 {{ table.module_name }} = Table(
-    "{{ table.table }}",
+    {{ table.table | py_string }},
     metadata,
 {% for col in table.columns %}
     Column(
-        "{{ col.name }}",
+        {{ col.name | py_string }},
         {{ col.sa_type }},
 {% set col_args = [] -%}
 {% if col.fk_target -%}
-{% set _ = col_args.append('ForeignKey("' ~ col.fk_target ~ '")') -%}
+{% set _ = col_args.append('ForeignKey(' ~ (col.fk_target | py_string) ~ ')') -%}
 {% endif -%}
 {% if col.sequence -%}
 {% set _ = col_args.append(col.sequence.var_name) -%}
@@ -81,7 +81,7 @@ from ..{{ common_dir_name }}.base import metadata
 {% if col.sequence -%}
 {% set _ = col_args.append('server_default=' ~ col.sequence.var_name ~ '.next_value()') -%}
 {% elif col.server_default -%}
-{% set _ = col_args.append('server_default=text("' ~ (col.server_default | replace('\"', '\\\"')) ~ '")') -%}
+{% set _ = col_args.append('server_default=text(' ~ (col.server_default | py_string) ~ ')') -%}
 {% endif -%}
 {% if include_comments and col.description -%}
 {% set _ = col_args.append('comment=' ~ (col.description | py_repr)) -%}
@@ -94,9 +94,9 @@ from ..{{ common_dir_name }}.base import metadata
 {% if table.pk_constraint and table.pk_constraint.columns %}
     PrimaryKeyConstraint(
 {% for pk_col in table.pk_constraint.columns %}
-        "{{ pk_col }}",
+        {{ pk_col | py_string }},
 {% endfor %}
-        name="{{ table.pk_constraint.name }}",
+        name={{ table.pk_constraint.name | py_string }},
     ),
 {% endif %}
 {% for check in table.check_constraints %}
@@ -105,9 +105,9 @@ from ..{{ common_dir_name }}.base import metadata
 {% for constraint in table.unique_constraints %}
     UniqueConstraint(
 {% for c in constraint.columns %}
-        "{{ c }}",
+        {{ c | py_string }},
 {% endfor %}
-        name="{{ constraint.name }}",
+        name={{ constraint.name | py_string }},
 {% if constraint.nulls_not_distinct %}
         postgresql_nulls_not_distinct=True,
 {% endif %}
@@ -117,13 +117,13 @@ from ..{{ common_dir_name }}.base import metadata
 {% if idx.unique and not idx.where and not idx.has_directions %}
     UniqueConstraint(
 {% for c in idx.columns %}
-        "{{ c }}",
+        {{ c | py_string }},
 {% endfor %}
-        name="{{ idx.name }}",
+        name={{ idx.name | py_string }},
     ),
 {% endif %}
 {% endfor %}
-    schema="{{ table.schema }}",
+    schema={{ table.schema | py_string }},
 {% if include_comments and table.description %}
     comment={{ table.description | py_repr }},
 {% endif %}
@@ -131,7 +131,7 @@ from ..{{ common_dir_name }}.base import metadata
 {% for idx in table.indexes %}
 {% if idx.where or not idx.unique or idx.has_directions %}
 Index(
-    "{{ idx.name }}",
+    {{ idx.name | py_string }},
 {% for c in idx.columns %}
     {{ table.module_name }}.c[{{ c | py_repr }}]{% if idx.directions[loop.index0] %}.{{ idx.directions[loop.index0] | lower }}(){% endif %},
 {% endfor %}
@@ -139,7 +139,7 @@ Index(
     unique=True,
 {% endif %}
 {% if idx.where %}
-    postgresql_where=text("{{ idx.where }}"),
+    postgresql_where=text({{ idx.where | py_string }}),
 {% endif %}
 )
 {% endif %}
@@ -186,11 +186,11 @@ if TYPE_CHECKING:
 {% for enum in table.enums %}
 {{ enum.var_name }} = ENUM(
     {% for v in enum.values %}
-    "{{ v | replace('"', '\\"') }}"{% if not loop.last %}, {% endif +%}
+    {{ v | py_string }}{% if not loop.last %}, {% endif +%}
     {% endfor %}
     ,
-    name="{{ enum.name }}",
-    schema="{{ enum.schema }}",
+    name={{ enum.name | py_string }},
+    schema={{ enum.schema | py_string }},
     create_type={{ "True" if enum.create_type else "False" }},
 )
 {% endfor %}
@@ -199,9 +199,9 @@ if TYPE_CHECKING:
 {% if table.sequences %}
 {% for seq in table.sequences %}
 {{ seq.var_name }} = Sequence(
-    "{{ seq.name }}",
+    {{ seq.name | py_string }},
 {% if seq.schema %}
-    schema="{{ seq.schema }}",
+    schema={{ seq.schema | py_string }},
 {% endif %}
 )
 {% endfor %}
@@ -209,9 +209,9 @@ if TYPE_CHECKING:
 
 
 class {{ table.class_name }}({{ base_class }}):
-    """{{ table.description if include_comments and table.description else table.class_name ~ " table." }}"""
+    {{ (table.description if include_comments and table.description else table.class_name ~ " table.") | py_repr }}
 
-    __tablename__ = "{{ table.table }}"  # type: ignore[assignment]
+    __tablename__ = {{ table.table | py_string }}  # type: ignore[assignment]
 
 {% set has_table_level_args = (table.indexes and (table.indexes | length > 0)) or (table.unique_constraints and (table.unique_constraints | length > 0)) or (table.pk_constraint and table.pk_constraint.columns) or (table.check_constraints and (table.check_constraints | length > 0)) %}
 {% if has_table_level_args %}
@@ -219,9 +219,9 @@ class {{ table.class_name }}({{ base_class }}):
 {% if table.pk_constraint and table.pk_constraint.columns %}
         PrimaryKeyConstraint(
 {% for pk_col in table.pk_constraint.columns %}
-            "{{ pk_col }}",
+            {{ pk_col | py_string }},
 {% endfor %}
-            name="{{ table.pk_constraint.name }}",
+            name={{ table.pk_constraint.name | py_string }},
         ),
 {% endif %}
 {% for check in table.check_constraints %}
@@ -230,9 +230,9 @@ class {{ table.class_name }}({{ base_class }}):
 {% for constraint in table.unique_constraints %}
         UniqueConstraint(
 {% for c in constraint.columns %}
-            "{{ c }}",
+            {{ c | py_string }},
 {% endfor %}
-            name="{{ constraint.name }}",
+            name={{ constraint.name | py_string }},
 {% if constraint.nulls_not_distinct %}
             postgresql_nulls_not_distinct=True,
 {% endif %}
@@ -252,49 +252,49 @@ class {{ table.class_name }}({{ base_class }}):
         ),
 {% elif idx.where and idx.unique %}
         Index(
-            "{{ idx.name }}",
+            {{ idx.name | py_string }},
 {% for c in idx.columns %}
-            "{{ c }}",
+            {{ c | py_string }},
 {% endfor %}
             unique=True,
-            postgresql_where=text("{{ idx.where }}"),
+            postgresql_where=text({{ idx.where | py_string }}),
         ),
 {% elif idx.where %}
         Index(
-            "{{ idx.name }}",
+            {{ idx.name | py_string }},
 {% for c in idx.columns %}
-            "{{ c }}",
+            {{ c | py_string }},
 {% endfor %}
-            postgresql_where=text("{{ idx.where }}"),
+            postgresql_where=text({{ idx.where | py_string }}),
         ),
 {% elif idx.unique %}
         UniqueConstraint(
 {% for c in idx.columns %}
-            "{{ c }}",
+            {{ c | py_string }},
 {% endfor %}
-            name="{{ idx.name }}",
+            name={{ idx.name | py_string }},
         ),
 {% else %}
         Index(
-            "{{ idx.name }}",
+            {{ idx.name | py_string }},
 {% for c in idx.columns %}
-            "{{ c }}",
+            {{ c | py_string }},
 {% endfor %}
         ),
 {% endif %}
 {% endfor %}
         {
-            "schema": "{{ table.schema }}",
+            "schema": {{ table.schema | py_string }},
 {% if include_comments and table.description %}
-            "comment": "{{ table.description }}",
+            "comment": {{ table.description | py_string }},
 {% endif %}
         },
     )
 {% else %}
     __table_args__ = {
-        "schema": "{{ table.schema }}",
+        "schema": {{ table.schema | py_string }},
 {% if include_comments and table.description %}
-        "comment": "{{ table.description }}",
+        "comment": {{ table.description | py_string }},
 {% endif %}
     }
 {% endif %}
@@ -307,7 +307,7 @@ class {{ table.class_name }}({{ base_class }}):
         {{ col.sa_type }},
 {% set col_args = [] -%}
 {% if col.fk_target -%}
-{% set _ = col_args.append('ForeignKey("' ~ col.fk_target ~ '")') -%}
+{% set _ = col_args.append('ForeignKey(' ~ (col.fk_target | py_string) ~ ')') -%}
 {% endif -%}
 {% if col.sequence -%}
 {% set _ = col_args.append(col.sequence.var_name) -%}
@@ -326,7 +326,7 @@ class {{ table.class_name }}({{ base_class }}):
 {% if col.sequence -%}
 {% set _ = col_args.append('server_default=' ~ col.sequence.var_name ~ '.next_value()') -%}
 {% elif col.server_default -%}
-{% set _ = col_args.append('server_default=text("' ~ (col.server_default | replace('\"', '\\\"')) ~ '")') -%}
+{% set _ = col_args.append('server_default=text(' ~ (col.server_default | py_string) ~ ')') -%}
 {% endif -%}
 {% if include_comments and col.description -%}
 {% set _ = col_args.append('comment=' ~ (col.description | py_repr)) -%}
@@ -340,10 +340,10 @@ class {{ table.class_name }}({{ base_class }}):
     # Relationships
 {% for rel in table.relationships %}
     {{ rel.attr_name }}: Mapped[{{ rel.python_type }}] = relationship(
-        "{{ rel.target_class }}",
-        back_populates="{{ rel.back_populates }}",
-{% if rel.fk_columns %}
-        foreign_keys=[{% for fk_col in rel.fk_columns %}{{ fk_col }}{% if not loop.last %}, {% endif %}{% endfor %}],
+        {{ rel.target_class | py_string }},
+        back_populates={{ rel.back_populates | py_string }},
+{% if rel.fk_expression %}
+        foreign_keys={{ rel.fk_expression | py_repr }},
 {% endif %}
     )
 {% endfor %}

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

@@ -14,7 +14,7 @@ __all__ = [
     "metadata",
 {% for domain in domains %}
 {% for table in domain.tables %}
-    "{{ table.module_name }}",
+    {{ table.module_name | py_string }},
 {% endfor %}
 {% endfor %}
 ]
@@ -41,14 +41,14 @@ from .{{ domain.module_name }}.{{ table.module_name }} import {{ table.export_na
 {% endfor %}
 
 __all__ = [
-    "{{ base_class }}",
+    {{ base_class | py_string }},
 {% for domain in domains %}
 {% for table in domain.tables %}
-    "{{ table.export_name }}",
+    {{ table.export_name | py_string }},
 {% endfor %}
 {% endfor %}
 ]
 {% else %}
-__all__ = ["{{ base_class }}"]
+__all__ = [{{ base_class | py_string }}]
 {% endif %}
 {% endif %}

package/bin/dbspec/_internal/tzdata/zoneinfo/leapseconds

@@ -1,4 +1,4 @@
-# Allowance for leap seconds added to each time zone file.
+# Leap seconds (1972-2016) optionally added to TZif files.
 
 # This file is in the public domain.
 
@@ -6,7 +6,7 @@
 # NIST/IERS format leap-seconds.list file, which can be copied from
 # <https://hpiers.obspm.fr/iers/bul/bulc/ntp/leap-seconds.list>
 # or via a less-secure protocol and with different comments and
-# less volatile last-modified and expiration timestamps, from
+# less volatile timestamp metadata, from
 # <ftp://ftp.boulder.nist.gov/pub/time/leap-seconds.list>.
 # For more about leap-seconds.list, please see
 # The NTP Timescale and Leap Seconds
@@ -18,10 +18,8 @@
 # (ITU-R) Recommendation TF.460-6 (02/2002)
 # <https://www.itu.int/rec/R-REC-TF.460-6-200202-I/>.
 # The International Earth Rotation and Reference Systems Service (IERS)
-# periodically uses leap seconds to keep UTC to within 0.9 s of UT1
-# (a proxy for Earth's angle in space as measured by astronomers)
-# and publishes leap second data in a copyrighted file
-# <https://hpiers.obspm.fr/iers/bul/bulc/Leap_Second.dat>.
+# periodically used leap seconds to keep UTC to within 0.9 s of UT1
+# (a proxy for Earth's angle in space as measured by astronomers).
 # See: Levine J. Coordinated Universal Time and the leap second.
 # URSI Radio Sci Bull. 2016;89(4):30-6. doi:10.23919/URSIRSB.2016.7909995
 # <https://ieeexplore.ieee.org/document/7909995>.
@@ -33,8 +31,8 @@
 # of UTC.
 
 # All leap-seconds are Stationary (S) at the given UTC time.
-# The correction (+ or -) is made at the given time, so in the unlikely
-# event of a negative leap second, a line would look like this:
+# The correction (+ or -) is made at the given time, so if a negative
+# leap second had ever occurred, a line would have looked like this:
 # Leap	YEAR	MON	DAY	23:59:59	-	S
 # Typical lines look like this:
 # Leap	YEAR	MON	DAY	23:59:60	+	S
@@ -67,8 +65,9 @@ Leap	2015	Jun	30	23:59:60	+	S
 Leap	2016	Dec	31	23:59:60	+	S
 
 # UTC timestamp when this leap second list expires.
-# Any additional leap seconds will come after this.
-# This Expires line is commented out for now,
+# The idea was that any additional leap seconds would come after this.
+# This timestamp is obsolete as there will be no more leap seconds.
+# This Expires line is commented out, to avoid confusion, and
 # so that pre-2020a zic implementations do not reject this file.
 #Expires 2027	Jun	28	00:00:00
 
@@ -76,10 +75,9 @@ Leap	2016	Dec	31	23:59:60	+	S
 # "#updated" gives the last time the leap seconds data changed
 # or, if this file was derived from the IERS leap-seconds.list,
 # the last time that file changed in any way.
-# "#expires" gives the first time this file might be wrong;
-# if this file was derived from the IERS leap-seconds.list,
-# this is typically a bit less than one year after "updated".
 #updated 1783323897 (2026-07-06 07:44:57 UTC)
+# "#expires" gives the first time this file might be wrong.
+# This timestamp is obsolete as there will be no more leap seconds.
 #expires 1814140800 (2027-06-28 00:00:00 UTC)
 
 #	Updated through IERS Bulletin C (https://hpiers.obspm.fr/iers/bul/bulc/bulletinc.dat)

package/bin/dbspec/_internal/tzdata/zoneinfo/tzdata.zi

@@ -1,4 +1,4 @@
-# version 2026e
+# version 2026f
 # redo posix_only
 # This zic input file is in the public domain.
 R d 1916 o - Jun 14 23s 1 S
@@ -1700,8 +1700,10 @@ R Q 2009 2010 - Mar Su>=8 0s 1 D
 R Q 2011 o - Mar Su>=15 0s 1 D
 R Q 2011 o - N 13 0s 0 S
 R Q 2012 o - Ap 1 0s 1 D
-R Q 2012 ma - N Su>=1 0s 0 S
-R Q 2013 ma - Mar Su>=8 0s 1 D
+R Q 2012 2025 - N Su>=1 0s 0 S
+R Q 2013 2026 - Mar Su>=8 0s 1 D
+R Q 2027 ma - N Su>=1 0s 0 S
+R Q 2028 ma - Mar Su>=8 0s 1 D
 R DO 1966 o - O 30 0 1 EDT
 R DO 1967 o - F 28 0 0 EST
 R DO 1969 1973 - O lastSu 0 0:30 -0430
@@ -1771,19 +1773,20 @@ R A 2008 o - O Su>=15 0 1 -
 R Sa 2008 2009 - Mar Su>=8 0 0 -
 R Sa 2007 2008 - O Su>=8 0 1 -
 R B 1931 o - O 3 11 1 -
-R B 1932 1933 - Ap 1 0 0 -
+R B 1932 1933 - Mar 31 24 0 -
 R B 1932 o - O 3 0 1 -
 R B 1949 1952 - D 1 0 1 -
 R B 1950 o - Ap 16 1 0 -
-R B 1951 1952 - Ap 1 0 0 -
-R B 1953 o - Mar 1 0 0 -
+R B 1951 1952 - Mar 31 24 0 -
+R B 1953 o - F 28 24 0 -
 R B 1963 o - D 9 0 1 -
 R B 1964 o - Mar 1 0 0 -
 R B 1965 o - Ja 31 0 1 -
-R B 1965 o - Mar 31 0 0 -
-R B 1965 o - D 1 0 1 -
-R B 1966 1968 - Mar 1 0 0 -
+R B 1965 o - Mar 31 24 0 -
+R B 1965 o - N 30 24 1 -
+R B 1966 o - Mar 1 1 0 -
 R B 1966 1967 - N 1 0 1 -
+R B 1967 1968 - Mar 1 0 0 -
 R B 1985 o - N 2 0 1 -
 R B 1986 o - Mar 15 0 0 -
 R B 1986 o - O 25 0 1 -

package/package.json

@@ -24,5 +24,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.6.1"
+  "version": "1.6.3"
 }