sqlbuild 0.20.0__tar.gz → 0.20.1__tar.gz

sqlbuild-0.20.1/.release-please-manifest.json

@@ -0,0 +1,3 @@
+{
+  ".": "0.20.1"
+}

{sqlbuild-0.20.0 → sqlbuild-0.20.1}/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.20.1](https://github.com/chio-labs/sqlbuild/compare/v0.20.0...v0.20.1) (2026-05-26)
+
+
+### Bug Fixes
+
+* make sqlglot a core dependency ([a6e1517](https://github.com/chio-labs/sqlbuild/commit/a6e1517888e45cd4ddd8fdd1184f798bb7a27e69))
+* make sqlglot a core dependency ([25119a7](https://github.com/chio-labs/sqlbuild/commit/25119a78d5b22841d680335b9e1e3f56991002d6))
+* scaffold all project resource directories ([2fefe84](https://github.com/chio-labs/sqlbuild/commit/2fefe845d66c5fd174aa08d0a20ab6ebedad836d))
+
 ## [0.20.0](https://github.com/chio-labs/sqlbuild/compare/v0.19.0...v0.20.0) (2026-05-26)
 
 

{sqlbuild-0.20.0 → sqlbuild-0.20.1}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.4
 Name: sqlbuild
-Version: 0.20.0
+Version: 0.20.1
 Summary: Typed, test-first SQL pipelines with local E2E testing
 License-File: LICENSE
 Requires-Python: >=3.12
 Requires-Dist: duckdb>=1.3.2
 Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: rich>=15.0.0
+Requires-Dist: sqlglot>=27.13.2
 Provides-Extra: bigquery
 Requires-Dist: google-cloud-bigquery>=3.37.0; extra == 'bigquery'
 Provides-Extra: dagster
@@ -22,8 +23,6 @@ Provides-Extra: postgres
 Requires-Dist: psycopg[binary]>=3.2.0; extra == 'postgres'
 Provides-Extra: snowflake
 Requires-Dist: snowflake-connector-python>=3.17.3; extra == 'snowflake'
-Provides-Extra: sqlglot
-Requires-Dist: sqlglot>=27.13.2; extra == 'sqlglot'
 Provides-Extra: sqlserver
 Requires-Dist: pymssql>=2.3.0; extra == 'sqlserver'
 Description-Content-Type: text/markdown

{sqlbuild-0.20.0 → sqlbuild-0.20.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "sqlbuild"
-version = "0.20.0"
+version = "0.20.1"
 description = "Typed, test-first SQL pipelines with local E2E testing"
 readme = "README.md"
 requires-python = ">=3.12"
@@ -12,12 +12,10 @@ dependencies = [
   "duckdb>=1.3.2",
   "PyYAML>=6.0.2",
   "rich>=15.0.0",
+  "sqlglot>=27.13.2",
 ]
 
 [project.optional-dependencies]
-sqlglot = [
-  "sqlglot>=27.13.2",
-]
 performance = [
   "sqlglot[c]>=30.7.0",
 ]

{sqlbuild-0.20.0 → sqlbuild-0.20.1}/src/sqlbuild/cli/commands/main/init.py

@@ -8,7 +8,10 @@ from sqlbuild.cli.commands.main.helpers.skills.update import update_sqlbuild_ski
 from sqlbuild.shared.helpers.colors import green_bold, supports_color
 
 
-_PROJECT_TOML_TEMPLATE: str = """\
+def run_init(project_dir: Path | None) -> int:
+    """Create a minimal SQLBuild project in the current directory."""
+
+    project_toml_template: str = """\
 name = "{name}"
 adapter = "duckdb"
 default_environment = "dev"
@@ -28,20 +31,19 @@ schema = "prod"
 [environments.dev]
 schema = "dev"
 """
-
-_DIRECTORIES: tuple[str, ...] = (
-    "models/staging",
-    "models/marts",
-    "sources",
-    "seeds",
-    "tests/unit",
-    "macros",
-    "audits",
-)
-
-
-def run_init(project_dir: Path | None) -> int:
-    """Create a minimal SQLBuild project in the current directory."""
+    directories: tuple[str, ...] = (
+        "models/staging",
+        "models/marts",
+        "sources",
+        "seeds",
+        "loaders",
+        "tests/unit",
+        "tests/scenarios",
+        "functions/sql",
+        "functions/python",
+        "macros",
+        "audits",
+    )
 
     base_dir: Path = project_dir if project_dir is not None else Path.cwd()
     project_file: Path = base_dir / "sqlbuild_project.toml"
@@ -56,17 +58,21 @@ def run_init(project_dir: Path | None) -> int:
 
     project_name: str = base_dir.name.replace("-", "_").replace(" ", "_").lower()
 
-    for directory in _DIRECTORIES:
+    for directory in directories:
         (base_dir / directory).mkdir(parents=True, exist_ok=True)
 
-    project_file.write_text(_PROJECT_TOML_TEMPLATE.format(name=project_name))
+    project_file.write_text(project_toml_template.format(name=project_name))
 
     gitkeep_dirs: tuple[str, ...] = (
         "models/staging",
         "models/marts",
         "sources",
         "seeds",
+        "loaders",
         "tests/unit",
+        "tests/scenarios",
+        "functions/sql",
+        "functions/python",
         "macros",
         "audits",
     )
@@ -84,11 +90,12 @@ def run_init(project_dir: Path | None) -> int:
     print(heading)
     print()
     print(f"  Project: {project_name}")
-    print(f"  Config:  sqlbuild_project.toml")
+    print("  Config:  sqlbuild_project.toml")
     print()
     print("Next steps:")
     print("  1. Add sources to sources/")
     print("  2. Add models to models/staging/ and models/marts/")
-    print("  3. sqb compile")
-    print("  4. sqb build")
+    print("  3. Add tests to tests/unit/ or tests/scenarios/")
+    print("  4. sqb compile")
+    print("  5. sqb build")
     return 0

{sqlbuild-0.20.0 → sqlbuild-0.20.1}/src/sqlbuild/compiler/compile/helpers/attachment.py

@@ -3070,7 +3070,9 @@ def find_matching_path_default(
 ) -> str | None:
     """Return the nearest matching path_defaults key for a model file."""
 
-    relative_path: Path = Path(str(model_file.relative_path).replace("\\", "/").removeprefix("models/"))
+    relative_path: Path = Path(
+        str(model_file.relative_path).replace("\\", "/").removeprefix("models/")
+    )
     best_match: str | None = None
     best_length: int = -1
 

{sqlbuild-0.20.0 → sqlbuild-0.20.1}/src/sqlbuild/compiler/discovery/helpers/discovery_validation.py

@@ -444,7 +444,8 @@ def _validate_path_defaults_match_models(
     if not path_defaults:
         return
     model_paths: tuple[str, ...] = tuple(
-        str(model_file.relative_path).replace("\\", "/").removeprefix("models/") for model_file in model_files
+        str(model_file.relative_path).replace("\\", "/").removeprefix("models/")
+        for model_file in model_files
     )
     model_folders: tuple[str, ...] = tuple(
         sorted(

{sqlbuild-0.20.0 → sqlbuild-0.20.1}/src/sqlbuild/compiler/pipeline/helpers/diff.py

@@ -202,6 +202,10 @@ def _resolve_selector_token(
         return _expand_keys(keys, upstream_requested, downstream_requested, upstream, downstream)
     if core.startswith("path:") or "/" in core or "\\" in core:
         path_value: str = core.removeprefix("path:").replace("\\", "/").strip("/")
+        if path_value == "models":
+            path_value = ""
+        elif path_value.startswith("models/"):
+            path_value = path_value.removeprefix("models/")
         keys = frozenset(
             key
             for key, folder in path_index.items()

{sqlbuild-0.20.0 → sqlbuild-0.20.1}/tests/integration/src/sqlbuild/compiler/pipeline/test_diff_selectors.py

@@ -53,6 +53,12 @@ TEST_CASES: list[DiffSelectorIntegrationTestCase] = [
         exclude=(),
         expected_model_names=frozenset(("stg_orders", "stg_customers")),
     ),
+    DiffSelectorIntegrationTestCase(
+        description="Windows-style path selector returns models under folder",
+        select=("path:models\\staging",),
+        exclude=(),
+        expected_model_names=frozenset(("stg_orders", "stg_customers")),
+    ),
     DiffSelectorIntegrationTestCase(
         description="tag selector returns tagged models",
         select=("tag:mart",),

{sqlbuild-0.20.0 → sqlbuild-0.20.1}/tests/unit/src/sqlbuild/cli/commands/main/entry/helpers.py

@@ -35,6 +35,7 @@ def build_handlers(**overrides: Any) -> CliEntrypointHandlers:
         run_debug=overrides.get("run_debug", noop_handler),
         run_lineage=overrides.get("run_lineage", noop_handler),
         run_janitor=overrides.get("run_janitor", noop_handler),
+        run_init=overrides.get("run_init", noop_handler),
         run_playground=overrides.get("run_playground", noop_handler),
         run_skills_update=overrides.get("run_skills_update", noop_handler),
         run_scenario=overrides.get("run_scenario", noop_handler),

sqlbuild-0.20.1/tests/unit/src/sqlbuild/cli/commands/main/init/_test_types.py

@@ -0,0 +1,12 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+
+@dataclass(frozen=True)
+class InitScaffoldTestCase:
+    description: str
+    project_dir_name: str
+    expected_directories: tuple[str, ...]
+    expected_gitkeep_files: tuple[str, ...]
+    expected_config_fragment: str

sqlbuild-0.20.1/tests/unit/src/sqlbuild/cli/commands/main/init/test_run.py

@@ -0,0 +1,78 @@
+from __future__ import annotations
+
+from pathlib import Path
+
+import pytest
+
+import sqlbuild.cli.commands.main.init as init_module
+from tests.unit.src.sqlbuild.cli.commands.main.init._test_types import InitScaffoldTestCase
+
+
+@pytest.mark.parametrize(
+    "test_case",
+    [
+        InitScaffoldTestCase(
+            description="creates blank project directories for all resource types",
+            project_dir_name="demo-project",
+            expected_directories=(
+                "models/staging",
+                "models/marts",
+                "sources",
+                "seeds",
+                "loaders",
+                "tests/unit",
+                "tests/scenarios",
+                "functions/sql",
+                "functions/python",
+                "macros",
+                "audits",
+            ),
+            expected_gitkeep_files=(
+                "models/staging/.gitkeep",
+                "models/marts/.gitkeep",
+                "sources/.gitkeep",
+                "seeds/.gitkeep",
+                "loaders/.gitkeep",
+                "tests/unit/.gitkeep",
+                "tests/scenarios/.gitkeep",
+                "functions/sql/.gitkeep",
+                "functions/python/.gitkeep",
+                "macros/.gitkeep",
+                "audits/.gitkeep",
+            ),
+            expected_config_fragment='name = "demo_project"',
+        )
+    ],
+    ids=["creates blank project directories for all resource types"],
+)
+def test_given_empty_directory_when_running_init_then_scaffolds_project_directories(
+    test_case: InitScaffoldTestCase,
+    tmp_path: Path,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    project_dir: Path = tmp_path / test_case.project_dir_name
+    project_dir.mkdir()
+    monkeypatch.setattr(init_module, "update_sqlbuild_skills", lambda *, project_dir: None)
+
+    result: int = init_module.run_init(project_dir)
+
+    assert result == 0
+    assert test_case.expected_config_fragment in (project_dir / "sqlbuild_project.toml").read_text(
+        encoding="utf-8"
+    )
+    assert (
+        tuple(
+            directory
+            for directory in test_case.expected_directories
+            if (project_dir / directory).is_dir()
+        )
+        == test_case.expected_directories
+    )
+    assert (
+        tuple(
+            gitkeep
+            for gitkeep in test_case.expected_gitkeep_files
+            if (project_dir / gitkeep).is_file()
+        )
+        == test_case.expected_gitkeep_files
+    )

sqlbuild-0.20.1/tests/unit/src/sqlbuild/cli/project_metadata/_test_types.py

@@ -0,0 +1,11 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+
+@dataclass(frozen=True)
+class ProjectDependencyTestCase:
+    description: str
+    dependency_name: str
+    expected_in_core_dependencies: bool
+    expected_optional_extra_absent: bool

sqlbuild-0.20.1/tests/unit/src/sqlbuild/cli/project_metadata/test_dependencies.py

@@ -0,0 +1,45 @@
+from __future__ import annotations
+
+import tomllib
+from pathlib import Path
+
+import pytest
+
+from tests.unit.src.sqlbuild.cli.project_metadata._test_types import ProjectDependencyTestCase
+
+REPO_ROOT: Path = Path(__file__).resolve().parents[6]
+
+
+@pytest.mark.parametrize(
+    "test_case",
+    [
+        ProjectDependencyTestCase(
+            description="sqlglot is a core dependency instead of an optional extra",
+            dependency_name="sqlglot",
+            expected_in_core_dependencies=True,
+            expected_optional_extra_absent=True,
+        )
+    ],
+    ids=["sqlglot is a core dependency instead of an optional extra"],
+)
+def test_given_project_metadata_when_reading_dependencies_then_required_packages_are_core(
+    test_case: ProjectDependencyTestCase,
+) -> None:
+    pyproject: dict[str, object] = tomllib.loads(
+        (REPO_ROOT / "pyproject.toml").read_text(encoding="utf-8")
+    )
+    project: dict[str, object] = pyproject["project"]  # type: ignore[assignment]
+    dependencies: list[str] = project["dependencies"]  # type: ignore[assignment]
+    optional_dependencies: dict[str, list[str]] = project.get("optional-dependencies", {})  # type: ignore[assignment]
+
+    dependency_names: set[str] = {
+        dependency.split("[", maxsplit=1)[0].split(">", maxsplit=1)[0]
+        for dependency in dependencies
+    }
+
+    assert (
+        test_case.dependency_name in dependency_names
+    ) is test_case.expected_in_core_dependencies
+    assert (
+        test_case.dependency_name not in optional_dependencies
+    ) is test_case.expected_optional_extra_absent

{sqlbuild-0.20.0 → sqlbuild-0.20.1}/tests/unit/src/sqlbuild/compiler/compile/helpers/_test_types.py

@@ -10,6 +10,14 @@ from sqlbuild.compiler.compile.types import AttachedAuditTargetKind, SqlTestMode
 from sqlbuild.compiler.lineage.types import InferredNullability
 
 
+@dataclass(frozen=True)
+class FindMatchingPathDefaultTestCase:
+    description: str
+    model_relative_path: str
+    path_defaults: dict[str, dict[str, object]]
+    expected_path_default: str | None
+
+
 @dataclass(frozen=True)
 class ExpandSqlMacrosTestCase:
     description: str

sqlbuild-0.20.1/tests/unit/src/sqlbuild/compiler/compile/helpers/test_path_defaults.py

@@ -0,0 +1,44 @@
+from __future__ import annotations
+
+from pathlib import Path
+
+import pytest
+
+from sqlbuild.compiler.compile.helpers.attachment import find_matching_path_default
+from sqlbuild.compiler.discovery.models import DiscoveredSqlModelFile
+from tests.unit.src.sqlbuild.compiler.compile.helpers._test_types import (
+    FindMatchingPathDefaultTestCase,
+)
+
+
+@pytest.mark.parametrize(
+    "test_case",
+    [
+        FindMatchingPathDefaultTestCase(
+            description="matches Windows-style model path against nested path default",
+            model_relative_path="models\\staging\\nested\\orders.sql",
+            path_defaults={"staging": {}, "staging/nested": {}},
+            expected_path_default="staging/nested",
+        )
+    ],
+    ids=["matches Windows-style model path against nested path default"],
+)
+def test_given_windows_style_model_path_when_finding_path_default_then_returns_nearest_match(
+    test_case: FindMatchingPathDefaultTestCase,
+) -> None:
+    model_file: DiscoveredSqlModelFile = DiscoveredSqlModelFile(
+        file_path=Path("/repo") / test_case.model_relative_path,
+        relative_path=Path(test_case.model_relative_path),
+        contents="MODEL ();\n\nselect 1\n",
+        header_values={},
+        header_column_locations={},
+        output_column_locations={},
+        query_sql="select 1",
+    )
+
+    path_default: str | None = find_matching_path_default(
+        model_file=model_file,
+        path_defaults=test_case.path_defaults,
+    )
+
+    assert path_default == test_case.expected_path_default

{sqlbuild-0.20.0 → sqlbuild-0.20.1}/tests/unit/src/sqlbuild/compiler/discovery/helpers/_test_types.py

@@ -2,6 +2,14 @@ from dataclasses import dataclass, field
 from pathlib import Path
 
 
+@dataclass(frozen=True)
+class ValidatePathDefaultsMatchModelsTestCase:
+    description: str
+    model_relative_paths: tuple[str, ...]
+    path_defaults: dict[str, dict[str, object]]
+    expected_model_file_count: int
+
+
 @dataclass(frozen=True)
 class LoadProjectConfigTestCase:
     description: str

sqlbuild-0.20.1/tests/unit/src/sqlbuild/compiler/discovery/helpers/test_path_defaults.py

@@ -0,0 +1,49 @@
+from __future__ import annotations
+
+from pathlib import Path
+
+import pytest
+
+from sqlbuild.compiler.discovery.helpers.discovery_validation import (
+    _validate_path_defaults_match_models,
+)
+from sqlbuild.compiler.discovery.models import DiscoveredSqlModelFile
+from tests.unit.src.sqlbuild.compiler.discovery.helpers._test_types import (
+    ValidatePathDefaultsMatchModelsTestCase,
+)
+
+
+@pytest.mark.parametrize(
+    "test_case",
+    [
+        ValidatePathDefaultsMatchModelsTestCase(
+            description="accepts Windows-style model paths that match path defaults",
+            model_relative_paths=("models\\staging\\orders.sql",),
+            path_defaults={"staging": {}},
+            expected_model_file_count=1,
+        )
+    ],
+    ids=["accepts Windows-style model paths that match path defaults"],
+)
+def test_given_windows_style_model_paths_when_validating_path_defaults_then_they_match(
+    test_case: ValidatePathDefaultsMatchModelsTestCase,
+) -> None:
+    model_files: tuple[DiscoveredSqlModelFile, ...] = tuple(
+        DiscoveredSqlModelFile(
+            file_path=Path("/repo") / relative_path,
+            relative_path=Path(relative_path),
+            contents="MODEL ();\n\nselect 1\n",
+            header_values={},
+            header_column_locations={},
+            output_column_locations={},
+            query_sql="select 1",
+        )
+        for relative_path in test_case.model_relative_paths
+    )
+
+    _validate_path_defaults_match_models(
+        path_defaults=test_case.path_defaults,
+        model_files=model_files,
+    )
+
+    assert len(model_files) == test_case.expected_model_file_count

{sqlbuild-0.20.0 → sqlbuild-0.20.1}/tests/unit/src/sqlbuild/integrations/dbt/test_plan_orchestration.py

@@ -305,6 +305,42 @@ PLAN_ORCHESTRATION_TEST_CASES: list[DbtPlanOrchestrationTestCase] = [
         expected_primary_dbt_command_argv=("dbt", "ls", "--select", "path:models/marts"),
         expected_path_translations=(("path:models/marts", "path:marts"),),
     ),
+    DbtPlanOrchestrationTestCase(
+        description="routes Windows-style dbt path selector to SQLBuild models",
+        command="plan",
+        manifest_data=_MANIFEST_DATA,
+        sqlbuild_model_sql_by_name=_SQLBUILD_SQL,
+        sqlbuild_model_tags_by_name=_SQLBUILD_TAGS,
+        sqlbuild_model_path_by_name=_SQLBUILD_PATHS,
+        select=("path:models\\marts",),
+        exclude=(),
+        full_dbt_ls_unique_ids=(),
+        anchor_dbt_ls_unique_ids_by_term={},
+        expected_dbt_ls_selects=(("path:models\\marts",),),
+        expected_sqlbuild_model_names=("fact_orders", "mart_orders"),
+        expected_dbt_required_unique_ids=("model.analytics.int_orders",),
+        expected_dbt_required_selector_terms=("+int_orders",),
+        expected_supplemental_dbt_command_argvs=(
+            (
+                "dbt",
+                "ls",
+                "--project-dir",
+                "/repo/dbt",
+                "--target",
+                "dev",
+                "--select",
+                "+int_orders",
+            ),
+        ),
+        expected_sqlbuild_command_argvs=(
+            ("sqb", "plan", "--select", "fact_orders", "mart_orders"),
+        ),
+        expected_dbt_skipped=False,
+        expected_sqlbuild_skipped=False,
+        dbt_command_args=("--select", "path:models\\marts"),
+        expected_primary_dbt_command_argv=("dbt", "ls", "--select", "path:models\\marts"),
+        expected_path_translations=(("path:models\\marts", "path:marts"),),
+    ),
     DbtPlanOrchestrationTestCase(
         description="does not run anchor ls for SQLBuild-owned path in mixed selectors",
         command="run",

{sqlbuild-0.20.0 → sqlbuild-0.20.1}/tests/unit/src/sqlbuild/integrations/dbt/test_selection.py

@@ -322,6 +322,19 @@ SELECTION_TEST_CASES: list[DbtSelectionTestCase] = [
         expected_dbt_required_unique_ids=("model.analytics.int_orders",),
         expected_path_translations=(("path:models/marts", "path:marts"),),
     ),
+    DbtSelectionTestCase(
+        description="selects SQLBuild Windows-style path translation directly",
+        manifest_data=_MANIFEST_DATA,
+        sqlbuild_model_sql_by_name=_SQLBUILD_SQL,
+        sqlbuild_model_tags_by_name=_SQLBUILD_TAGS,
+        sqlbuild_model_path_by_name=_SQLBUILD_PATHS,
+        select=("path:models\\marts",),
+        exclude=(),
+        dbt_anchor_unique_ids_by_term={},
+        expected_sqlbuild_model_names=("fact_orders", "mart_orders"),
+        expected_dbt_required_unique_ids=("model.analytics.int_orders",),
+        expected_path_translations=(("path:models\\marts", "path:marts"),),
+    ),
     DbtSelectionTestCase(
         description="selects SQLBuild path translation with upstream expansion",
         manifest_data=_MANIFEST_DATA,

{sqlbuild-0.20.0 → sqlbuild-0.20.1}/uv.lock

@@ -2761,12 +2761,13 @@ wheels = [
 
 [[package]]
 name = "sqlbuild"
-version = "0.16.2"
+version = "0.20.0"
 source = { editable = "." }
 dependencies = [
     { name = "duckdb" },
     { name = "pyyaml" },
     { name = "rich" },
+    { name = "sqlglot" },
 ]
 
 [package.optional-dependencies]
@@ -2792,9 +2793,6 @@ postgres = [
 snowflake = [
     { name = "snowflake-connector-python" },
 ]
-sqlglot = [
-    { name = "sqlglot" },
-]
 sqlserver = [
     { name = "pymssql" },
 ]
@@ -2827,10 +2825,10 @@ requires-dist = [
     { name = "pyyaml", specifier = ">=6.0.2" },
     { name = "rich", specifier = ">=15.0.0" },
     { name = "snowflake-connector-python", marker = "extra == 'snowflake'", specifier = ">=3.17.3" },
-    { name = "sqlglot", marker = "extra == 'sqlglot'", specifier = ">=27.13.2" },
+    { name = "sqlglot", specifier = ">=27.13.2" },
     { name = "sqlglot", extras = ["c"], marker = "extra == 'performance'", specifier = ">=30.7.0" },
 ]
-provides-extras = ["sqlglot", "performance", "snowflake", "bigquery", "databricks", "dagster", "postgres", "sqlserver", "ingestr"]
+provides-extras = ["performance", "snowflake", "bigquery", "databricks", "dagster", "postgres", "sqlserver", "ingestr"]
 
 [package.metadata.requires-dev]
 dev = [

sqlbuild-0.20.0/.release-please-manifest.json

@@ -1,3 +0,0 @@
-{
-  ".": "0.20.0"
-}