sqlbuild 0.68.0__tar.gz → 0.69.0__tar.gz

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

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlbuild
-Version: 0.68.0
+Version: 0.69.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.69.0}/crates/sqlbuild-kata-native/Cargo.toml

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

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

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

{sqlbuild-0.68.0 → sqlbuild-0.69.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.69.0}/src/sqlbuild/adapters/snowflake/classes/snowflake_adapter.py

@@ -162,16 +162,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:

{sqlbuild-0.68.0 → sqlbuild-0.69.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.69.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.69.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.69.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.69.0}/src/sqlbuild/cli/commands/models.py

@@ -818,7 +818,6 @@ class JanitorSettings:
 
     retention_days: int
     direct_state_history_versions: int
-    archive_retention_days: int = 7
 
 
 @dataclass(frozen=True)

{sqlbuild-0.68.0 → sqlbuild-0.69.0}/src/sqlbuild/compiler/compile/_helpers/attachment/core.py

@@ -239,20 +239,17 @@ def _build_model_inputs(
             model_file=model_file,
             path_defaults=discovered_inputs.project_config.path_defaults,
         )
-        effective_config: CompileModelConfig = replace(
-            build_model_config(
-                defaults=discovered_inputs.project_config.defaults,
-                path_defaults=discovered_inputs.project_config.path_defaults,
-                matched_path_default=matched_path_default,
-                model_header_values=model_file.header_values,
-                effective_vars=effective_vars,
-                target_config=target_config,
-                model_name=model_file.file_path.stem,
-                effective_target_name=effective_target_name,
-                run_id=run_id,
-                materialization_defaults=discovered_inputs.project_config.materialization_defaults,
-            ),
-            archive_retention_days=discovered_inputs.project_config.janitor.archive_retention_days,
+        effective_config: CompileModelConfig = build_model_config(
+            defaults=discovered_inputs.project_config.defaults,
+            path_defaults=discovered_inputs.project_config.path_defaults,
+            matched_path_default=matched_path_default,
+            model_header_values=model_file.header_values,
+            effective_vars=effective_vars,
+            target_config=target_config,
+            model_name=model_file.file_path.stem,
+            effective_target_name=effective_target_name,
+            run_id=run_id,
+            materialization_defaults=discovered_inputs.project_config.materialization_defaults,
         )
         model_schema: ModelSchemaDeclaration | None = _resolve_model_schema(
             values=effective_config.values,
@@ -417,7 +414,6 @@ def _build_model_inputs(
             logical_schema=effective_config.logical_schema,
             logical_database=effective_config.logical_database,
             time_travel_retention=effective_config.time_travel_retention,
-            archive_retention_days=effective_config.archive_retention_days,
         )
         hook_name: str
         for hook_name in ("pre_hooks", "post_hooks"):
@@ -1435,7 +1431,6 @@ def strip_model_header_metadata_from_config(config: CompileModelConfig) -> Compi
         logical_schema=config.logical_schema,
         logical_database=config.logical_database,
         time_travel_retention=config.time_travel_retention,
-        archive_retention_days=config.archive_retention_days,
     )
 
 
@@ -1600,7 +1595,6 @@ def _merge_schema_tags(
         logical_schema=config.logical_schema,
         logical_database=config.logical_database,
         time_travel_retention=config.time_travel_retention,
-        archive_retention_days=config.archive_retention_days,
     )
 
 

{sqlbuild-0.68.0 → sqlbuild-0.69.0}/src/sqlbuild/compiler/compile/_helpers/config/model_validation.py

@@ -79,8 +79,6 @@ _CUSTOM_MATERIALIZATION_DISALLOWED_KEYS: tuple[str, ...] = (
     "cursor_inputs",
     "lookback",
 )
-_PERMANENT_TABLE_TYPE: str = "permanent"
-_TABLE_TYPE_CONFIG_KEY: str = "table_type"
 
 
 def validate_incremental_config(
@@ -369,21 +367,6 @@ def validate_contract_config(
         )
 
 
-def validate_table_type_config(*, config: CompileModelConfig, model_name: str) -> None:
-    """Validate the optional permanent-table declaration."""
-
-    if _TABLE_TYPE_CONFIG_KEY not in config.values:
-        return
-    table_type: object = config.values[_TABLE_TYPE_CONFIG_KEY]
-    if not isinstance(table_type, str) or table_type != _PERMANENT_TABLE_TYPE:
-        raise CompileInputError(f"model '{model_name}': table_type must be 'permanent'")
-    materialized: str | None = _str(config=config, key="materialized")
-    if materialized != MaterializationType.TABLE:
-        raise CompileInputError(
-            f"model '{model_name}': table_type permanent is only valid for materialized table"
-        )
-
-
 def validate_non_incremental_config(
     *,
     config: CompileModelConfig,
@@ -391,7 +374,6 @@ def validate_non_incremental_config(
 ) -> None:
     """Reject incremental-only config keys on non-incremental models."""
 
-    validate_table_type_config(config=config, model_name=model_name)
     materialized: str | None = _str(config=config, key="materialized")
     if materialized == MaterializationType.INCREMENTAL:
         return

{sqlbuild-0.68.0 → sqlbuild-0.69.0}/src/sqlbuild/compiler/compile/models.py

@@ -149,7 +149,6 @@ class CompileModelConfig:
     time_travel_retention: ResolvedTimeTravelRetention = field(
         default_factory=ResolvedTimeTravelRetention
     )
-    archive_retention_days: int = 7
 
 
 @dataclass(frozen=True)

{sqlbuild-0.68.0 → sqlbuild-0.69.0}/src/sqlbuild/compiler/discovery/_helpers/yml/project.py

@@ -878,9 +878,6 @@ def _load_janitor(*, payload: object, file_path: Path) -> JanitorConfig:
     )
     enabled: bool = _optional_bool(mapping=mapping, key="enabled", default=False)
     retention_days: int = _optional_int(mapping=mapping, key="retention_days", default=30)
-    archive_retention_days: int = _optional_int(
-        mapping=mapping, key="archive_retention_days", default=7
-    )
     max_checkpoints: int = _optional_int(mapping=mapping, key="max_checkpoints", default=20)
     direct_state_history_versions: int = _optional_int(
         mapping=mapping,
@@ -901,8 +898,6 @@ def _load_janitor(*, payload: object, file_path: Path) -> JanitorConfig:
     )
     if retention_days < 0:
         raise ProjectConfigError(f"{file_path} janitor.retention_days must be >= 0")
-    if archive_retention_days < 0:
-        raise ProjectConfigError(f"{file_path} janitor.archive_retention_days must be >= 0")
     if max_checkpoints < 1:
         raise ProjectConfigError(f"{file_path} janitor.max_checkpoints must be >= 1")
     if direct_state_history_versions < 0:
@@ -910,7 +905,6 @@ def _load_janitor(*, payload: object, file_path: Path) -> JanitorConfig:
     return JanitorConfig(
         enabled=enabled,
         retention_days=retention_days,
-        archive_retention_days=archive_retention_days,
         max_checkpoints=max_checkpoints,
         direct_state_history_versions=direct_state_history_versions,
         delete_tracked_only=delete_tracked_only,

{sqlbuild-0.68.0 → sqlbuild-0.69.0}/src/sqlbuild/compiler/planner/_helpers/output/plan_entry.py

@@ -88,7 +88,6 @@ from sqlbuild.compiler.references.types import ExternalSqlReferenceResolver, Sql
 from sqlbuild.spec.contracts.models import LocalConfig, ProjectConfig, SchemaColumn, SourceEntry
 
 _MODELS_DIR_PREFIX: str = "models/"
-_PERMANENT_TABLE_TYPE: str = "permanent"
 _IDEMPOTENT_MICROBATCH_STRATEGIES: frozenset[IncrementalStrategy] = frozenset(
     (IncrementalStrategy.DELETE_INSERT, IncrementalStrategy.MERGE)
 )
@@ -549,8 +548,6 @@ def plan_model_from_change(
         fingerprint_query_sql=model.query_sql,
         resolved_sql=resolved_sql,
         logical_ddl=logical_ddl,
-        permanent_table=is_permanent_table(model),
-        archive_retention_days=model.config.archive_retention_days,
         incremental_strategy=incremental_strategy,
         incremental_mode=incremental_mode,
         cursor_column=cursor_column,
@@ -1216,12 +1213,6 @@ def build_model_materializations(
     return {entry.name: entry.materialization_type for entry in model_entries}
 
 
-def is_permanent_table(model: CompiledModel) -> bool:
-    """Return whether a model explicitly declares a permanent table."""
-
-    return model.config.values.get("table_type") == _PERMANENT_TABLE_TYPE
-
-
 def _get_config_str(*, model: CompiledModel, key: str) -> str | None:
     """Extract a string config value from model config."""
 

{sqlbuild-0.68.0 → sqlbuild-0.69.0}/src/sqlbuild/compiler/planner/_helpers/planning/retention.py

@@ -24,7 +24,6 @@ from sqlbuild.spec.contracts.main.resolve_target_config import resolve_target_co
 from sqlbuild.spec.contracts.models import ResolvedTimeTravelRetention, TargetConfig
 
 _DECREASE_WARNING: str = "Retention decreases are irreversible once warehouse history expires."
-_PERMANENT_TABLE_TYPE: str = "permanent"
 
 
 def plan_retention(
@@ -74,17 +73,13 @@ def _plan_relation_retention(
         name=model.destination.name,
         desired_days=desired_days,
     )
-    permanent_table: bool = model.config.values.get("table_type") == _PERMANENT_TABLE_TYPE
     if model.name not in warehouse.snapshot.existing_relations:
-        if (
-            runtime.adapter.adapter_name == BuiltinAdapter.SNOWFLAKE
-            and desired_days > 1
-            and not permanent_table
-        ):
+        if runtime.adapter.adapter_name == BuiltinAdapter.SNOWFLAKE and desired_days > 1:
             raise PlannerInputError(
                 f"model '{model.name}': new Snowflake tables are transient and cannot retain "
-                f"time travel for {desired_days} days; configure an explicit permanent-table "
-                "migration before applying this policy"
+                f"time travel for {desired_days} days; retention above one day requires a "
+                "permanent table; convert it with a one-time manual migration. Declarative "
+                "table-type management is planned"
             )
         changes: tuple[RenderedRetentionChange, ...] = runtime.adapter.render_retention_changes(
             request=request
@@ -104,20 +99,10 @@ def _plan_relation_retention(
         connection=runtime.connection, request=request
     )
     if state.is_transient and desired_days > 1:
-        if permanent_table:
-            return (
-                _entry(
-                    request=request,
-                    model_names=(model.name,),
-                    state=state,
-                    source=source,
-                    direction=RetentionDirection.APPLY_AFTER_CREATE,
-                    phase=RetentionPlanPhase.AFTER_CREATE,
-                ),
-            )
         raise PlannerInputError(
             f"model '{model.name}': Snowflake transient tables cannot retain time travel for "
-            f"{desired_days} days; use 0d or 1d, or make the table permanent"
+            f"{desired_days} days; retention above one day requires a permanent table; convert "
+            "it with a one-time manual migration. Declarative table-type management is planned"
         )
     direction: RetentionDirection = _state_direction(state=state, desired_days=desired_days)
     if direction == RetentionDirection.MATCH:
@@ -217,7 +202,7 @@ def _plan_bigquery_retention(
                     state=state,
                     source=sources,
                     direction=RetentionDirection.APPLY_AFTER_CREATE,
-                    phase=RetentionPlanPhase.PRE,
+                    phase=RetentionPlanPhase.AFTER_CREATE,
                     statements=_flatten_changes(changes=changes),
                 )
             )

{sqlbuild-0.68.0 → sqlbuild-0.69.0}/src/sqlbuild/compiler/planner/_helpers/reuse/clone.py

@@ -36,7 +36,6 @@ from sqlbuild.compiler.planner._helpers.identity.functions import (
 )
 from sqlbuild.compiler.planner._helpers.output.plan_entry import (
     gather_source_columns,
-    is_permanent_table,
 )
 from sqlbuild.compiler.planner._helpers.output.strategy import get_materialization_type
 from sqlbuild.compiler.planner._helpers.resolve.refs import (
@@ -168,8 +167,6 @@ def build_clone_model_entries(
             fingerprint_query_sql="",
             resolved_sql=resolved_sql,
             logical_ddl="",
-            permanent_table=is_permanent_table(model),
-            archive_retention_days=model.config.archive_retention_days,
         )
     return tuple(entries_by_key[key] for key in plan.execution_order if key in entries_by_key)
 
@@ -312,8 +309,6 @@ def build_origin_model_entries(
                 fingerprint_query_sql="",
                 resolved_sql="",
                 logical_ddl="",
-                permanent_table=is_permanent_table(model),
-                archive_retention_days=model.config.archive_retention_days,
             )
         )
     return tuple(entries)

{sqlbuild-0.68.0 → sqlbuild-0.69.0}/src/sqlbuild/compiler/planner/main/execution/display_plan.py

@@ -10,7 +10,6 @@ from sqlbuild.compiler.planner._helpers.graph.core import (
     build_downstream_deps,
     build_execution_upstream_deps,
 )
-from sqlbuild.compiler.planner._helpers.output.plan_entry import is_permanent_table
 from sqlbuild.compiler.planner._helpers.output.strategy import get_materialization_type
 from sqlbuild.compiler.planner._helpers.planning.full_refresh import resolve_model_full_refresh
 from sqlbuild.compiler.planner.models import BackfillResult, ModelPlanEntry, PlanOutput
@@ -54,8 +53,6 @@ def build_display_only_sqlbuild_plan(
                 fingerprint_query_sql=model.query_sql,
                 resolved_sql=model.query_sql,
                 logical_ddl="",
-                permanent_table=is_permanent_table(model),
-                archive_retention_days=model.config.archive_retention_days,
                 incremental_strategy=_as_optional_string(
                     model.config.values.get("incremental_strategy")
                 ),

{sqlbuild-0.68.0 → sqlbuild-0.69.0}/src/sqlbuild/compiler/planner/main/identity/_version_identity_config.py

@@ -28,7 +28,6 @@ def build_version_identity_config(config_values: dict[str, object]) -> dict[str,
         "snapshot_full_refresh",
         "snapshot_schema_change",
         "snapshot_strategy",
-        "table_type",
         "unique_key",
         "updated_at",
         "valid_from_column",

{sqlbuild-0.68.0 → sqlbuild-0.69.0}/src/sqlbuild/compiler/planner/models.py

@@ -634,8 +634,6 @@ class ModelPlanEntry:
     fingerprint_query_sql: str
     resolved_sql: str
     logical_ddl: str
-    permanent_table: bool = False
-    archive_retention_days: int = 7
     incremental_strategy: str | None = None
     incremental_mode: str | None = None
     cursor_column: str | None = None

{sqlbuild-0.68.0 → sqlbuild-0.69.0}/src/sqlbuild/executor/janitor/constants.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from sqlbuild.archives.constants import ARCHIVE_EVENT_TABLE_NAME, ARCHIVE_NAME_PREFIX
 from sqlbuild.compiler.fingerprints.constants import FINGERPRINT_TABLE_NAME
 from sqlbuild.compiler.source_freshness.constants import SOURCE_FRESHNESS_TABLE_NAME
 from sqlbuild.microbatches.constants import MICROBATCH_TABLE_NAME
@@ -11,6 +10,4 @@ BUILT_IN_EXCLUDE_PATTERNS: tuple[str, ...] = (
     FINGERPRINT_TABLE_NAME,
     MICROBATCH_TABLE_NAME,
     SOURCE_FRESHNESS_TABLE_NAME,
-    ARCHIVE_EVENT_TABLE_NAME,
-    f"{ARCHIVE_NAME_PREFIX}*",
 )

{sqlbuild-0.68.0 → sqlbuild-0.69.0}/src/sqlbuild/executor/janitor/main/execute.py

@@ -7,14 +7,8 @@ from typing import Any
 
 from sqlbuild.adapter.contract.classes.base_adapter import BaseAdapter
 from sqlbuild.adapter.contract.classes.statement_recorder import StatementRecorder
-from sqlbuild.executor.janitor._helpers.archive_execution import (
-    apply_archive_actions,
-    apply_archive_deletions,
-)
 from sqlbuild.executor.janitor._helpers.deletion import apply_janitor_deletions
 from sqlbuild.executor.janitor.models import (
-    JanitorArchiveCandidate,
-    JanitorArchiveDeleteCandidate,
     JanitorCheckpointCandidate,
     JanitorDeleteCandidate,
     JanitorDetachedVirtualEnvironmentCandidate,
@@ -47,18 +41,6 @@ def execute_janitor_plan(
     """Delete all candidates in a janitor plan."""
 
     recorder: StatementRecorder = StatementRecorder()
-    archived: tuple[JanitorArchiveCandidate, ...] = apply_archive_actions(
-        candidates=plan.archive_candidates,
-        adapter=adapter,
-        connection=connection,
-        recorder=recorder,
-    )
-    deleted_archives: tuple[JanitorArchiveDeleteCandidate, ...] = apply_archive_deletions(
-        candidates=plan.archive_delete_candidates,
-        adapter=adapter,
-        connection=connection,
-        recorder=recorder,
-    )
     candidate: JanitorDeleteCandidate
     for candidate in () if plan.direct_mode else plan.candidates:
         adapter.drop(
@@ -99,8 +81,6 @@ def execute_janitor_plan(
     )
     return JanitorExecutionResult(
         deleted=() if plan.direct_mode else plan.candidates,
-        archived=archived,
-        deleted_archives=deleted_archives,
         deleted_checkpoints=deleted_checkpoints,
         deleted_detached_virtual_environments=deleted_detached_virtual_environments,
         deleted_expired_virtual_environments=deleted_expired_virtual_environments,

{sqlbuild-0.68.0 → sqlbuild-0.69.0}/src/sqlbuild/executor/janitor/main/plan.py

@@ -7,7 +7,6 @@ from typing import Any
 
 from sqlbuild.adapter.contract.classes.base_adapter import BaseAdapter
 from sqlbuild.compiler.compile.models import CompiledProject
-from sqlbuild.executor.janitor._helpers.archives import plan_direct_archive_actions
 from sqlbuild.executor.janitor._helpers.classification import (
     collect_direct_state_prune_candidates,
     gather_janitor_warehouse_facts,
@@ -15,14 +14,11 @@ from sqlbuild.executor.janitor._helpers.classification import (
 from sqlbuild.executor.janitor._helpers.plan import collect_target_schemas
 from sqlbuild.executor.janitor._helpers.schema_planning import classify_target_schemas
 from sqlbuild.executor.janitor.models import (
-    JanitorArchiveCandidate,
-    JanitorArchiveDeleteCandidate,
     JanitorDirectModeSettings,
     JanitorDirectStatePruneCandidate,
     JanitorPlan,
     JanitorRelationScope,
     JanitorSchemaClassification,
-    JanitorSkippedRelation,
     JanitorStateCandidates,
     JanitorWarehouseFacts,
 )
@@ -57,7 +53,6 @@ def build_janitor_plan(
         return JanitorPlan(
             target_name=project.effective_target_name,
             retention_days=retention_days,
-            archive_retention_days=direct.archive_retention_days,
             direct_mode=direct.enabled,
             checkpoint_candidates=state.checkpoint_candidates,
             detached_virtual_environment_candidates=(state.detached_virtual_environment_candidates),
@@ -99,30 +94,11 @@ def build_janitor_plan(
         direct_mode=direct.enabled,
     )
 
-    archive_candidates: tuple[JanitorArchiveCandidate, ...] = ()
-    archive_delete_candidates: tuple[JanitorArchiveDeleteCandidate, ...] = ()
-    skipped_relations: list[JanitorSkippedRelation] = list(schemas.skipped_relations)
-    if direct.enabled and not schemas.blocked_schemas:
-        archive_candidates, archive_delete_candidates, archive_skipped = (
-            plan_direct_archive_actions(
-                candidates=schemas.candidates,
-                facts=facts,
-                adapter=adapter,
-                connection=connection,
-                origin_run_id=project.run_id,
-                archive_retention_days=direct.archive_retention_days,
-                now=now,
-            )
-        )
-        skipped_relations.extend(archive_skipped)
     return JanitorPlan(
         target_name=project.effective_target_name,
         retention_days=retention_days,
-        archive_retention_days=direct.archive_retention_days,
         direct_mode=direct.enabled,
         candidates=schemas.candidates,
-        archive_candidates=archive_candidates,
-        archive_delete_candidates=archive_delete_candidates,
         checkpoint_candidates=state.checkpoint_candidates,
         detached_virtual_environment_candidates=state.detached_virtual_environment_candidates,
         expired_virtual_environment_candidates=state.expired_virtual_environment_candidates,
@@ -130,7 +106,7 @@ def build_janitor_plan(
         expired_lock_candidates=state.expired_lock_candidates,
         virtual_state_prune_candidates=state.virtual_state_prune_candidates,
         direct_state_prune_candidates=direct_state_prune_candidates,
-        skipped_relations=tuple(skipped_relations),
+        skipped_relations=schemas.skipped_relations,
         skipped_schemas=schemas.skipped_schemas,
         blocked_schemas=schemas.blocked_schemas,
         scanned_schema_count=len(target_schemas),