sqlbuild 0.68.0__tar.gz → 0.70.0__tar.gz

{sqlbuild-0.68.0 → sqlbuild-0.70.0}/Cargo.lock

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

{sqlbuild-0.68.0 → sqlbuild-0.70.0}/PKG-INFO

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

{sqlbuild-0.68.0 → sqlbuild-0.70.0}/crates/sqlbuild-kata-native/Cargo.toml

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

{sqlbuild-0.68.0 → sqlbuild-0.70.0}/pyproject.toml

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

{sqlbuild-0.68.0 → sqlbuild-0.70.0}/src/sqlbuild/adapter/contract/classes/base_adapter.py

@@ -727,6 +727,7 @@ class BaseAdapter(RetentionAdapterMixin, StrictAdapter):
     def render_create_initial_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         snapshot_strategy: str | None,
@@ -899,6 +900,7 @@ class BaseAdapter(RetentionAdapterMixin, StrictAdapter):
     def render_create_initial_historical_timestamp_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],
@@ -924,6 +926,7 @@ class BaseAdapter(RetentionAdapterMixin, StrictAdapter):
     def render_create_initial_historical_timestamp_changes_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],
@@ -1058,6 +1061,7 @@ class BaseAdapter(RetentionAdapterMixin, StrictAdapter):
     def render_create_initial_historical_check_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],

{sqlbuild-0.68.0 → sqlbuild-0.70.0}/src/sqlbuild/adapter/contract/classes/duckdb_backed_adapter.py

@@ -379,6 +379,7 @@ class DuckDbBackedAdapter(BaseAdapter):
     def render_create_initial_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         snapshot_strategy: str | None,
@@ -475,6 +476,7 @@ class DuckDbBackedAdapter(BaseAdapter):
     def render_create_initial_historical_timestamp_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],
@@ -502,6 +504,7 @@ class DuckDbBackedAdapter(BaseAdapter):
     def render_create_initial_historical_timestamp_changes_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],
@@ -712,6 +715,7 @@ class DuckDbBackedAdapter(BaseAdapter):
     def render_create_initial_historical_check_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],

{sqlbuild-0.68.0 → sqlbuild-0.70.0}/src/sqlbuild/adapter/contract/classes/retention_adapter.py

@@ -30,16 +30,3 @@ class RetentionAdapterMixin:
         raise AdapterUserError(
             message=f"adapter '{self.adapter_name}' does not support retention changes"
         )
-
-    def render_create_permanent_table_from_relation(
-        self, *, destination: str, origin: str
-    ) -> tuple[str, ...]:
-        return self.render_create_permanent_table_as(
-            destination=destination, sql=f"SELECT * FROM {origin}"
-        )
-
-    def render_create_permanent_table_as(self, *, destination: str, sql: str) -> tuple[str, ...]:
-        del destination, sql
-        raise AdapterUserError(
-            message=f"adapter '{self.adapter_name}' does not support permanent-table migration"
-        )

{sqlbuild-0.68.0 → sqlbuild-0.70.0}/src/sqlbuild/adapter/contract/classes/strict_adapter.py

@@ -436,6 +436,7 @@ class StrictAdapter(
     def render_create_initial_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         snapshot_strategy: str | None,
@@ -470,6 +471,7 @@ class StrictAdapter(
     def render_create_initial_historical_timestamp_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],
@@ -487,6 +489,7 @@ class StrictAdapter(
     def render_create_initial_historical_timestamp_changes_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],
@@ -548,6 +551,7 @@ class StrictAdapter(
     def render_create_initial_historical_check_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],

{sqlbuild-0.68.0 → sqlbuild-0.70.0}/src/sqlbuild/adapters/bigquery/classes/bigquery_adapter.py

@@ -927,6 +927,7 @@ class BigQueryAdapter(MicrobatchMixin, BaseAdapter):
     def render_create_initial_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         snapshot_strategy: str | None,
@@ -1023,6 +1024,7 @@ class BigQueryAdapter(MicrobatchMixin, BaseAdapter):
     def render_create_initial_historical_timestamp_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],
