@ai-devtools/dbspec-linux-x64 1.5.9 → 1.5.12

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

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

@@ -126,6 +126,7 @@ src/models/tech.py
 src/resources/__init__.py
 src/resources/sqlalchemy_templates/README.md
 src/resources/sqlalchemy_templates/__init__.py
+src/resources/sqlalchemy_templates/alembic_default_comparator.py.j2
 src/resources/sqlalchemy_templates/base.py.j2
 src/resources/sqlalchemy_templates/collation_helper.py.j2
 src/resources/sqlalchemy_templates/domain_init.py.j2
@@ -133,6 +134,7 @@ src/resources/sqlalchemy_templates/model.py.j2
 src/resources/sqlalchemy_templates/package_init.py.j2
 src/reveng/__init__.py
 src/storage/__init__.py
+src/storage/alembic_env_patching.py
 src/storage/atomic.py
 src/storage/config.py
 src/storage/file_utils.py

package/bin/dbspec/_internal/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dbspec"
-version = "1.5.9"
+version = "1.5.12"
 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

@@ -57,3 +57,14 @@
 ### `domain_init.py.j2`
 Ключи контекста:
 - `domain` - текущий домен с `tables` (module_name, class_name)
+
+## Автономный Alembic comparator
+
+`alembic_default_comparator.py.j2` содержит канонический Python-код без
+Jinja-параметров, зависящий только от стандартной библиотеки. DBSpec исполняет этот
+же ресурс для собственного сравнения defaults и разбора sequence identifiers;
+инициализация встраивает его в `env.py` потребителя между управляемыми маркерами.
+Так сохраняется единая реализация и не создаётся runtime-зависимость приложения
+от исходников или пакета DBSpec. Ресурс входит в существующее пакетирование `*.j2`
+и сборку frozen CLI; изменения проверяются тестами scanner/comparator и
+изолированным subprocess без site-packages.

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

@@ -0,0 +1,213 @@
+"""Alembic server-default comparison helpers."""
+
+import re as _dbspec_re
+from typing import Any as _DBSpecAny
+
+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_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"
+
+
+def _dbspec_sequence_identity(value: str) -> tuple[str, ...]:
+    """Parse SQL identifiers without accepting SQL statement fragments."""
+    parts: list[str] = []
+    end = 0
+    for match in _dbspec_SEQUENCE_IDENTIFIER_RE.finditer(value):
+        separator = value[end : match.start()].strip()
+        if separator != ("." if parts else ""):
+            raise ValueError(f"{_dbspec_INVALID_SEQUENCE_IDENTIFIER}: {value!r}")
+        quoted, unquoted = match.groups()
+        parts.append(
+            quoted.replace('""', '"')
+            if quoted is not None
+            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):
+        raise ValueError(f"{_dbspec_INVALID_SEQUENCE_IDENTIFIER}: {value!r}")
+    return tuple(parts)
+
+
+def _dbspec_executed_nextval_arguments(sql: str) -> _DBSpecIterator[str]:
+    """Find calls outside PostgreSQL literals, identifiers and nested comments."""
+    position = 0
+    while position < len(sql):
+        if sql.startswith("--", position):
+            newline = sql.find("\n", position)
+            position = len(sql) if newline < 0 else newline + 1
+        elif sql.startswith("/*", position):
+            depth = 1
+            position += 2
+            while position < len(sql) and depth:
+                if sql.startswith("/*", position):
+                    depth += 1
+                    position += 2
+                elif sql.startswith("*/", position):
+                    depth -= 1
+                    position += 2
+                else:
+                    position += 1
+        elif sql[position] in ("'", '"'):
+            quote = sql[position]
+            escaped_string = (
+                quote == "'"
+                and position > 0
+                and sql[position - 1] in "eE"
+                and (
+                    position < 2
+                    or not (sql[position - 2].isalnum() or sql[position - 2] in "_$")
+                )
+            )
+            position += 1
+            while position < len(sql):
+                if sql.startswith(quote * 2, position):
+                    position += 2
+                elif sql[position] == quote:
+                    position += 1
+                    break
+                elif sql[position] == "\\" and escaped_string:
+                    position += 2
+                else:
+                    position += 1
+        elif match := _dbspec_DOLLAR_QUOTE_RE.match(sql, position):
+            closing = sql.find(match[0], match.end())
+            position = len(sql) if closing < 0 else closing + len(match[0])
+        elif match := _dbspec_NEXTVAL_RE.match(sql, position):
+            yield match[1]
+            position = match.end()
+        else:
+            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(
+    _context: _DBSpecAny,
+    inspected_column: _DBSpecAny,
+    metadata_column: _DBSpecAny,
+    inspected_default: _DBSpecAny,
+    metadata_default: _DBSpecAny,
+    rendered_metadata_default: _DBSpecAny,
+) -> bool | None:
+    """Compare PostgreSQL defaults without hiding missing sequence defaults."""
+    current = _dbspec_normalize_default(inspected_default, inspected_column)
+    target = _dbspec_normalize_default(
+        (
+            rendered_metadata_default
+            if rendered_metadata_default is not None
+            else metadata_default
+        ),
+        metadata_column,
+    )
+    if current == target:
+        return False
+    if current is None or target is None:
+        return True
+    if current[0] == "nextval" or target[0] == "nextval":
+        return True
+    if current[0] == "literal" and target[0] == "literal":
+        return current[1] != target[1]
+    return None
+
+
+def _dbspec_normalize_default(
+    value: _DBSpecAny, column: _DBSpecAny
+) -> tuple[str, tuple[str, ...] | str] | None:
+    if value is None:
+        return None
+    text = str(value).strip()
+    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))
+
+
+def _dbspec_normalize_nextval(value: str, column: _DBSpecAny) -> tuple[str, ...] | None:
+    try:
+        arguments = list(_dbspec_executed_nextval_arguments(value))
+        if not arguments:
+            return None
+        identity = _dbspec_sequence_identity(arguments[0].replace("''", "'"))
+    except ValueError:
+        return None
+    if len(identity) == 1:
+        schema = _dbspec_column_schema(column)
+        if schema:
+            return (schema, identity[0])
+    return identity
+
+
+def _dbspec_column_schema(column: _DBSpecAny) -> str | None:
+    table = getattr(column, "table", None)
+    schema = getattr(table, "schema", 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_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
+
+
+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

package/package.json

@@ -24,5 +24,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.5.9"
+  "version": "1.5.12"
 }