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

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.2
 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

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.2"
 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/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.2"
 }