@@ -1048,6 +1050,7 @@ class BigQueryAdapter(MicrobatchMixin, BaseAdapter):
     def render_create_initial_historical_timestamp_changes_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],
@@ -1248,6 +1251,7 @@ class BigQueryAdapter(MicrobatchMixin, BaseAdapter):
     def render_create_initial_historical_check_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],

{sqlbuild-0.68.0 → sqlbuild-0.70.0}/src/sqlbuild/adapters/databricks/classes/databricks_adapter.py

@@ -806,6 +806,7 @@ class DatabricksAdapter(MicrobatchMixin, BaseAdapter):
     def render_create_initial_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         snapshot_strategy: str | None,
@@ -902,6 +903,7 @@ class DatabricksAdapter(MicrobatchMixin, BaseAdapter):
     def render_create_initial_historical_timestamp_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],
@@ -927,6 +929,7 @@ class DatabricksAdapter(MicrobatchMixin, BaseAdapter):
     def render_create_initial_historical_timestamp_changes_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],
@@ -1135,6 +1138,7 @@ class DatabricksAdapter(MicrobatchMixin, BaseAdapter):
     def render_create_initial_historical_check_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],

{sqlbuild-0.68.0 → sqlbuild-0.70.0}/src/sqlbuild/adapters/postgres/classes/postgres_adapter.py

@@ -1076,6 +1076,7 @@ class PostgresAdapter(MicrobatchMixin, BaseAdapter):
     def render_create_initial_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         snapshot_strategy: str | None,
@@ -1245,6 +1246,7 @@ class PostgresAdapter(MicrobatchMixin, BaseAdapter):
     def render_create_initial_historical_timestamp_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],
@@ -1270,6 +1272,7 @@ class PostgresAdapter(MicrobatchMixin, BaseAdapter):
     def render_create_initial_historical_timestamp_changes_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],
@@ -1291,6 +1294,7 @@ class PostgresAdapter(MicrobatchMixin, BaseAdapter):
     def render_create_initial_historical_check_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],

{sqlbuild-0.68.0 → sqlbuild-0.70.0}/src/sqlbuild/adapters/snowflake/classes/snowflake_adapter.py

@@ -86,6 +86,7 @@ from sqlbuild.cost.types import CostCapability, CostStatus
 from sqlbuild.diagnostics.main.log_sql import log_sql
 from sqlbuild.spec.contracts.constants import DEFAULT_SEED_CSV_SETTINGS
 from sqlbuild.spec.contracts.models import SeedCsvSettings
+from sqlbuild.spec.contracts.types import TableType
 from sqlbuild.sql_values.models import SqlValue
 
 _EXACT_COLUMN_INSPECTION_LIMIT: int = 32
@@ -162,16 +163,6 @@ class SnowflakeAdapter(MicrobatchMixin, BaseAdapter):
             ),
         )
 
-    def render_create_permanent_table_from_relation(
-        self, *, destination: str, origin: str
-    ) -> tuple[str, ...]:
-        return self.render_create_permanent_table_as(
-            destination=destination, sql=f"SELECT * FROM {origin}"
-        )
-
-    def render_create_permanent_table_as(self, *, destination: str, sql: str) -> tuple[str, ...]:
-        return (f"CREATE TABLE {destination} AS {sql}",)
-
     @staticmethod
     def _validate_relation_retention_request(*, request: RetentionRequest) -> None:
         if request.scope != RetentionScope.RELATION or request.name is None:
@@ -636,7 +627,15 @@ class SnowflakeAdapter(MicrobatchMixin, BaseAdapter):
             self.execute(connection=connection, sql=stmt)
 
     def render_create_table_as(self, *, destination: str, sql: str) -> tuple[str, ...]:
-        return (f"CREATE OR REPLACE TRANSIENT TABLE {destination} AS {sql}",)
+        return self._render_create_table_as_type(
+            destination=destination, sql=sql, table_type="transient"
+        )
+
+    def _render_create_table_as_type(
+        self, *, destination: str, sql: str, table_type: str
+    ) -> tuple[str, ...]:
+        table_kind: str = "TABLE" if table_type == TableType.PERMANENT else "TRANSIENT TABLE"
+        return (f"CREATE OR REPLACE {table_kind} {destination} AS {sql}",)
 
     def render_create_view_as(self, *, destination: str, sql: str) -> tuple[str, ...]:
         return (f"CREATE OR REPLACE VIEW {destination} AS {sql}",)
