Better _is_relation logic

dbt-labs · Apr 30, 2019 · 358f94d · 358f94d
1 parent 0ce0b44
commit 358f94d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/macros/cross_db_utils/_is_relation.sql b/macros/cross_db_utils/_is_relation.sql
@@ -1,5 +1,5 @@
-{% macro _is_relation(arg, macro) %}
-    {%- if execute and arg.name is none -%}
-        {%- do exceptions.raise_compiler_error("Macro " ~ macro ~ " expected a Relation but received the value: " ~ arg) -%}
+{% macro _is_relation(obj, macro) %}
+    {%- if not (obj is mapping and obj.get('metadata', {}).get('type', '').endswith('Relation')) -%}
+        {%- do exceptions.raise_compiler_error("Macro " ~ macro ~ " expected a Relation but received the value: " ~ obj) -%}
     {%- endif -%}
 {% endmacro %}
diff --git a/macros/sql/get_tables_by_prefix_sql.sql b/macros/sql/get_tables_by_prefix_sql.sql
@@ -6,7 +6,7 @@
 
         select distinct 
             table_schema as "table_schema", table_name as "table_name"
-        from {{adapter.quote(database)}}.information_schema.tables
+        from {{database}}.information_schema.tables
         where table_schema = '{{ schema }}'
         and table_name ilike '{{ prefix }}%'
         and table_name not ilike '{{ exclude }}'