atquery 2.12.2__tar.gz → 2.12.4__tar.gz

{atquery-2.12.2 → atquery-2.12.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: atquery
-Version: 2.12.2
+Version: 2.12.4
 Summary: A Python module for simplifying DBAPI usage with one-query-per-file SQL management.
 Keywords: sql,database,dbapi,mysql,sqlite,duckdb
 Author: alpine

atquery-2.12.2/pyproject.toml.orig → atquery-2.12.4/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "uv_build"
 
 [project]
 name = "atquery"
-version = "2.12.2"
+version = "2.12.4"
 description = "A Python module for simplifying DBAPI usage with one-query-per-file SQL management."
 readme = "README.md"
 requires-python = ">=3.10"

{atquery-2.12.2 → atquery-2.12.4}/src/atquery/cli/diff.py

@@ -146,8 +146,8 @@ def execute_diff(args: argparse.Namespace) -> int:
 
             old_tables = parse_file(old_path, dialect=args.dialect)
             new_tables = parse_file(new_path, dialect=args.dialect)
-        elif args.datasource is not None:
-            # --- データソースモード ---
+        elif args.datasource is not None or args.schema is not None:
+            # --- データソースモード（--schema指定時は--datasource省略でも環境変数にフォールバックする） ---
             datasource_uri = args.datasource or os.environ.get("ATQUERY_DATASOURCE")
             if not datasource_uri:
                 print(

{atquery-2.12.2 → atquery-2.12.4}/src/atquery/diff/parser.py

@@ -98,15 +98,51 @@ def parse_sql(sql: str, dialect: str = "mysql", *, normalize_mysql_defaults: boo
     """
     stmts = sqlglot.parse(sql, dialect=dialect, error_level=sqlglot.ErrorLevel.IGNORE)
     tables: dict[str, TableDef] = {}
+    index_stmts: list[exp.Create] = []
     for stmt in stmts:
         if stmt is None:
             continue
         if isinstance(stmt, exp.Create) and stmt.kind == "TABLE":
             table_def = _parse_create_table(stmt, dialect=dialect, normalize_mysql_defaults=normalize_mysql_defaults)
             tables[table_def.name] = table_def
+        elif isinstance(stmt, exp.Create) and stmt.kind == "INDEX":
+            index_stmts.append(stmt)
+
+    # CREATE TABLE より後方に書かれている前提の単独INDEX文を、対象テーブルが出揃った後にまとめて反映する
+    for stmt in index_stmts:
+        _apply_standalone_create_index(stmt, tables)
+
     return tables
 
 
+def _apply_standalone_create_index(stmt: exp.Create, tables: dict[str, TableDef]) -> None:
+    """`CREATE [UNIQUE] INDEX name ON table (...)` 単独文を対象テーブルのindexes一覧に追加する。
+
+    対象テーブルが同じSQL中に無い場合（別ファイル定義など）は何もしない。
+    """
+    index_expr = stmt.this
+    if not isinstance(index_expr, exp.Index):
+        return
+    table_ref = index_expr.args.get("table")
+    if table_ref is None:
+        return
+    table_def = tables.get(table_ref.name)
+    if table_def is None:
+        return
+
+    name_ident = index_expr.this
+    index_name = name_ident.name if name_ident else None
+    columns: list[str] = []
+    params = index_expr.args.get("params")
+    if params is not None:
+        for col_expr in params.args.get("columns") or []:
+            col = col_expr.find(exp.Column)
+            if col is not None:
+                columns.append(col.name)
+    kind = "UNIQUE" if stmt.args.get("unique") else "INDEX"
+    table_def.indexes.append(IndexDef(name=index_name, kind=kind, columns=columns))
+
+
 def _parse_create_table(
     stmt: exp.Create, dialect: str = "mysql", *, normalize_mysql_defaults: bool = False
 ) -> TableDef:

atquery-2.12.2/pyproject.toml

@@ -1,121 +0,0 @@
-[build-system]
-requires = ["uv_build>=0.11.15,<0.12"]
-build-backend = "uv_build"
-
-[project]
-name = "atquery"
-version = "2.12.2"
-description = "A Python module for simplifying DBAPI usage with one-query-per-file SQL management."
-readme = "README.md"
-requires-python = ">=3.10"
-license = "MIT"
-license-files = ["LICENSE"]
-dependencies = ["tomli>=2.0.1; python_version < '3.11'"]
-keywords = [
-    "sql",
-    "database",
-    "dbapi",
-    "mysql",
-    "sqlite",
-    "duckdb",
-]
-classifiers = [
-    "Development Status :: 4 - Beta",
-    "Intended Audience :: Developers",
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "Programming Language :: Python :: 3.13",
-    "Topic :: Database",
-]
-
-[[project.authors]]
-name = "alpine"
-
-[project.scripts]
-atquery = "atquery.cli.main:main"
-
-[project.optional-dependencies]
-mysql = ["mysql-connector-python>=8.0,<10"]
-duckdb = ["duckdb>=0.10.0"]
-testing = ["json5>=0.12.1"]
-diff = ["sqlglot>=30.4.2"]
-all = [
-    "mysql-connector-python",
-    "duckdb",
-    "json5",
-    "sqlglot",
-    "python-dotenv>=1.2.2",
-]
-
-[dependency-groups]
-dev = [
-    "mysql-connector-python",
-    "duckdb",
-    "json5",
-    "python-dotenv",
-    "sqlglot",
-    "ruff",
-    "pyright",
-    "pytest>=7.0.0",
-    "pytest-cov>=4.0.0",
-    "pytest-mock>=3.10.0",
-    "pyyaml>=6.0.3",
-    "rich>=14.3.3",
-    "pytest-asyncio>=1.4.0",
-]
-
-[tool.uv]
-package = true
-
-[tool.ruff]
-src = ["src"]
-
-[tool.ruff.lint]
-select = [
-    "E2",
-    "E4",
-    "E7",
-    "E9",
-    "W",
-    "F",
-    "INP",
-]
-
-[tool.ruff.lint.per-file-ignores]
-"docker/*.py" = ["INP"]
-"scripts/*.py" = ["INP"]
-"tests/*.py" = ["INP"]
-"var/*.py" = ["INP"]
-
-[tool.pyright]
-include = ["src"]
-venvPath = "."
-venv = ".venv"
-typeCheckingMode = "basic"
-
-[tool.pytest.ini_options]
-cache_dir = "var/.pytest_cache"
-asyncio_mode = "auto"
-testpaths = ["tests"]
-
-[tool.coverage.run]
-source = ["src"]
-data_file = "var/.coverage"
-omit = ["tests/*"]
-
-[tool.coverage.report]
-exclude_lines = [
-    "pragma: no cover",
-    "def __repr__",
-    "if self.debug:",
-    "if settings.DEBUG",
-    "raise AssertionError",
-    "raise NotImplementedError",
-    "if 0:",
-    "if __name__ == .__main__.:",
-    'class .*\bProtocol\):',
-    '@(abc\.)?abstractmethod',
-]