Skip to content

Commit

Permalink
Clone doesnt require --defer
Browse files Browse the repository at this point in the history
  • Loading branch information
jtcohen6 committed Nov 8, 2023
1 parent b9a61d0 commit 86415da
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
8 changes: 7 additions & 1 deletion core/dbt/task/clone.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import threading
from typing import AbstractSet, Any, List, Iterable, Set
from typing import AbstractSet, Any, List, Iterable, Set, Optional

from dbt.adapters.base import BaseRelation
from dbt.clients.jinja import MacroGenerator
from dbt.context.providers import generate_runtime_model_context
from dbt.contracts.graph.manifest import WritableManifest
from dbt.contracts.results import RunStatus, RunResult
from dbt.dataclass_schema import dbtClassMixin
from dbt.exceptions import DbtInternalError, CompilationError
Expand Down Expand Up @@ -93,6 +94,11 @@ class CloneTask(GraphRunnableTask):
def raise_on_first_error(self):
return False

def _get_deferred_manifest(self) -> Optional[WritableManifest]:
# Unlike other commands, 'clone' always requires a state manifest
# Load previous state, regardless of whether --defer flag has been set
return self._get_previous_state()

def get_model_schemas(self, adapter, selected_uids: Iterable[str]) -> Set[BaseRelation]:
if self.manifest is None:
raise DbtInternalError("manifest was None in get_model_schemas")
Expand Down
8 changes: 4 additions & 4 deletions core/dbt/task/runnable.py
Original file line number Diff line number Diff line change
Expand Up @@ -617,10 +617,7 @@ def get_result(self, results, elapsed_time, generated_at):
def task_end_messages(self, results):
print_run_end_messages(results)

def _get_deferred_manifest(self) -> Optional[WritableManifest]:
if not self.args.defer:
return None

def _get_previous_state(self) -> Optional[WritableManifest]:
state = self.previous_defer_state or self.previous_state
if not state:
raise DbtRuntimeError(
Expand All @@ -630,3 +627,6 @@ def _get_deferred_manifest(self) -> Optional[WritableManifest]:
if not state.manifest:
raise DbtRuntimeError(f'Could not find manifest in --state path: "{state}"')
return state.manifest

def _get_deferred_manifest(self) -> Optional[WritableManifest]:
return self._get_previous_state() if self.args.defer else None

0 comments on commit 86415da

Please sign in to comment.