sqlbuild 0.65.6__tar.gz → 0.66.1__tar.gz

{sqlbuild-0.65.6 → sqlbuild-0.66.1}/Cargo.lock

@@ -572,7 +572,7 @@ checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba"
 
 [[package]]
 name = "sqlbuild-kata-native"
-version = "0.65.6"
+version = "0.66.1"
 dependencies = [
  "fensu-policy",
  "globset",

{sqlbuild-0.65.6 → sqlbuild-0.66.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlbuild
-Version: 0.65.6
+Version: 0.66.1
 Requires-Dist: duckdb>=1.3.2
 Requires-Dist: filelock>=3.20.3
 Requires-Dist: polyglot-sql>=0.9.2

{sqlbuild-0.65.6 → sqlbuild-0.66.1}/crates/sqlbuild-kata-native/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sqlbuild-kata-native"
-version = "0.65.6"
+version = "0.66.1"
 edition.workspace = true
 license.workspace = true
 publish.workspace = true

{sqlbuild-0.65.6 → sqlbuild-0.66.1}/pyproject.toml

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

sqlbuild-0.66.1/src/sqlbuild/adapter/contract/_helpers/seed_csv.py

@@ -0,0 +1,34 @@
+"""Shared seed CSV null handling."""
+
+from __future__ import annotations
+
+from sqlbuild.spec.contracts.models import SeedCsvSettings
+
+_DEFAULT_NULL_VALUE: str = ""
+
+
+def get_seed_csv_null_values(csv_settings: SeedCsvSettings) -> tuple[str, ...]:
+    """Return global CSV values that represent SQL nulls."""
+
+    null_values: list[str] = []
+    if csv_settings.keep_default_na is not False:
+        null_values.append(_DEFAULT_NULL_VALUE)
+    if isinstance(csv_settings.na_values, tuple):
+        null_values.extend(str(value) for value in csv_settings.na_values)
+    return tuple(dict.fromkeys(null_values))
+
+
+def normalize_seed_csv_value(
+    *, value: str | None, column_name: str, csv_settings: SeedCsvSettings
+) -> str | None:
+    """Convert configured CSV null representations to None."""
+
+    if value is None:
+        return None
+    if value in get_seed_csv_null_values(csv_settings):
+        return None
+    if isinstance(csv_settings.na_values, dict):
+        column_null_values: tuple[object, ...] = csv_settings.na_values.get(column_name, ())
+        if value in {str(item) for item in column_null_values}:
+            return None
+    return value

{sqlbuild-0.65.6 → sqlbuild-0.66.1}/src/sqlbuild/adapter/contract/classes/duckdb_backed_adapter.py

@@ -12,6 +12,7 @@ from pathlib import Path
 from types import ModuleType
 from typing import Any, ClassVar
 
+from sqlbuild.adapter.contract._helpers.seed_csv import get_seed_csv_null_values
 from sqlbuild.adapter.contract.classes.base_adapter import (
     BaseAdapter,
     _encode_typed_json,
@@ -2437,9 +2438,10 @@ class DuckDbBackedAdapter(BaseAdapter):
         for option_name, option_value in string_options.items():
             if option_value is not None:
                 options.append(f"{option_name}='{self._duckdb_string_literal(option_value)}'")
-        if isinstance(csv_settings.na_values, tuple) and csv_settings.na_values:
+        seed_null_values: tuple[str, ...] = get_seed_csv_null_values(csv_settings)
+        if seed_null_values:
             null_values: str = ", ".join(
-                f"'{self._duckdb_string_literal(str(value))}'" for value in csv_settings.na_values
+                f"'{self._duckdb_string_literal(value)}'" for value in seed_null_values
             )
             options.append(f"nullstr=[{null_values}]")
         if not options:

sqlbuild-0.66.1/src/sqlbuild/adapter/contract/main/normalize_seed_csv_value.py

@@ -0,0 +1,14 @@
+"""Public seed CSV normalization entrypoint."""
+
+from __future__ import annotations
+
+from sqlbuild.adapter.contract._helpers.seed_csv import normalize_seed_csv_value as _normalize
+from sqlbuild.spec.contracts.models import SeedCsvSettings
+
+
+def normalize_seed_csv_value(
+    *, value: str | None, column_name: str, csv_settings: SeedCsvSettings
+) -> str | None:
+    """Convert configured CSV null representations to None."""
+
+    return _normalize(value=value, column_name=column_name, csv_settings=csv_settings)

{sqlbuild-0.65.6 → sqlbuild-0.66.1}/src/sqlbuild/adapters/databricks/classes/databricks_adapter.py

@@ -21,6 +21,7 @@ from sqlbuild.adapter.contract.classes.microbatch import MicrobatchMixin
 from sqlbuild.adapter.contract.classes.statement_recorder import StatementRecorder
 from sqlbuild.adapter.contract.constants import DIFF_LEFT_SIDE, DIFF_RIGHT_SIDE
 from sqlbuild.adapter.contract.exceptions import AdapterUserError
+from sqlbuild.adapter.contract.main.normalize_seed_csv_value import normalize_seed_csv_value
 from sqlbuild.adapter.contract.models import (
     ColumnInfo,
     CursorValue,
@@ -2043,7 +2044,7 @@ class DatabricksAdapter(MicrobatchMixin, BaseAdapter):
                     continue
                 rows.append(
                     tuple(
-                        self._normalize_seed_csv_value(
+                        normalize_seed_csv_value(
                             value=row.get(column_name),
                             column_name=column_name,
                             csv_settings=csv_settings,
@@ -2757,22 +2758,6 @@ class DatabricksAdapter(MicrobatchMixin, BaseAdapter):
             return value
         return int(str(value))
 
-    def _normalize_seed_csv_value(
-        self, *, value: str | None, column_name: str, csv_settings: SeedCsvSettings
-    ) -> str | None:
-        if value is None:
-            return None
-        na_values: tuple[object, ...] | dict[str, tuple[object, ...]] | None = (
-            csv_settings.na_values
-        )
-        if isinstance(na_values, dict):
-            column_na_values: tuple[object, ...] = na_values.get(column_name, ())
-            if value in {str(item) for item in column_na_values}:
-                return None
-        if isinstance(na_values, tuple) and value in {str(item) for item in na_values}:
-            return None
-        return value
-
     @staticmethod
     def _snapshot_initial_valid_from_expr(
         *,

{sqlbuild-0.65.6 → sqlbuild-0.66.1}/src/sqlbuild/adapters/postgres/classes/postgres_adapter.py

@@ -36,6 +36,7 @@ from sqlbuild.adapter.contract.constants import (
     QUALIFIED_NAME_SEPARATOR,
 )
 from sqlbuild.adapter.contract.exceptions import AdapterUserError
+from sqlbuild.adapter.contract.main.normalize_seed_csv_value import normalize_seed_csv_value
 from sqlbuild.adapter.contract.models import (
     ColumnInfo,
     CursorValue,
@@ -1864,7 +1865,7 @@ class PostgresAdapter(MicrobatchMixin, BaseAdapter):
                     continue
                 rows.append(
                     tuple(
-                        self._normalize_seed_csv_value(
+                        normalize_seed_csv_value(
                             value=row.get(col), column_name=col, csv_settings=csv_settings
                         )
                         for col in column_names
@@ -2260,26 +2261,6 @@ class PostgresAdapter(MicrobatchMixin, BaseAdapter):
     def normalize_row_diff_numeric_type(self, column_type: str) -> str | None:
         return normalize_numeric_family(type_sql=column_type, dialect=self.sql_analysis_dialect())
 
-    def _normalize_seed_csv_value(
-        self,
-        *,
-        value: str | None,
-        column_name: str,
-        csv_settings: SeedCsvSettings,
-    ) -> str | None:
-        if value is None:
-            return None
-        na_values: tuple[object, ...] | dict[str, tuple[object, ...]] | None = (
-            csv_settings.na_values
-        )
-        if isinstance(na_values, dict):
-            column_na: tuple[object, ...] = na_values.get(column_name, ())
-            if value in {str(item) for item in column_na}:
-                return None
-        if isinstance(na_values, tuple) and value in {str(item) for item in na_values}:
-            return None
-        return value
-
     def render_apply_historical_timestamp_snapshot_changes(
         self,
         *,

{sqlbuild-0.65.6 → sqlbuild-0.66.1}/src/sqlbuild/adapters/snowflake/classes/snowflake_adapter.py

@@ -21,6 +21,7 @@ from sqlbuild.adapter.contract.classes.microbatch import MicrobatchMixin
 from sqlbuild.adapter.contract.classes.statement_recorder import StatementRecorder
 from sqlbuild.adapter.contract.constants import DIFF_LEFT_SIDE, DIFF_RIGHT_SIDE
 from sqlbuild.adapter.contract.exceptions import AdapterUserError
+from sqlbuild.adapter.contract.main.normalize_seed_csv_value import normalize_seed_csv_value
 from sqlbuild.adapter.contract.models import (
     ColumnInfo,
     ExpressionInferenceProfile,
@@ -2252,7 +2253,7 @@ class SnowflakeAdapter(MicrobatchMixin, BaseAdapter):
                     continue
                 rows.append(
                     tuple(
-                        self._normalize_seed_csv_value(
+                        normalize_seed_csv_value(
                             value=row.get(column_name),
                             column_name=column_name,
                             csv_settings=csv_settings,
@@ -2947,22 +2948,6 @@ class SnowflakeAdapter(MicrobatchMixin, BaseAdapter):
         finally:
             cursor.close()
 
-    def _normalize_seed_csv_value(
-        self, *, value: str | None, column_name: str, csv_settings: SeedCsvSettings
-    ) -> str | None:
-        if value is None:
-            return None
-        na_values: tuple[object, ...] | dict[str, tuple[object, ...]] | None = (
-            csv_settings.na_values
-        )
-        if isinstance(na_values, dict):
-            column_na_values: tuple[object, ...] = na_values.get(column_name, ())
-            if value in {str(item) for item in column_na_values}:
-                return None
-        if isinstance(na_values, tuple) and value in {str(item) for item in na_values}:
-            return None
-        return value
-
     @staticmethod
     def _snapshot_initial_valid_from_expr(
         *,

{sqlbuild-0.65.6 → sqlbuild-0.66.1}/src/sqlbuild/adapters/sqlserver/classes/sqlserver_adapter.py

@@ -31,6 +31,7 @@ from sqlbuild.adapter.contract.exceptions import (
     AdapterUserError,
     UnsupportedTypedSqlRenderingError,
 )
+from sqlbuild.adapter.contract.main.normalize_seed_csv_value import normalize_seed_csv_value
 from sqlbuild.adapter.contract.models import (
     ColumnInfo,
     CursorValue,
@@ -71,7 +72,6 @@ from sqlbuild.adapters.sqlserver.constants import (
     DIFF_DATETIME_PRECISION_TYPES,
     DIFF_NUMERIC_PRECISION_TYPES,
     DIFF_UNSUPPORTED_COMPARISON_TYPES,
-    EMPTY_SEED_VALUE,
     INFORMATION_SCHEMA_NULLABLE_VALUE,
     INTEGER_TYPE_TOKEN,
 )
@@ -2877,7 +2877,9 @@ class SqlServerAdapter(MicrobatchMixin, BaseAdapter):
                     continue
                 rows.append(
                     tuple(
-                        self._normalize_sqlserver_seed_csv_value(row.get(col))
+                        normalize_seed_csv_value(
+                            value=row.get(col), column_name=col, csv_settings=csv_settings
+                        )
                         for col in column_names
                     )
                 )
@@ -2889,8 +2891,3 @@ class SqlServerAdapter(MicrobatchMixin, BaseAdapter):
             cursor.executemany(insert_sql, rows)
         finally:
             cursor.close()
-
-    def _normalize_sqlserver_seed_csv_value(self, value: str | None) -> object:
-        if value is None or value == EMPTY_SEED_VALUE:
-            return None
-        return value

{sqlbuild-0.65.6 → sqlbuild-0.66.1}/src/sqlbuild/adapters/sqlserver/constants.py

@@ -9,6 +9,5 @@ DIFF_NUMERIC_PRECISION_TYPES: frozenset[str] = frozenset({"decimal", "numeric"})
 DIFF_UNSUPPORTED_COMPARISON_TYPES: frozenset[str] = frozenset(
     {"geography", "geometry", "hierarchyid", "image", "ntext", "text", "xml"}
 )
-EMPTY_SEED_VALUE: str = ""
 INFORMATION_SCHEMA_NULLABLE_VALUE: str = "YES"
 INTEGER_TYPE_TOKEN: str = "INT"

{sqlbuild-0.65.6 → sqlbuild-0.66.1}/src/sqlbuild/cli/commands/_helpers/entry/parser.py

@@ -33,7 +33,12 @@ def build_cli_parser(*, use_color: bool = False) -> argparse.ArgumentParser:
     parser: argparse.ArgumentParser = parser_class(prog="sqb")
     parser.add_argument("--project-dir", "--sqb-project-dir", dest="project_dir", default=None)
     parser.add_argument("--no-color", action="store_true", default=False)
-    parser.add_argument("--debug", action="store_true", default=False)
+    parser.add_argument(
+        "--debug",
+        action="store_true",
+        default=False,
+        help="enable verbose output and mirror internal diagnostics to stderr",
+    )
 
     subparsers: argparse._SubParsersAction[argparse.ArgumentParser] = parser.add_subparsers(
         dest="command",

{sqlbuild-0.65.6 → sqlbuild-0.66.1}/src/sqlbuild/cli/commands/_helpers/entry/parsing.py

@@ -9,6 +9,8 @@ from pathlib import Path
 
 from sqlbuild.cli.commands.classes.cli_namespace import CliNamespace
 from sqlbuild.cli.commands.constants import (
+    DBT_PASSTHROUGH_SEPARATOR,
+    DBT_VERBOSE_OPTIONS,
     DEBUG_OPTION,
     EMPTY_ENV_VALUE,
     NO_COLOR_OPTION,
@@ -19,6 +21,7 @@ from sqlbuild.cli.commands.constants import (
 from sqlbuild.cli.commands.models import ParsedCliInvocation
 from sqlbuild.cli.commands.types import CliCommand
 from sqlbuild.compiler.scopes.types import DeclarationKind
+from sqlbuild.integrations.dbt.types import DbtInteropCommand
 
 _DBT_PASSTHROUGH_SUBCOMMANDS: frozenset[str] = frozenset(
     {
@@ -76,18 +79,31 @@ def parse_cli_invocation(
         _, unknown_args = parser.parse_known_args(argv, namespace=args)
         if args.command == CliCommand.DBT and args.dbt_command in _DBT_PASSTHROUGH_SUBCOMMANDS:
             dbt_passthrough_args: list[str] = []
+            dbt_passthrough_started: bool = False
             dbt_arg: str
             for dbt_arg in unknown_args:
-                if dbt_arg == NO_COLOR_OPTION:
+                if dbt_arg == DBT_PASSTHROUGH_SEPARATOR:
+                    dbt_passthrough_started = True
+                    dbt_passthrough_args.append(dbt_arg)
+                    continue
+                if dbt_arg == NO_COLOR_OPTION and not dbt_passthrough_started:
                     args.no_color = True
                     continue
-                if dbt_arg == DEBUG_OPTION:
+                if dbt_arg == DEBUG_OPTION and not dbt_passthrough_started:
                     args.debug = True
                     continue
                 dbt_passthrough_args.append(dbt_arg)
             args.dbt_args = dbt_passthrough_args
         elif unknown_args:
             parser.error(f"unrecognized arguments: {' '.join(unknown_args)}")
+        args.verbose = args.verbose or args.debug
+        if (
+            args.debug
+            and args.command == CliCommand.DBT
+            and args.dbt_command != DbtInteropCommand.DEBUG
+            and not any(option in args.dbt_args for option in DBT_VERBOSE_OPTIONS)
+        ):
+            args.dbt_args.append("--verbose")
         if args.command in {CliCommand.BUILD, CliCommand.LOAD, CliCommand.SEED}:
             try:
                 args.concurrency = resolve_env_default_concurrency(args.concurrency)

{sqlbuild-0.65.6 → sqlbuild-0.66.1}/src/sqlbuild/cli/commands/constants.py

@@ -59,6 +59,7 @@ SQL_VALIDATION_CONFIG_KEY: str = "sql_validation"
 GRAPH_SELECTOR_EXPANSION_MARKER: str = "+"
 GRAPH_SELECTOR_PATH_MARKER: str = "~"
 DBT_JSON_OUTPUT_OPTION: str = "--json"
+DBT_PASSTHROUGH_SEPARATOR: str = "--"
 DBT_VERBOSE_OPTIONS: frozenset[str] = frozenset({"--verbose", "-v"})
 DBT_CLI_OUTPUT_OPTIONS: frozenset[str] = frozenset({DBT_JSON_OUTPUT_OPTION, *DBT_VERBOSE_OPTIONS})
 DBT_NO_CONNECTION_OPTION: str = "--no-connection"