iron-sql 0.3.0__tar.gz → 0.4.0__tar.gz

{iron_sql-0.3.0 → iron_sql-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iron-sql
-Version: 0.3.0
+Version: 0.4.0
 Summary: iron_sql generates typed async PostgreSQL clients and runtime helpers from schemas and SQL queries
 Keywords: postgresql,sql,sqlc,psycopg,codegen,async
 Author: Ilia Ablamonov
@@ -16,6 +16,7 @@ Requires-Dist: psycopg>=3.3.2
 Requires-Dist: psycopg-pool>=3.3.0
 Requires-Dist: pydantic>=2.12.4
 Requires-Dist: inflection>=0.5.1 ; extra == 'codegen'
+Requires-Dist: sqlc>=1.30.0 ; extra == 'codegen'
 Requires-Python: >=3.13
 Project-URL: Homepage, https://github.com/Flamefork/iron_sql
 Project-URL: Repository, https://github.com/Flamefork/iron_sql.git
@@ -39,7 +40,7 @@ pip install iron-sql             # runtime only (psycopg + psycopg-pool + pydant
 pip install iron-sql[codegen]    # + inflection for code generation
 ```
 
-You also need [`sqlc` v2](https://docs.sqlc.dev/en/latest/overview/install.html) available in your PATH (or pass `sqlc_command`/`sqlc_path` to the generator).
+The `sqlc` binary is bundled automatically via the `sqlc` Python package.
 
 ## Key Features
 - **Query discovery.** `generate_sql_package` scans your codebase for calls like `<package>_sql("SELECT ...")`, runs `sqlc` for type analysis, and emits a typed module.

{iron_sql-0.3.0 → iron_sql-0.4.0}/README.md

@@ -14,7 +14,7 @@ pip install iron-sql             # runtime only (psycopg + psycopg-pool + pydant
 pip install iron-sql[codegen]    # + inflection for code generation
 ```
 
-You also need [`sqlc` v2](https://docs.sqlc.dev/en/latest/overview/install.html) available in your PATH (or pass `sqlc_command`/`sqlc_path` to the generator).
+The `sqlc` binary is bundled automatically via the `sqlc` Python package.
 
 ## Key Features
 - **Query discovery.** `generate_sql_package` scans your codebase for calls like `<package>_sql("SELECT ...")`, runs `sqlc` for type analysis, and emits a typed module.

{iron_sql-0.3.0 → iron_sql-0.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "iron-sql"
-version = "0.3.0"
+version = "0.4.0"
 
 description = "iron_sql generates typed async PostgreSQL clients and runtime helpers from schemas and SQL queries"
 readme = "README.md"
@@ -24,7 +24,10 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-codegen = ["inflection>=0.5.1"]
+codegen = [
+    "inflection>=0.5.1",
+    "sqlc>=1.30.0",
+]
 
 [project.urls]
 Homepage = "https://github.com/Flamefork/iron_sql"
@@ -35,16 +38,9 @@ Issues = "https://github.com/Flamefork/iron_sql/issues"
 requires = ["uv_build>=0.9.4,<0.10.0"]
 build-backend = "uv_build"
 
-[tool.uv.workspace]
-members = ["dev"]
-
-[tool.uv.sources]
-iron-sql-dev = { workspace = true }
-
 [dependency-groups]
 dev = [
     "iron-sql[codegen]",
-    "iron-sql-dev",
     "basedpyright>=1.31.7",
     "psycopg[binary]>=3.3.2",
     "pytest>=8.4.2",
@@ -52,6 +48,7 @@ dev = [
     "pytest-cov>=7.0.0",
     "pytest-randomly>=4.0.1",
     "ruff>=0.14.1",
+    "testcontainers>=4",
 ]
 
 [tool.pyright]

{iron_sql-0.3.0 → iron_sql-0.4.0}/src/iron_sql/codegen/generator.py

@@ -198,39 +198,8 @@ def generate_sql_package(  # noqa: PLR0913, PLR0914
     to_snake_fn: Callable[[str], str] = alias_generators.to_snake,
     debug_path: Path | None = None,
     src_path: Path = Path(),
-    sqlc_path: Path | None = None,
     tempdir_path: Path | None = None,
-    sqlc_command: list[str] | None = None,
 ) -> bool:
-    """Generate a typed SQL package from schema and queries.
-
-    Args:
-        schema_path: Path to the Postgres schema SQL file (relative to src_path)
-        package_full_name: Target module name (e.g., "myapp.mydatabase")
-        dsn_import: Import path to DSN string (e.g.,
-            "myapp.config:CONFIG.db_url")
-        application_name: Optional application name for connection pool
-        type_overrides: Optional mapping of DB type name (without "pg_catalog.")
-            to a Python type string used in generated annotations.
-        json_model_overrides: Optional mapping of "table.column" to
-            "module:ClassName" for JSON model serialization/deserialization.
-        to_pascal_fn: Function to convert names to PascalCase (default:
-            pydantic's to_pascal)
-        to_snake_fn: Function to convert names to snake_case (default:
-            pydantic's to_snake)
-        debug_path: Optional path to save sqlc inputs for inspection
-        src_path: Base source path for scanning queries (default: Path())
-        sqlc_path: Optional path to sqlc config directory
-        tempdir_path: Optional path for temporary file generation
-        sqlc_command: Optional command prefix to run sqlc
-
-    Returns:
-        True if the package was generated or modified, False otherwise
-
-    Raises:
-        ValueError: If json_model_overrides keys/values are malformed,
-            reference non-existent tables/columns, or target non-JSON columns.
-    """
     dsn_import_package, dsn_import_path = dsn_import.split(":")
 
     package_name = package_full_name.split(".")[-1]  # noqa: PLC0207
@@ -250,9 +219,7 @@ def generate_sql_package(  # noqa: PLR0913, PLR0914
         [(q.name, q.stmt) for q in queries],
         dsn=dsn,
         debug_path=debug_path,
-        sqlc_path=sqlc_path,
         tempdir_path=tempdir_path,
-        sqlc_command=sqlc_command,
     )
 
     if sqlc_res.error:

{iron_sql-0.3.0 → iron_sql-0.4.0}/src/iron_sql/codegen/sqlc.py

@@ -8,6 +8,7 @@ from collections.abc import Sequence
 from pathlib import Path
 
 import pydantic
+import sqlc
 from pydantic import ConfigDict
 
 
@@ -131,41 +132,13 @@ class SQLCResult(pydantic.BaseModel):
         return tuple(s for s in result if s in catalog_schema_names)
 
 
-def resolve_sqlc_command(
-    sqlc_path: Path | None,
-    sqlc_command: list[str] | None,
-) -> list[str]:
-    if sqlc_command is not None:
-        if sqlc_path is not None:
-            msg = "sqlc_command and sqlc_path are mutually exclusive"
-            raise ValueError(msg)
-        if not sqlc_command:
-            msg = "sqlc_command must not be empty"
-            raise ValueError(msg)
-        return sqlc_command
-
-    if sqlc_path is None:
-        discovered_path = shutil.which("sqlc")
-        if discovered_path is None:
-            msg = "sqlc not found in PATH"
-            raise FileNotFoundError(msg)
-        sqlc_path = Path(discovered_path)
-    if not sqlc_path.exists():
-        msg = f"sqlc not found at {sqlc_path}"
-        raise FileNotFoundError(msg)
-
-    return [str(sqlc_path)]
-
-
 def run_sqlc(
     schema_path: Path,
     queries: Sequence[tuple[str, str]],
     *,
     dsn: str | None,
     debug_path: Path | None = None,
-    sqlc_path: Path | None = None,
     tempdir_path: Path | None = None,
-    sqlc_command: list[str] | None = None,
 ) -> SQLCResult:
     if not schema_path.exists():
         msg = f"Schema file not found: {schema_path}"
@@ -178,7 +151,6 @@ def run_sqlc(
         )
 
     queries = list({q[0]: q for q in queries}.values())
-    cmd_prefix = resolve_sqlc_command(sqlc_path, sqlc_command)
 
     with tempfile.TemporaryDirectory(
         dir=str(tempdir_path) if tempdir_path else None
@@ -209,7 +181,7 @@ def run_sqlc(
         }
         config_path.write_text(json.dumps(sqlc_config, indent=2), encoding="utf-8")
 
-        cmd = [*cmd_prefix, "generate", "--file", str(config_path.resolve())]
+        cmd = [sqlc.get_binary_path(), "generate", "--file", str(config_path.resolve())]
 
         sqlc_run_result = subprocess.run(  # noqa: S603
             cmd,