Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #1102: Use show ... starts with instead of show ... like in _show_object_metadata #1107

Merged
merged 3 commits into from
Jul 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changes/unreleased/Fixes-20240705-165932.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
kind: Fixes
body: Use show ... starts with instead of show ... like in _show_object_metadata
time: 2024-07-05T16:59:32.087555+01:00
custom:
Author: aranke
Issue: "1102"
2 changes: 1 addition & 1 deletion dbt/adapters/snowflake/impl.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ def _show_object_metadata(self, relation: SnowflakeRelation) -> Optional[dict]:
def get_catalog_for_single_relation(
self, relation: SnowflakeRelation
) -> Optional[CatalogTable]:
object_metadata = self._show_object_metadata(relation)
object_metadata = self._show_object_metadata(relation.as_case_sensitive())

if not object_metadata:
return None
Expand Down
16 changes: 15 additions & 1 deletion dbt/adapters/snowflake/relation.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
from typing import FrozenSet, Optional, Type

from dbt.adapters.base.relation import BaseRelation
from dbt.adapters.contracts.relation import ComponentName, RelationConfig
from dbt.adapters.relation_configs import (
RelationConfigBase,
RelationConfigChangeAction,
RelationResults,
)
from dbt.adapters.contracts.relation import RelationConfig
from dbt.adapters.utils import classproperty
from dbt_common.exceptions import DbtRuntimeError

Expand Down Expand Up @@ -106,3 +106,17 @@ def dynamic_table_config_changeset(
if config_change_collection.has_changes:
return config_change_collection
return None

def as_case_sensitive(self) -> "SnowflakeRelation":
path_part_map = {}

for path in ComponentName:
if self.include_policy.get_part(path):
part = self.path.get_part(path)
if part:
aranke marked this conversation as resolved.
Show resolved Hide resolved
if self.quote_policy.get_part(path):
mikealfare marked this conversation as resolved.
Show resolved Hide resolved
path_part_map[path] = part
else:
path_part_map[path] = part.upper()

return self.replace_path(**path_part_map)
aranke marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion dbt/include/snowflake/macros/adapters.sql
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

{% macro snowflake__show_object_metadata(relation) %}
{%- set sql -%}
show objects like '{{ relation.identifier }}' in {{ relation.include(identifier=False) }} limit 1
show objects in {{ relation.include(identifier=False) }} starts with '{{ relation.identifier }}' limit 1
{%- endset -%}

{%- set result = run_query(sql) -%}
Expand Down
19 changes: 19 additions & 0 deletions tests/unit/test_relation_as_case_sensitive.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
from dbt.adapters.snowflake.relation import SnowflakeRelation
from dbt.adapters.snowflake.relation_configs import SnowflakeQuotePolicy


def test_relation_as_case_sensitive_quoting_true():
relation = SnowflakeRelation.create(
database="My_Db",
schema="My_ScHeMa",
identifier="My_TaBlE",
quote_policy=SnowflakeQuotePolicy(database=False, schema=True, identifier=False),
)

case_sensitive_relation = relation.as_case_sensitive()
case_sensitive_relation.render_limited()

assert case_sensitive_relation.database == "MY_DB"
assert case_sensitive_relation.schema == "My_ScHeMa"
assert case_sensitive_relation.identifier == "MY_TABLE"
assert case_sensitive_relation.render() == 'MY_DB."My_ScHeMa".MY_TABLE'
Loading