sqlbuild 0.37.3__tar.gz → 0.37.4__tar.gz

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

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

{sqlbuild-0.37.3 → sqlbuild-0.37.4}/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.37.4](https://github.com/chio-labs/sqlbuild/compare/v0.37.3...v0.37.4) (2026-06-22)
+
+
+### Bug Fixes
+
+* **dbt:** improve lineage output labels ([d09ee4f](https://github.com/chio-labs/sqlbuild/commit/d09ee4fe938dab41d9f87a3c0a753725d6f921a8))
+* **dbt:** normalize supported resource types ([57b67c6](https://github.com/chio-labs/sqlbuild/commit/57b67c6b14e6332af0668f3e81cf33f876061be4))
+* **dbt:** stabilize dependency-aware version hashes and required upstream execution ([02df9cb](https://github.com/chio-labs/sqlbuild/commit/02df9cbf39e08c1a5eb5e03245a5a0da11d31a38))
+
 ## [0.37.3](https://github.com/chio-labs/sqlbuild/compare/v0.37.2...v0.37.3) (2026-06-22)
 
 

{sqlbuild-0.37.3 → sqlbuild-0.37.4}/Makefile

@@ -1,6 +1,6 @@
 SHELL := /bin/bash
 
-.PHONY: verify coverage
+.PHONY: verify verify-quick coverage
 
 format:
 	uv run ruff format .
@@ -210,13 +210,35 @@ coverage:
 
 
 verify-quick:
-	uv run ruff format .
-	uv run ruff check --fix .
-	uv run ty check src tests
-	uv run pytest tests/unit tests/integration -m "not real_warehouse and not dbt" -vv
-	uv run check-test-conventions tests
-	uv run check-structure-conventions src/sqlbuild scripts
-	uv run check-type-annotation-conventions src tests
+	@mkdir -p /tmp/opencode
+	@log="/tmp/opencode/verify-quick-$$(date +%Y%m%d-%H%M%S).log"; \
+	{ \
+		status=0; \
+		run_verify_step() { \
+			label="$$1"; \
+			shift; \
+			echo; \
+			echo "==> $$label"; \
+			"$$@"; \
+			rc=$$?; \
+			if [ $$rc -ne 0 ]; then \
+				echo "STEP_FAILED[$$rc]: $$label"; \
+				if [ $$status -eq 0 ]; then status=$$rc; fi; \
+			fi; \
+		}; \
+		run_verify_step "ruff format" uv run ruff format .; \
+		run_verify_step "ruff check" uv run ruff check --fix .; \
+		run_verify_step "type check" uv run ty check src tests; \
+		run_verify_step "tests" env PYTHONUNBUFFERED=1 TESTCONTAINERS_RYUK_DISABLED=true SQLBUILD_CONCURRENCY=$(SQLBUILD_CONCURRENCY) uv run pytest tests/unit tests/integration tests/e2e -m "((not real_warehouse and not dbt) or (dbt and not real_warehouse)) and not performance" -vv --color=yes -n auto --dist loadfile; \
+		run_verify_step "performance tests" env PYTHONUNBUFFERED=1 SQLBUILD_CONCURRENCY=$(SQLBUILD_CONCURRENCY) uv run pytest tests/e2e -m "performance and not real_warehouse and not dbt" -vv --color=yes; \
+		run_verify_step "test conventions" uv run check-test-conventions tests; \
+		run_verify_step "structure conventions" uv run check-structure-conventions src/sqlbuild scripts; \
+		run_verify_step "type annotation conventions" uv run check-type-annotation-conventions src tests; \
+		exit $$status; \
+	} 2>&1 | tee "$$log"; \
+	status=$${PIPESTATUS[0]}; \
+	echo "VERIFY_QUICK_EXIT=$$status (log: $$log)" | tee -a "$$log"; \
+	exit $$status
 
 
 check-ci:

{sqlbuild-0.37.3 → sqlbuild-0.37.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlbuild
-Version: 0.37.3
+Version: 0.37.4
 Summary: Typed, test-first SQL pipelines with local E2E testing
 License-File: LICENSE
 Requires-Python: >=3.12

{sqlbuild-0.37.3 → sqlbuild-0.37.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "sqlbuild"
-version = "0.37.3"
+version = "0.37.4"
 description = "Typed, test-first SQL pipelines with local E2E testing"
 readme = "README.md"
 requires-python = ">=3.12"

{sqlbuild-0.37.3 → sqlbuild-0.37.4}/src/sqlbuild/integrations/dbt/constants.py

@@ -17,7 +17,6 @@ DBT_MANIFEST_INCREMENTAL_STRATEGY_KEY: str = "incremental_strategy"
 DBT_MANIFEST_MATERIALIZED_KEY: str = "materialized"
 DBT_MANIFEST_META_KEY: str = "meta"
 DBT_MANIFEST_RESOURCE_TYPE_KEY: str = "resource_type"
-DBT_RESOURCE_TYPE_SNAPSHOT: str = "snapshot"
 DBT_MANIFEST_SQLBUILD_META_KEY: str = "sqlbuild"
 DBT_MANIFEST_REUSE_CURSOR_KEY: str = "reuse_cursor"
 

{sqlbuild-0.37.3 → sqlbuild-0.37.4}/src/sqlbuild/integrations/dbt/helpers/fingerprinting.py

@@ -12,7 +12,7 @@ from sqlbuild.compiler.fingerprints.constants import NODE_TYPE_DBT
 from sqlbuild.compiler.fingerprints.main.write import write_fingerprint
 from sqlbuild.compiler.fingerprints.models import Fingerprint
 from sqlbuild.integrations.dbt.models import DbtNodeExecutionResult
-from sqlbuild.integrations.dbt.types import DbtNodeResourceType
+from sqlbuild.integrations.dbt.types import DbtSupportedResourceType
 from sqlbuild.shared.helpers.hashing import compute_query_hash
 
 
@@ -50,7 +50,7 @@ def try_write_dbt_node_fingerprint(
             sort_keys=True,
             separators=(",", ":"),
         )
-        if result.resource_type == DbtNodeResourceType.MODEL:
+        if result.resource_type == DbtSupportedResourceType.MODEL:
             if query_sql is None:
                 warnings.append(
                     f"dbt fingerprint write skipped for '{result.unique_id}': "
@@ -62,7 +62,8 @@ def try_write_dbt_node_fingerprint(
             definition = metadata
         definition_hash: str = (
             seed_identity_hash
-            if result.resource_type == DbtNodeResourceType.SEED and seed_identity_hash is not None
+            if result.resource_type == DbtSupportedResourceType.SEED
+            and seed_identity_hash is not None
             else result.node_checksum or compute_query_hash(definition)
         )
         version_hash: str = version_hash_override or definition_hash

{sqlbuild-0.37.3 → sqlbuild-0.37.4}/src/sqlbuild/integrations/dbt/helpers/lineage_output.py

@@ -11,7 +11,7 @@ from sqlbuild.integrations.dbt.models import (
     DbtLineageGraph,
     DbtLineageNode,
 )
-from sqlbuild.integrations.dbt.types import DbtLineageDirection
+from sqlbuild.integrations.dbt.types import DbtCombinedGraphOwner, DbtLineageDirection
 from sqlbuild.shared.helpers.cli_style import CliStyle
 
 _HUMAN_COLUMN_TRACE_LIMIT: int = 25
@@ -162,7 +162,7 @@ def format_dbt_column_lineage_tree(
 
     style: CliStyle = CliStyle(use_color=use_color)
     lines: list[str] = [
-        f"{style.object_name('Column trace')}  {_format_column(trace.target, style=style)}  "
+        f"{style.object_name('Column trace')}  {_format_column_short(trace.target, style=style)}  "
         f"{style.muted(trace.direction.value)}",
         "",
     ]
@@ -236,14 +236,27 @@ def _serialize_column(column: QualifiedLineageColumn) -> dict[str, object]:
 
 
 def _format_node(node: DbtLineageNode, *, style: CliStyle) -> str:
-    owner_prefix: str = f"{node.key.owner.value}:"
-    return style.object_name(f"{owner_prefix}{node.label}")
+    if node.key.owner == DbtCombinedGraphOwner.DBT:
+        name: str = style.dbt_object_name(node.label)
+    else:
+        name = style.object_name(node.label)
+    return f"{name} {style.muted(f'[{node.key.owner.value}]')}"
 
 
 def _format_column(column: QualifiedLineageColumn, *, style: CliStyle) -> str:
     return style.object_name(_column_id(column))
 
 
+def _format_column_short(column: QualifiedLineageColumn, *, style: CliStyle) -> str:
+    return style.object_name(f"{_short_resource_name(column.resource_name)}:{column.column_name}")
+
+
+def _short_resource_name(resource_name: str) -> str:
+    """Drop the dbt unique-id prefix (model.<package>.) for human display."""
+
+    return resource_name.rsplit(".", 1)[-1]
+
+
 def _column_id(column: QualifiedLineageColumn) -> str:
     return f"{column.resource_name}:{column.column_name}"
 
@@ -264,16 +277,18 @@ def _format_column_trace_branch(
             edge.target if direction == DbtLineageDirection.DOWNSTREAM else edge.source
         ),
     )
-    arrow: str = "->" if direction == DbtLineageDirection.DOWNSTREAM else "<-"
-    for edge in edges:
+    for index, edge in enumerate(edges):
+        is_last: bool = index == len(edges) - 1
+        branch: str = "└─" if is_last else "├─"
+        continuation: str = "   " if is_last else "│  "
         related_column: QualifiedLineageColumn = (
             edge.target if direction == DbtLineageDirection.DOWNSTREAM else edge.source
         )
         related_id: str = _column_id(related_column)
         suffix: str = style.muted(" (already shown)") if related_id in seen else ""
         lines.append(
-            f"{prefix}  {style.muted(arrow)} "
-            f"{_format_column(related_column, style=style)} "
+            f"{prefix}{style.muted(branch)} "
+            f"{_format_column_short(related_column, style=style)} "
             f"{style.muted(f'({edge.transform_kind})')}{suffix}"
         )
         if related_id in seen:
@@ -283,7 +298,7 @@ def _format_column_trace_branch(
                 related_column,
                 deps,
                 direction=direction,
-                prefix=prefix + "     ",
+                prefix=prefix + continuation,
                 seen=seen | {related_id},
                 style=style,
             )
@@ -331,8 +346,8 @@ def _format_branch(
     )
     for index, child in enumerate(children):
         is_last: bool = index == len(children) - 1
-        branch: str = "`-" if is_last else "+-"
-        continuation: str = "  " if is_last else "| "
+        branch: str = "└─" if is_last else "├─"
+        continuation: str = "   " if is_last else "│  "
         suffix: str = style.muted(" (already shown)") if child in seen else ""
         lines.append(
             f"{prefix}{style.muted(branch)} {_format_node(node_by_key[child], style=style)}{suffix}"

{sqlbuild-0.37.3 → sqlbuild-0.37.4}/src/sqlbuild/integrations/dbt/helpers/manifest.py

@@ -19,10 +19,12 @@ from sqlbuild.integrations.dbt.manifest.models import (
     DbtManifestSeed,
     DbtManifestSource,
 )
+from sqlbuild.integrations.dbt.types import DbtSupportedResourceType
 from sqlbuild.shared.types import SqlReferenceKind
 
-_INDEXED_NODE_RESOURCE_TYPES: frozenset[str] = frozenset({"model", "snapshot"})
-_SEED_RESOURCE_TYPE: str = "seed"
+_INDEXED_NODE_RESOURCE_TYPES: frozenset[DbtSupportedResourceType] = frozenset(
+    {DbtSupportedResourceType.MODEL, DbtSupportedResourceType.SNAPSHOT}
+)
 _DBT_RAW_CODE_KEYS: tuple[str, ...] = ("raw_code", "raw_sql")
 _DBT_DEPENDS_ON_KEY: str = "depends_on"
 _DBT_DEPENDS_ON_MACROS_KEY: str = "macros"
@@ -92,7 +94,7 @@ def build_dbt_manifest_index(*, raw_data: object) -> DbtManifestIndex:
             models_by_name_lists.setdefault(model.name, []).append(model)
             models_by_package_and_name[(model.package_name, model.name)] = model
             continue
-        if resource_type == _SEED_RESOURCE_TYPE:
+        if resource_type == DbtSupportedResourceType.SEED:
             seed: DbtManifestSeed = _parse_seed(
                 unique_id=unique_id, raw_node=node_data, warnings=seed_identity_warnings
             )
@@ -102,7 +104,7 @@ def build_dbt_manifest_index(*, raw_data: object) -> DbtManifestIndex:
         if not isinstance(unique_id, str) or not isinstance(raw_node, dict):
             continue
         node_data = cast(dict[object, object], raw_node)
-        if node_data.get("resource_type") != "source":
+        if node_data.get("resource_type") != DbtSupportedResourceType.SOURCE:
             continue
         source: DbtManifestSource = _parse_source(unique_id=unique_id, raw_node=node_data)
         sources_by_unique_id[source.unique_id] = source

{sqlbuild-0.37.3 → sqlbuild-0.37.4}/src/sqlbuild/integrations/dbt/helpers/model_planning.py

@@ -51,6 +51,7 @@ from sqlbuild.integrations.dbt.types import (
     DbtCombinedGraphResourceType,
     DbtModelPlanAction,
     DbtModelPlanReason,
+    DbtSupportedResourceType,
 )
 from sqlbuild.spec.models.source import SourceEntry
 
@@ -225,9 +226,13 @@ def _neutral_upstream_deps(
 def _neutral_key(
     *, key: DbtCombinedGraphKey, manifest: DbtManifestIndex
 ) -> SelectionStalenessNodeKey:
-    resource_type: str = "model"
+    resource_type: str = DbtSupportedResourceType.MODEL
     if key.resource_type == DbtCombinedGraphResourceType.SOURCE:
-        resource_type = "seed" if key.name in manifest.seeds_by_unique_id else "source"
+        resource_type = (
+            DbtSupportedResourceType.SEED
+            if key.name in manifest.seeds_by_unique_id
+            else DbtSupportedResourceType.SOURCE
+        )
     return SelectionStalenessNodeKey(resource_type=resource_type, name=key.name)
 
 
@@ -522,13 +527,25 @@ def _read_dbt_fingerprints(
     return dict(fingerprint_set.fingerprints_by_identity or {})
 
 
+def compose_dbt_version_hash(*, own_hash: str, upstream_hashes: Sequence[tuple[str, str]]) -> str:
+    """Compose a dbt model version hash from its own checksum and upstream identities."""
+
+    if not upstream_hashes:
+        return own_hash
+    payload: str = json.dumps(
+        {"own": own_hash, "upstream": sorted(upstream_hashes)},
+        sort_keys=True,
+        separators=(",", ":"),
+    )
+    return hashlib.sha256(payload.encode()).hexdigest()
+
+
 def build_expected_dbt_model_version_hashes(
     *, manifest: DbtManifestIndex, graph: DbtCombinedGraph | None
 ) -> dict[str, str | None]:
     hashes: dict[str, str | None] = {}
 
     def resolve(unique_id: str, visiting: frozenset[str] = frozenset()) -> str | None:
-        cached: str | None
         if unique_id in hashes:
             return hashes[unique_id]
         model: DbtManifestModel | None = manifest.models_by_unique_id.get(unique_id)
@@ -555,17 +572,9 @@ def build_expected_dbt_model_version_hashes(
                 upstream_hash = None if seed is None else seed.identity_hash
             if upstream_hash is not None:
                 upstream_hashes.append((key.name, upstream_hash))
-        if not upstream_hashes:
-            hashes[unique_id] = own_hash
-            return own_hash
-        payload: str = json.dumps(
-            {"own": own_hash, "upstream": sorted(upstream_hashes)},
-            sort_keys=True,
-            separators=(",", ":"),
-        )
-        cached = hashlib.sha256(payload.encode()).hexdigest()
-        hashes[unique_id] = cached
-        return cached
+        composed: str = compose_dbt_version_hash(own_hash=own_hash, upstream_hashes=upstream_hashes)
+        hashes[unique_id] = composed
+        return composed
 
     unique_id: str
     for unique_id in manifest.models_by_unique_id:

{sqlbuild-0.37.3 → sqlbuild-0.37.4}/src/sqlbuild/integrations/dbt/helpers/plan.py

@@ -25,6 +25,7 @@ from sqlbuild.integrations.dbt.types import (
     DbtModelPlanReason,
     DbtReusePlanAction,
     DbtReusePlanReason,
+    DbtSupportedResourceType,
 )
 from sqlbuild.shared.helpers.alignment import format_aligned_name_value, resolve_name_column_width
 from sqlbuild.shared.helpers.cli_style import CliStyle
@@ -695,17 +696,17 @@ def _format_dbt_non_model_sections(
     seed_nodes: tuple[DbtLsNode, ...] = _nodes_by_unique_ids(
         nodes=plan.dbt_selected_nodes,
         unique_ids=run_ids,
-        resource_type="seed",
+        resource_type=DbtSupportedResourceType.SEED,
     )
     test_nodes: tuple[DbtLsNode, ...] = _nodes_by_unique_ids(
         nodes=plan.dbt_selected_nodes,
         unique_ids=run_ids,
-        resource_type="test",
+        resource_type=DbtSupportedResourceType.TEST,
     )
     unit_test_nodes: tuple[DbtLsNode, ...] = _nodes_by_unique_ids(
         nodes=plan.dbt_selected_nodes,
         unique_ids=run_ids,
-        resource_type="unit_test",
+        resource_type=DbtSupportedResourceType.UNIT_TEST,
     )
     if seed_nodes or test_nodes or unit_test_nodes:
         style: CliStyle = CliStyle(use_color=True)
@@ -736,7 +737,7 @@ def _format_dbt_non_model_sections(
         pruned_seed_nodes: tuple[DbtLsNode, ...] = _nodes_by_unique_ids(
             nodes=plan.dbt_selected_nodes,
             unique_ids=pruned_seed_ids,
-            resource_type="seed",
+            resource_type=DbtSupportedResourceType.SEED,
         )
         _format_dbt_pruned_non_model_group(
             lines,
@@ -749,7 +750,7 @@ def _format_dbt_non_model_sections(
         pruned_nodes: tuple[DbtLsNode, ...] = _nodes_by_unique_ids(
             nodes=plan.dbt_selected_nodes,
             unique_ids=pruned_test_ids,
-            resource_type="test",
+            resource_type=DbtSupportedResourceType.TEST,
         )
         _format_dbt_pruned_non_model_group(
             lines,
@@ -761,7 +762,7 @@ def _format_dbt_non_model_sections(
         pruned_unit_test_nodes: tuple[DbtLsNode, ...] = _nodes_by_unique_ids(
             nodes=plan.dbt_selected_nodes,
             unique_ids=pruned_test_ids,
-            resource_type="unit_test",
+            resource_type=DbtSupportedResourceType.UNIT_TEST,
         )
         _format_dbt_pruned_non_model_group(
             lines,
@@ -818,7 +819,10 @@ def _format_dbt_pruned_non_model_group(
 
 
 def _nodes_by_unique_ids(
-    *, nodes: tuple[DbtLsNode, ...], unique_ids: frozenset[str], resource_type: str
+    *,
+    nodes: tuple[DbtLsNode, ...],
+    unique_ids: frozenset[str],
+    resource_type: DbtSupportedResourceType,
 ) -> tuple[DbtLsNode, ...]:
     return tuple(
         sorted(
@@ -1193,14 +1197,16 @@ def _dbt_test_model_names(plan: DbtInteropPlan) -> tuple[str, ...]:
     names: list[str] = []
     node: DbtLsNode
     for node in plan.dbt_selected_nodes:
-        if node.resource_type == "model":
+        if node.resource_type == DbtSupportedResourceType.MODEL:
             names.append(_dbt_node_display_name(node))
     return tuple(dict.fromkeys(names))
 
 
 def _dbt_test_nodes(plan: DbtInteropPlan) -> tuple[DbtLsNode, ...]:
     return tuple(
-        node for node in plan.dbt_selected_nodes if node.resource_type in {"test", "unit_test"}
+        node
+        for node in plan.dbt_selected_nodes
+        if node.resource_type in {DbtSupportedResourceType.TEST, DbtSupportedResourceType.UNIT_TEST}
     )
 
 
@@ -1283,7 +1289,7 @@ def _format_warning_section(lines: list[str], plan: DbtInteropPlan) -> None:
     lines.append(style.warning_strong(f"Warnings ({len(plan.warnings)})"))
     warning: str
     for warning in plan.warnings:
-        lines.append(f"  - {warning}")
+        lines.append(f"  {style.warning(f'- {warning}')}")
 
 
 def _strip_ansi(text: str) -> str:

{sqlbuild-0.37.3 → sqlbuild-0.37.4}/src/sqlbuild/integrations/dbt/helpers/sql_test_targets.py

@@ -29,7 +29,6 @@ from sqlbuild.integrations.dbt.constants import (
     DBT_MANIFEST_MATERIALIZED_KEY,
     DBT_MANIFEST_RESOURCE_TYPE_KEY,
     DBT_MATERIALIZATION_EPHEMERAL,
-    DBT_RESOURCE_TYPE_SNAPSHOT,
 )
 from sqlbuild.integrations.dbt.exceptions import DbtInteropRuntimeError
 from sqlbuild.integrations.dbt.manifest.models import (
@@ -38,7 +37,7 @@ from sqlbuild.integrations.dbt.manifest.models import (
     DbtManifestSeed,
     DbtManifestSource,
 )
-from sqlbuild.integrations.dbt.types import DbtChainNodeBoundaryKind
+from sqlbuild.integrations.dbt.types import DbtChainNodeBoundaryKind, DbtSupportedResourceType
 from sqlbuild.shared.types import SqlReferenceKind
 from sqlbuild.spec.models.schema import SchemaSeedEntry
 from sqlbuild.spec.models.source import SourceEntry
@@ -622,7 +621,7 @@ def _require_chainable_dbt_node(*, dbt_model: DbtManifestModel) -> None:
 
 
 def _dbt_node_boundary_kind(*, dbt_model: DbtManifestModel) -> DbtChainNodeBoundaryKind | None:
-    if dbt_model.payload.get(DBT_MANIFEST_RESOURCE_TYPE_KEY) == DBT_RESOURCE_TYPE_SNAPSHOT:
+    if dbt_model.payload.get(DBT_MANIFEST_RESOURCE_TYPE_KEY) == DbtSupportedResourceType.SNAPSHOT:
         return DbtChainNodeBoundaryKind.SNAPSHOT
     config: object = dbt_model.payload.get(DBT_MANIFEST_CONFIG_KEY)
     if isinstance(config, dict):

{sqlbuild-0.37.3 → sqlbuild-0.37.4}/src/sqlbuild/integrations/dbt/pipeline/helpers/clone.py

@@ -17,6 +17,7 @@ from sqlbuild.integrations.dbt.constants import (
 from sqlbuild.integrations.dbt.exceptions import DbtInteropArgumentError
 from sqlbuild.integrations.dbt.manifest.models import DbtManifestIndex, DbtManifestModel
 from sqlbuild.integrations.dbt.models import DbtCloneOptions, DbtLsNode
+from sqlbuild.integrations.dbt.types import DbtSupportedResourceType
 
 
 def parse_dbt_clone_options(args: tuple[str, ...]) -> DbtCloneOptions:
@@ -79,7 +80,7 @@ def execute_dbt_clone(
     results: list[CloneItemResult] = []
     node: DbtLsNode
     for node in selected_nodes:
-        if node.resource_type != "model":
+        if node.resource_type != DbtSupportedResourceType.MODEL:
             continue
         current_model: DbtManifestModel | None = current_manifest.models_by_unique_id.get(
             node.unique_id

{sqlbuild-0.37.3 → sqlbuild-0.37.4}/src/sqlbuild/integrations/dbt/pipeline/helpers/diff.py

@@ -12,6 +12,7 @@ from sqlbuild.executor.diff.models import DiffExecutionResult, ModelDiffResult
 from sqlbuild.integrations.dbt.exceptions import DbtInteropArgumentError, DbtInteropConfigError
 from sqlbuild.integrations.dbt.manifest.models import DbtManifestIndex, DbtManifestModel
 from sqlbuild.integrations.dbt.models import DbtDiffOptions, DbtLsNode
+from sqlbuild.integrations.dbt.types import DbtSupportedResourceType
 
 
 def parse_dbt_diff_options(args: tuple[str, ...]) -> DbtDiffOptions:
@@ -110,7 +111,7 @@ def execute_dbt_diff(
     results: list[ModelDiffResult] = []
     node: DbtLsNode
     for node in selected_nodes:
-        if node.resource_type != "model":
+        if node.resource_type != DbtSupportedResourceType.MODEL:
             continue
         current_model: DbtManifestModel | None = current_manifest.models_by_unique_id.get(
             node.unique_id

{sqlbuild-0.37.3 → sqlbuild-0.37.4}/src/sqlbuild/integrations/dbt/pipeline/helpers/execute.py

@@ -40,6 +40,7 @@ from sqlbuild.integrations.dbt.types import (
     DbtModelOutcomeState,
     DbtModelPlanAction,
     DbtReusePlanAction,
+    DbtSupportedResourceType,
 )
 from sqlbuild.shared.helpers.cli_style import CliStyle
 from sqlbuild.shared.helpers.status import TransientStatusReporter
@@ -196,7 +197,7 @@ def build_dbt_execution_outcome(
             )
     result: DbtNodeExecutionResult
     for result in node_results:
-        if result.resource_type != "model":
+        if result.resource_type != DbtSupportedResourceType.MODEL:
             continue
         planned_entry: DbtModelPlanEntry | None = planned_entries.get(result.unique_id)
         planned_action: DbtModelPlanAction | None = (
@@ -398,7 +399,7 @@ def build_deferred_dbt_relations(
     unique_ids: set[str] = set(plan.selection.dbt_required_unique_ids)
     node: DbtLsNode
     for node in plan.dbt_selected_nodes:
-        if node.resource_type == "model":
+        if node.resource_type == DbtSupportedResourceType.MODEL:
             unique_ids.add(node.unique_id)
     unique_id: str
     for unique_id in unique_ids:
@@ -424,13 +425,13 @@ def build_dbt_non_model_run_unique_ids(
     if plan.dbt_model_plan is None:
         return ()
     seed_unique_ids: tuple[str, ...] = _selected_non_model_unique_ids(
-        plan=plan, resource_type="seed"
+        plan=plan, resource_type=DbtSupportedResourceType.SEED
     )
     test_unique_ids: tuple[str, ...] = _selected_non_model_unique_ids(
-        plan=plan, resource_type="test"
+        plan=plan, resource_type=DbtSupportedResourceType.TEST
     )
     unit_test_unique_ids: tuple[str, ...] = _selected_non_model_unique_ids(
-        plan=plan, resource_type="unit_test"
+        plan=plan, resource_type=DbtSupportedResourceType.UNIT_TEST
     )
     if command == DbtInteropCommand.TEST:
         return tuple(sorted(frozenset((*test_unique_ids, *unit_test_unique_ids))))
@@ -457,8 +458,12 @@ def build_dbt_pruned_test_unique_ids(
         sorted(
             frozenset(
                 (
-                    *_selected_non_model_unique_ids(plan=plan, resource_type="test"),
-                    *_selected_non_model_unique_ids(plan=plan, resource_type="unit_test"),
+                    *_selected_non_model_unique_ids(
+                        plan=plan, resource_type=DbtSupportedResourceType.TEST
+                    ),
+                    *_selected_non_model_unique_ids(
+                        plan=plan, resource_type=DbtSupportedResourceType.UNIT_TEST
+                    ),
                 )
             )
         )
@@ -511,7 +516,9 @@ def build_dbt_pruned_seed_unique_ids(
     changed: frozenset[str] = frozenset(plan.dbt_model_plan.changed_seed_unique_ids)
     return tuple(
         unique_id
-        for unique_id in _selected_non_model_unique_ids(plan=plan, resource_type="seed")
+        for unique_id in _selected_non_model_unique_ids(
+            plan=plan, resource_type=DbtSupportedResourceType.SEED
+        )
         if unique_id not in changed
     )
 
@@ -597,17 +604,22 @@ def _planned_dbt_select_terms(
         for entry in (plan.dbt_reuse_plan.entries if plan.dbt_reuse_plan is not None else ())
         if entry.action == DbtReusePlanAction.COMPLETE_REUSE
     )
+    executable_model_unique_ids: frozenset[str] = frozenset(
+        (*plan.dbt_selected_unique_ids, *plan.selection.dbt_required_unique_ids)
+    )
     model_terms: tuple[str, ...] = tuple(
         entry.selector_term
         for entry in plan.dbt_model_plan.entries
         if entry.action == DbtModelPlanAction.RUN
-        and entry.unique_id in plan.dbt_selected_unique_ids
+        and entry.unique_id in executable_model_unique_ids
         and entry.unique_id not in reused_unique_ids
     )
     return tuple(sorted(frozenset((*model_terms, *non_model_terms))))
 
 
-def _selected_non_model_unique_ids(*, plan: DbtInteropPlan, resource_type: str) -> tuple[str, ...]:
+def _selected_non_model_unique_ids(
+    *, plan: DbtInteropPlan, resource_type: DbtSupportedResourceType
+) -> tuple[str, ...]:
     return tuple(
         sorted(
             node.unique_id

{sqlbuild-0.37.3 → sqlbuild-0.37.4}/src/sqlbuild/integrations/dbt/pipeline/helpers/reuse_execute.py

@@ -44,11 +44,13 @@ def execute_dbt_complete_reuse_plan(
     fingerprint_schema: str | None,
     target_name: str | None,
     warnings: list[str],
+    expected_version_hashes: dict[str, str | None] | None = None,
 ) -> tuple[str, ...]:
     """Execute complete table reuse entries and return reused dbt unique IDs."""
 
     if plan.dbt_reuse_plan is None:
         return ()
+    expected_hashes: dict[str, str | None] = expected_version_hashes or {}
     reused_unique_ids: list[str] = []
     entry: DbtReusePlanEntry
     for entry in plan.dbt_reuse_plan.entries:
@@ -69,6 +71,7 @@ def execute_dbt_complete_reuse_plan(
             fingerprint_schema=fingerprint_schema,
             target_name=target_name,
             warnings=warnings,
+            expected_version_hash=expected_hashes.get(entry.unique_id),
         )
         reused_unique_ids.append(entry.unique_id)
     return tuple(reused_unique_ids)
@@ -202,6 +205,7 @@ def _execute_complete_reuse_entry(
     fingerprint_schema: str | None,
     target_name: str | None,
     warnings: list[str],
+    expected_version_hash: str | None = None,
 ) -> None:
     destination_database, destination_schema, destination_name = _relation_parts(
         relation_name=entry.destination_relation_name or model.relation_name
@@ -253,6 +257,7 @@ def _execute_complete_reuse_entry(
         fingerprint_schema=fingerprint_schema,
         target_name=target_name,
         warnings=warnings,
+        expected_version_hash=expected_version_hash,
     )
 
 
@@ -267,6 +272,7 @@ def _write_reuse_fingerprint(
     fingerprint_schema: str | None,
     target_name: str | None,
     warnings: list[str],
+    expected_version_hash: str | None = None,
 ) -> None:
     if fingerprint_schema is None:
         warnings.append(
@@ -283,6 +289,7 @@ def _write_reuse_fingerprint(
     definition_hash: str = (
         model.node_checksum or hashlib.sha256(model.query_sql.encode("utf-8")).hexdigest()
     )
+    version_hash: str = expected_version_hash or definition_hash
     target_database, target_schema, destination_relation_name = _relation_parts(
         relation_name=entry.destination_relation_name or model.relation_name
     )
@@ -294,7 +301,7 @@ def _write_reuse_fingerprint(
         target_name=destination_relation_name,
         run_id=run_id,
         definition_hash=definition_hash,
-        version_hash=definition_hash,
+        version_hash=version_hash,
         schema_fingerprint=hashlib.sha256(b"").hexdigest(),
         definition=model.query_sql,
         metadata_json=json.dumps(

{sqlbuild-0.37.3 → sqlbuild-0.37.4}/src/sqlbuild/integrations/dbt/pipeline/main/clone.py

@@ -41,6 +41,7 @@ from sqlbuild.integrations.dbt.pipeline.helpers.clone import (
     parse_dbt_clone_options,
 )
 from sqlbuild.integrations.dbt.shared.helpers.connection import resolve_connection_config
+from sqlbuild.integrations.dbt.types import DbtSupportedResourceType
 from sqlbuild.spec.models.project import DbtReuseFromConfig, resolve_effective_adapter_name
 
 
@@ -163,7 +164,7 @@ def _resolve_selected_nodes(
         options=dbt_options,
         select=options.select,
         exclude=options.exclude,
-        resource_types=("model",),
+        resource_types=(DbtSupportedResourceType.MODEL,),
     )
     if ls_result.command.returncode != 0:
         raise DbtInteropRuntimeError(