@@ -774,7 +773,10 @@ class SnowflakeAdapter(MicrobatchMixin, BaseAdapter):
         config: dict[str, Any] | None = None,
         statement_recorder: StatementRecorder,
     ) -> None:
-        statements: tuple[str, ...] = self.render_create_table_as(destination=destination, sql=sql)
+        table_type: str = str((config or {}).get("table_type", "transient"))
+        statements: tuple[str, ...] = self._render_create_table_as_type(
+            destination=destination, sql=sql, table_type=table_type
+        )
         statement_recorder.record_many(statements)
         stmt: str
         for stmt in statements:
@@ -1129,6 +1131,7 @@ class SnowflakeAdapter(MicrobatchMixin, BaseAdapter):
     def render_create_initial_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         snapshot_strategy: str | None,
@@ -1147,8 +1150,9 @@ class SnowflakeAdapter(MicrobatchMixin, BaseAdapter):
             source_alias=None,
             current_timestamp=current_timestamp,
         )
-        return self.render_create_table_as(
+        return self._render_create_table_as_type(
             destination=destination,
+            table_type=table_type,
             sql=(
                 f"SELECT *, {valid_from_expr} AS {valid_from_column}, "
                 f"CAST(NULL AS TIMESTAMP) AS {valid_to_column} FROM {origin}"
@@ -1225,6 +1229,7 @@ class SnowflakeAdapter(MicrobatchMixin, BaseAdapter):
     def render_create_initial_historical_timestamp_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],
@@ -1245,11 +1250,14 @@ class SnowflakeAdapter(MicrobatchMixin, BaseAdapter):
             output_columns=output_columns,
             invalidate_hard_deletes=invalidate_hard_deletes,
         )
-        return self.render_create_table_as(destination=destination, sql=historical_sql)
+        return self._render_create_table_as_type(
+            destination=destination, sql=historical_sql, table_type=table_type
+        )
 
     def render_create_initial_historical_timestamp_changes_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],
@@ -1266,7 +1274,9 @@ class SnowflakeAdapter(MicrobatchMixin, BaseAdapter):
             valid_to_column=valid_to_column,
             output_columns=output_columns,
         )
-        return self.render_create_table_as(destination=destination, sql=historical_sql)
+        return self._render_create_table_as_type(
+            destination=destination, sql=historical_sql, table_type=table_type
+        )
 
     def render_apply_historical_timestamp_snapshot_changes(
         self,
@@ -1450,6 +1460,7 @@ class SnowflakeAdapter(MicrobatchMixin, BaseAdapter):
     def render_create_initial_historical_check_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],
@@ -1470,7 +1481,9 @@ class SnowflakeAdapter(MicrobatchMixin, BaseAdapter):
             output_columns=output_columns,
             invalidate_hard_deletes=invalidate_hard_deletes,
         )
-        return self.render_create_table_as(destination=destination, sql=historical_sql)
+        return self._render_create_table_as_type(
+            destination=destination, sql=historical_sql, table_type=table_type
+        )
 
     def render_apply_historical_check_snapshot_changes(
         self,

{sqlbuild-0.68.0 → sqlbuild-0.70.0}/src/sqlbuild/adapters/sqlserver/classes/sqlserver_adapter.py

@@ -2034,6 +2034,7 @@ class SqlServerAdapter(MicrobatchMixin, BaseAdapter):
     def render_create_initial_historical_check_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],
@@ -2094,6 +2095,7 @@ class SqlServerAdapter(MicrobatchMixin, BaseAdapter):
     def render_create_initial_historical_timestamp_changes_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],
@@ -2116,6 +2118,7 @@ class SqlServerAdapter(MicrobatchMixin, BaseAdapter):
     def render_create_initial_historical_timestamp_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         unique_key: tuple[str, ...],
