Merge branch 'main' into allow-dbt-to-cancel-connections

.changes/unreleased/Features-20231214-195655.yaml

@@ -0,0 +1,6 @@
+kind: Features
+body: Support limiting get_catalog by object name
+time: 2023-12-14T19:56:55.124051-05:00
+custom:
+  Author: mikealfare
+  Issue: "625"

dbt/adapters/redshift/impl.py

@@ -6,6 +6,7 @@
 from dbt.adapters.base import PythonJobHelper
 from dbt.adapters.base.impl import AdapterConfig, ConstraintSupport
 from dbt.adapters.base.meta import available
+from dbt.adapters.capability import Capability, CapabilityDict, CapabilitySupport, Support
 from dbt.adapters.sql import SQLAdapter
 from dbt.adapters.contracts.connection import AdapterResponse
 from dbt.adapters.events.logging import AdapterLogger
@@ -53,6 +54,10 @@ class RedshiftAdapter(SQLAdapter):
         ConstraintType.foreign_key: ConstraintSupport.NOT_ENFORCED,
     }
 
+    _capabilities = CapabilityDict(
+        {Capability.SchemaMetadataByRelations: CapabilitySupport(support=Support.Full)}
+    )
+
     @classmethod
     def date_function(cls):
         return "getdate()"

dbt/include/redshift/macros/catalog/by_relation.sql

@@ -0,0 +1,82 @@
+{% macro redshift__get_catalog_relations(information_schema, relations) -%}
+
+    {% set database = information_schema.database %}
+    {{ adapter.verify_database(database) }}
+
+    {#-- Compute a left-outer join in memory. Some Redshift queries are
+      -- leader-only, and cannot be joined to other compute-based queries #}
+
+    {% set catalog = _redshift__get_base_catalog_by_relation(database, relations) %}
+
+    {% set select_extended = redshift__can_select_from('svv_table_info') %}
+    {% if select_extended %}
+        {% set extended_catalog = _redshift__get_extended_catalog_by_relation(relations) %}
+        {% set catalog = catalog.join(extended_catalog, ['table_schema', 'table_name']) %}
+    {% else %}
+        {{ redshift__no_svv_table_info_warning() }}
+    {% endif %}
+
+    {{ return(catalog) }}
+
+{% endmacro %}
+
+
+{% macro _redshift__get_base_catalog_by_relation(database, relations) -%}
+    {%- call statement('base_catalog', fetch_result=True) -%}
+        with
+            late_binding as ({{ _redshift__get_late_binding_by_relation_sql(relations) }}),
+            early_binding as ({{ _redshift__get_early_binding_by_relation_sql(database, relations) }}),
+            unioned as (select * from early_binding union all select * from late_binding),
+            table_owners as ({{ redshift__get_table_owners_sql() }})
+        select '{{ database }}' as table_database, *
+        from unioned
+        join table_owners using (table_schema, table_name)
+        order by "column_index"
+    {%- endcall -%}
+    {{ return(load_result('base_catalog').table) }}
+{%- endmacro %}
+
+
+{% macro _redshift__get_late_binding_by_relation_sql(relations) %}
+    {{ redshift__get_late_binding_sql() }}
+    where (
+        {%- for relation in relations -%}
+            (
+                upper(table_schema) = upper('{{ relation.schema }}')
+            and upper(table_name) = upper('{{ relation.identifier }}')
+            )
+            {%- if not loop.last %} or {% endif -%}
+        {%- endfor -%}
+    )
+{% endmacro %}
+
+
+{% macro _redshift__get_early_binding_by_relation_sql(database, relations) %}
+    {{ redshift__get_early_binding_sql(database) }}
+    and (
+        {%- for relation in relations -%}
+            (
+                upper(sch.nspname) = upper('{{ relation.schema }}')
+            and upper(tbl.relname) = upper('{{ relation.identifier }}')
+            )
+            {%- if not loop.last %} or {% endif -%}
+        {%- endfor -%}
+    )
+{% endmacro %}
+
+
+{% macro _redshift__get_extended_catalog_by_relation(relations) %}
+    {%- call statement('extended_catalog', fetch_result=True) -%}
+        {{ redshift__get_extended_catalog_sql() }}
+        where (
+            {%- for relation in relations -%}
+                (
+                    upper("schema") = upper('{{ relation.schema }}')
+                and upper("table") = upper('{{ relation.identifier }}')
+                )
+            {%- if not loop.last %} or {% endif -%}
+            {%- endfor -%}
+        )
+    {%- endcall -%}
+    {{ return(load_result('extended_catalog').table) }}
+{% endmacro %}