Skip to content

Commit

Permalink
revert to just reformatting changes
Browse files Browse the repository at this point in the history
  • Loading branch information
mikealfare committed Aug 18, 2023
1 parent 4483f6c commit 03a15e7
Show file tree
Hide file tree
Showing 18 changed files with 17 additions and 221 deletions.
7 changes: 1 addition & 6 deletions core/dbt/adapters/base/relation.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from collections.abc import Hashable
from dataclasses import dataclass, field
from typing import Optional, TypeVar, Any, Type, Dict, Iterator, Tuple, Set, List
from typing import Optional, TypeVar, Any, Type, Dict, Iterator, Tuple, Set

from dbt.contracts.graph.nodes import SourceDefinition, ManifestNode, ResultNode, ParsedNode
from dbt.contracts.relation import (
Expand Down Expand Up @@ -35,7 +35,6 @@ class BaseRelation(FakeAPIObject, Hashable):
include_policy: Policy = field(default_factory=lambda: Policy())
quote_policy: Policy = field(default_factory=lambda: Policy())
dbt_created: bool = False
relations_that_can_be_renamed: List[RelationType] = field(default_factory=list)

def _is_exactish_match(self, field: ComponentName, value: str) -> bool:
if self.dbt_created and self.quote_policy.get_part(field) is False:
Expand Down Expand Up @@ -286,10 +285,6 @@ def create(
)
return cls.from_dict(kwargs)

@property
def can_be_renamed(self):
return self.type in self.relations_that_can_be_renamed

def __repr__(self) -> str:
return "<{} {}>".format(self.__class__.__name__, self.render())

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
{% if existing_relation is none %}
{% set build_sql = get_create_materialized_view_as_sql(target_relation, sql) %}
{% elif full_refresh_mode or not existing_relation.is_materialized_view %}
{% set build_sql = get_replace_sql(existing_relation, target_relation, sql) %}
{% set build_sql = get_replace_materialized_view_as_sql(target_relation, sql, existing_relation, backup_relation, intermediate_relation) %}
{% else %}

-- get config options
Expand Down
17 changes: 0 additions & 17 deletions core/dbt/include/global_project/macros/relations/backup.sql

This file was deleted.

23 changes: 0 additions & 23 deletions core/dbt/include/global_project/macros/relations/create.sql

This file was deleted.

14 changes: 0 additions & 14 deletions core/dbt/include/global_project/macros/relations/deploy_stage.sql

This file was deleted.

25 changes: 0 additions & 25 deletions core/dbt/include/global_project/macros/relations/drop.sql
Original file line number Diff line number Diff line change
@@ -1,28 +1,3 @@
{%- macro get_drop_sql(relation) -%}
{{- log('Applying DROP to: ' ~ relation) -}}
{{- adapter.dispatch('get_drop_sql', 'dbt')(relation) -}}
{%- endmacro -%}


{%- macro default__get_drop_sql(relation) -%}

{%- if relation.is_view -%}
{{ drop_view(relation) }}

{%- elif relation.is_table -%}
{{ drop_table(relation) }}

{%- elif relation.is_materialized_view -%}
{{ drop_materialized_view(relation) }}

{%- else -%}
{{- exceptions.raise_compiler_error("`get_drop_sql` has not been implemented for: " ~ relation.type ) -}}

{%- endif -%}

{%- endmacro -%}


{% macro drop_relation(relation) -%}
{{ return(adapter.dispatch('drop_relation', 'dbt')(relation)) }}
{% endmacro %}
Expand Down
14 changes: 0 additions & 14 deletions core/dbt/include/global_project/macros/relations/drop_backup.sql

This file was deleted.

25 changes: 0 additions & 25 deletions core/dbt/include/global_project/macros/relations/rename.sql
Original file line number Diff line number Diff line change
@@ -1,28 +1,3 @@
{%- macro get_rename_sql(relation, new_name) -%}
{{- log('Applying RENAME to: ' ~ relation) -}}
{{- adapter.dispatch('get_rename_sql', 'dbt')(relation, new_name) -}}
{%- endmacro -%}


{%- macro default__get_rename_sql(relation, new_name) -%}

{%- if relation.is_view -%}
{{ get_rename_view_sql(relation, new_name) }}

{%- elif relation.is_table -%}
{{ get_rename_table_sql(relation, new_name) }}

{%- elif relation.is_materialized_view -%}
{{ get_rename_materialized_view_sql(relation, new_name) }}

{%- else -%}
{{- exceptions.raise_compiler_error("`get_rename_sql` has not been implemented for: " ~ relation.type ) -}}

{%- endif -%}

{%- endmacro -%}


{% macro rename_relation(from_relation, to_relation) -%}
{{ return(adapter.dispatch('rename_relation', 'dbt')(from_relation, to_relation)) }}
{% endmacro %}
Expand Down
35 changes: 0 additions & 35 deletions core/dbt/include/global_project/macros/relations/replace.sql

This file was deleted.

17 changes: 0 additions & 17 deletions core/dbt/include/global_project/macros/relations/stage.sql

This file was deleted.

7 changes: 0 additions & 7 deletions plugins/postgres/dbt/adapters/postgres/relation.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
RelationResults,
)
from dbt.context.providers import RuntimeConfigObject
from dbt.contracts.relation import RelationType
from dbt.exceptions import DbtRuntimeError

from dbt.adapters.postgres.relation_configs import (
Expand All @@ -21,12 +20,6 @@

@dataclass(frozen=True, eq=False, repr=False)
class PostgresRelation(BaseRelation):
relations_that_can_be_renamed = [
RelationType.View,
RelationType.Table,
RelationType.MaterializedView,
]

def __post_init__(self):
# Check for length of Postgres table/view names.
# Check self.type to exclude test relation identifiers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
-- apply a full refresh immediately if needed
{% if configuration_changes.requires_full_refresh %}

{{ get_replace_sql(existing_relation, relation, sql) }}
{{ get_replace_materialized_view_as_sql(relation, sql, existing_relation, backup_relation, intermediate_relation) }}

-- otherwise apply individual changes as needed
{% else %}
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,20 @@ def query_row_count(project, relation: BaseRelation) -> int:
def query_relation_type(project, relation: BaseRelation) -> Optional[str]:
return query_relation_type(project, relation)

@pytest.mark.skip("")
def test_materialized_view_replaces_table(self, project, my_table):
super().test_materialized_view_replaces_table(project, my_table)

@pytest.mark.skip("")
def test_materialized_view_replaces_view(self, project, my_view):
super().test_materialized_view_replaces_view(project, my_view)

def test_table_replaces_materialized_view(self, project, my_materialized_view):
super().test_table_replaces_materialized_view(project, my_materialized_view)

def test_view_replaces_materialized_view(self, project, my_materialized_view):
super().test_view_replaces_materialized_view(project, my_materialized_view)


class PostgresMaterializedViewChanges(MaterializedViewChanges):
@pytest.fixture(scope="class", autouse=True)
Expand Down

0 comments on commit 03a15e7

Please sign in to comment.