@@ -2148,6 +2151,7 @@ class SqlServerAdapter(MicrobatchMixin, BaseAdapter):
     def render_create_initial_snapshot_destination(
         self,
         *,
+        table_type: str,
         destination: str,
         origin: str,
         snapshot_strategy: str | None,

sqlbuild-0.70.0/src/sqlbuild/cli/commands/_helpers/build_planning/table_type.py

@@ -0,0 +1,61 @@
+"""Table-type downgrade safety enforcement for build commands."""
+
+from __future__ import annotations
+
+from typing import TextIO
+
+from sqlbuild.cli.commands.exceptions import CliUserError
+from sqlbuild.compiler.planner.models import PlanOutput, TableTypePlanEntry
+from sqlbuild.spec.contracts.types import TableTypeDowngradePolicy
+
+
+def enforce_table_type_downgrade_policy(
+    *,
+    plan: PlanOutput,
+    allow_table_type_downgrade: bool,
+    input_stream: TextIO,
+    output_stream: TextIO,
+) -> None:
+    """Fail or confirm before executing permanent-to-transient conversions."""
+
+    entries: tuple[TableTypePlanEntry, ...] = tuple(
+        entry for entry in plan.table_type_entries if entry.downgrade
+    )
+    denied: tuple[TableTypePlanEntry, ...] = tuple(
+        entry for entry in entries if entry.downgrade_policy == TableTypeDowngradePolicy.DENY
+    )
+    if denied:
+        raise CliUserError(
+            f"table-type downgrade is denied for {_names(denied)} by table_type_downgrade policy"
+        )
+    confirmation: tuple[TableTypePlanEntry, ...] = tuple(
+        entry
+        for entry in entries
+        if entry.downgrade_policy == TableTypeDowngradePolicy.REQUIRE_CONFIRMATION
+    )
+    if not confirmation or allow_table_type_downgrade:
+        return
+    if not input_stream.isatty():
+        raise CliUserError(
+            "table-type downgrade requires confirmation",
+            help="Pass --allow-table-type-downgrade to confirm in non-interactive runs.",
+        )
+    expected: str = _confirmation_text(confirmation)
+    output_stream.write(
+        f"Downgrading {_names(confirmation)} to transient may discard up to 90 days of "
+        "time-travel history.\n\n"
+    )
+    output_stream.write(f"Type `{expected}` to continue: ")
+    output_stream.flush()
+    if input_stream.readline().strip() != expected:
+        raise CliUserError("table-type downgrade cancelled")
+
+
+def _confirmation_text(entries: tuple[TableTypePlanEntry, ...]) -> str:
+    if len(entries) == 1:
+        return f"downgrade table type for {entries[0].model_name}"
+    return f"downgrade table type for {len(entries)} models"
+
+
+def _names(entries: tuple[TableTypePlanEntry, ...]) -> str:
+    return ", ".join(f"'{entry.model_name}'" for entry in entries)

{sqlbuild-0.68.0 → sqlbuild-0.70.0}/src/sqlbuild/cli/commands/_helpers/build_virtual/virtual_execution.py

@@ -89,6 +89,7 @@ def execute_virtual_build(
         config=VirtualBuildPlanHookConfig(
             full_refresh=request.full_refresh,
             allow_snapshot_full_refresh=request.allow_snapshot_full_refresh,
+            allow_table_type_downgrade=request.allow_table_type_downgrade,
             use_color=request.use_color,
             verbose=request.verbose,
             debug=request.debug,

{sqlbuild-0.68.0 → sqlbuild-0.70.0}/src/sqlbuild/cli/commands/_helpers/entry/dispatch.py

@@ -176,6 +176,7 @@ def dispatch_cli_command(*, args: CliNamespace, handlers: CliEntrypointHandlers)
                 reload_sources=args.reload,
                 include_python=args.include_python,
                 allow_snapshot_full_refresh=args.allow_snapshot_full_refresh,
+                allow_table_type_downgrade=args.allow_table_type_downgrade,
                 allow_snapshot_schema_change=args.allow_snapshot_schema_change,
                 concurrency=args.concurrency,
                 select=select,

{sqlbuild-0.68.0 → sqlbuild-0.70.0}/src/sqlbuild/cli/commands/_helpers/entry/parser_arguments.py

@@ -48,6 +48,7 @@ def add_execution_args(parser: argparse.ArgumentParser) -> None:
     parser.add_argument("--fail-fast", action="store_true", default=False)
     parser.add_argument("--full-refresh", action="store_true", default=False)
     parser.add_argument("--allow-snapshot-full-refresh", action="store_true", default=False)
+    parser.add_argument("--allow-table-type-downgrade", action="store_true", default=False)
     parser.add_argument("--allow-snapshot-schema-change", action="store_true", default=False)
     parser.add_argument("--concurrency", type=int, default=None)
     parser.add_argument("--verbose", "-v", action="store_true", default=False)

{sqlbuild-0.68.0 → sqlbuild-0.70.0}/src/sqlbuild/cli/commands/_helpers/janitor_output/output.py

@@ -50,14 +50,8 @@ def _write_plan_summary(*, plan: JanitorPlan, stream: TextIO, style: CliStyle) -
     _write_count_row(
         stream=stream,
         style=style,
-        label="eligible for archive" if plan.direct_mode else "eligible for deletion",
-        items=plan.archive_candidates if plan.direct_mode else plan.candidates,
-    )
-    _write_count_row(
-        stream=stream,
-        style=style,
-        label="archives deleted",
-        items=plan.archive_delete_candidates,
+        label="reported objects" if plan.direct_mode else "eligible for deletion",
+        items=plan.candidates,
     )
     _write_count_row(
         stream=stream,
@@ -148,13 +142,15 @@ def write_plan(*, plan: JanitorPlan, stream: TextIO, use_color: bool = False) ->
                 f"{style.muted('contains active source ' + sources)}\n"
             )
 
-    if plan.candidates and not plan.direct_mode:
-        stream.write(f"\n{style.success('Eligible objects')}\n")
+    if plan.candidates:
+        heading: str = "Report-only objects" if plan.direct_mode else "Eligible objects"
+        stream.write(f"\n{style.success(heading)}\n")
         candidate: JanitorDeleteCandidate
         for candidate in plan.candidates:
-            stream.write(f"  {style.object_name(candidate.key.display_name())}\n")
-
-    _write_direct_archive_actions(plan=plan, stream=stream, style=style)
+            reason: str = "  direct mode does not delete relations" if plan.direct_mode else ""
+            stream.write(
+                f"  {style.object_name(candidate.key.display_name())}{style.muted(reason)}\n"
+            )
 
     if plan.checkpoint_candidates:
         stream.write(f"\n{style.success('Eligible checkpoints')}\n")
@@ -229,22 +225,6 @@ def write_plan(*, plan: JanitorPlan, stream: TextIO, use_color: bool = False) ->
     stream.write("\n")
 
 
-def _write_direct_archive_actions(*, plan: JanitorPlan, stream: TextIO, style: CliStyle) -> None:
-    if plan.archive_candidates:
-        stream.write(f"\n{style.success('Eligible archives')}\n")
-        for archive_candidate in plan.archive_candidates:
-            stream.write(
-                f"  {style.object_name(archive_candidate.origin_key.display_name())}  "
-                f"{style.muted('-> ' + archive_candidate.archive_key.display_name())}\n"
-            )
-    if plan.archive_delete_candidates:
-        stream.write(f"\n{style.success('Permanent archive deletion')}\n")
-        for archive_delete_candidate in plan.archive_delete_candidates:
-            stream.write(
-                f"  {style.object_name(archive_delete_candidate.archive_key.display_name())}\n"
-            )
-
-
 def confirmation_text(plan: JanitorPlan) -> str:
     """Build the exact confirmation phrase for a janitor plan."""
 
@@ -256,11 +236,10 @@ def confirmation_text(plan: JanitorPlan) -> str:
         + len(plan.expired_lock_candidates)
         + len(plan.direct_state_prune_candidates)
         + len(plan.virtual_state_prune_candidates)
-        + len(plan.archive_candidates)
-        + len(plan.archive_delete_candidates)
     )
     if state_candidate_count == 0:
-        return f"delete {len(plan.candidates)} objects from {environment_label(plan)}"
+        deletion_count: int = 0 if plan.direct_mode else len(plan.candidates)
+        return f"delete {deletion_count} objects from {environment_label(plan)}"
     physical_deletion_count: int = 0 if plan.direct_mode else len(plan.candidates)
     deletion_count: int = physical_deletion_count + state_candidate_count
     return f"delete {deletion_count} items from {environment_label(plan)}"

{sqlbuild-0.68.0 → sqlbuild-0.70.0}/src/sqlbuild/cli/commands/_helpers/janitor_output/outputs.py

@@ -37,9 +37,7 @@ def janitor_plan_has_work(planning_result: JanitorPlanningResult) -> bool:
 
     plan: JanitorPlan = planning_result.plan
     return bool(
-        plan.candidates
-        or plan.archive_candidates
-        or plan.archive_delete_candidates
+        (plan.candidates and not plan.direct_mode)
         or plan.checkpoint_candidates
         or plan.detached_virtual_environment_candidates
         or plan.expired_virtual_environment_candidates
@@ -62,8 +60,6 @@ def confirm_janitor_plan(*, planning_result: JanitorPlanningResult) -> bool:
         + len(plan.state_backup_candidates)
         + len(plan.expired_lock_candidates)
         + len(plan.virtual_state_prune_candidates)
-        + len(plan.archive_candidates)
-        + len(plan.archive_delete_candidates)
     )
     prune_count: int = len(plan.direct_state_prune_candidates) + len(
         plan.virtual_state_prune_candidates
@@ -116,11 +112,6 @@ def _deleted_message(*, result: JanitorExecutionResult) -> str:
         + len(result.deleted_state_backups)
         + len(result.deleted_expired_locks)
     )
-    if result.archived or result.deleted_archives:
-        return (
-            f"Archived {len(result.archived)} objects and permanently deleted "
-            f"{len(result.deleted_archives)} archives."
-        )
     pruned_state_count: int = len(result.pruned_direct_state) + len(result.pruned_virtual_state)
     non_checkpoint_state_count: int = deleted_state_count - len(result.deleted_checkpoints)
     if non_checkpoint_state_count or pruned_state_count:

{sqlbuild-0.68.0 → sqlbuild-0.70.0}/src/sqlbuild/cli/commands/_helpers/janitor_runtime/invocation.py

@@ -50,13 +50,7 @@ def resolve_janitor_settings(
     )
     if direct_state_history_versions < 0:
         raise CliUserError("janitor --direct-state-history-versions must be >= 0", code="C502")
-    archive_retention_days: int = (
-        invocation.discovered_inputs.project_config.janitor.archive_retention_days
-    )
-    if archive_retention_days < 0:
-        raise CliUserError("janitor archive_retention_days must be >= 0", code="C503")
     return JanitorSettings(
         retention_days=retention_days,
         direct_state_history_versions=direct_state_history_versions,
-        archive_retention_days=archive_retention_days,
     )

{sqlbuild-0.68.0 → sqlbuild-0.70.0}/src/sqlbuild/cli/commands/_helpers/janitor_runtime/planning.py

@@ -181,7 +181,6 @@ def build_janitor_execution_plan(
         ),
         direct_settings=JanitorDirectModeSettings(
             enabled=not invocation.discovered_inputs.project_config.settings.virtual_environments,
-            archive_retention_days=settings.archive_retention_days,
             state_history_versions=settings.direct_state_history_versions,
         ),
     )

{sqlbuild-0.68.0 → sqlbuild-0.70.0}/src/sqlbuild/cli/commands/classes/cli_namespace.py

@@ -57,6 +57,7 @@ _DEFAULT_VALUES: dict[str, object] = {
     "run_tests": True,
     "run_audits": True,
     "allow_snapshot_full_refresh": False,
+    "allow_table_type_downgrade": False,
     "allow_snapshot_schema_change": False,
     "allow_partial_promotion": False,
     "allow_partial_rollback": False,
@@ -200,6 +201,7 @@ class CliNamespace:
     run_tests: bool
     run_audits: bool
     allow_snapshot_full_refresh: bool
+    allow_table_type_downgrade: bool
     allow_snapshot_schema_change: bool
     allow_partial_promotion: bool
     allow_partial_rollback: bool