dbt-firebolt 1.6.3__tar.gz → 1.6.4__tar.gz

{dbt_firebolt-1.6.3 → dbt_firebolt-1.6.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbt_firebolt
-Version: 1.6.3
+Version: 1.6.4
 Summary: The Firebolt adapter plugin for dbt (data build tool)
 Home-page: https://github.com/firebolt-db/dbt-firebolt
 Author: Firebolt

{dbt_firebolt-1.6.3 → dbt_firebolt-1.6.4}/dbt/adapters/firebolt/__init__.py

@@ -7,7 +7,7 @@ from dbt.adapters.firebolt.connections import (
 from dbt.adapters.firebolt.impl import FireboltAdapter
 from dbt.include import firebolt
 
-__version__ = "1.6.3"
+__version__ = "1.6.4"
 
 Plugin = AdapterPlugin(
     adapter=FireboltAdapter,  # type: ignore

{dbt_firebolt-1.6.3 → dbt_firebolt-1.6.4}/dbt/include/firebolt/macros/adapters.sql

@@ -168,17 +168,16 @@
   #}
   {% call statement('list_tables_without_caching', fetch_result=True) %}
 
-      SELECT '{{ relation.database }}' AS "database",
-             table_name AS "name",
-             '{{ relation.schema }}' AS "schema",
-             'table' AS type
-        FROM information_schema.tables
-      UNION ALL
-      SELECT '{{ relation.database }}' AS "database",
-             table_name AS "name",
-             '{{ relation.schema }}' AS "schema",
-             'view' AS type
-        FROM information_schema.views
+      SELECT
+          table_catalog AS "database",
+          table_name AS "name",
+          '{{ relation.schema }}' AS "schema",
+          CASE
+            WHEN table_type = 'VIEW' THEN 'view'
+            ELSE 'table'
+          END AS "type"
+      FROM
+          information_schema.tables
   {% endcall %}
   {% set info_table = load_result('list_tables_without_caching').table %}
   {{ return(info_table) }}

dbt_firebolt-1.6.4/dbt/include/firebolt/macros/catalog.sql

@@ -0,0 +1,23 @@
+{# This is for building docs. Right now it's an incomplete description of
+the columns (for instance, `is_nullable` is missing) but more could be added later. #}
+
+{% macro firebolt__get_catalog(information_schemas, schemas) -%}
+  {%- call statement('catalog', fetch_result=True) %}
+    SELECT
+      tbls.table_catalog AS table_database,
+      tbls.table_schema as table_schema,
+      table_type,
+      tbls.table_name as table_name,
+      cols.column_name as column_name,
+      cols.data_type AS column_type,
+      CASE
+        WHEN table_type = 'VIEW' THEN 'VIEW'
+        ELSE 'TABLE'
+      END AS relation_type,
+      cols.ordinal_position as column_index
+    FROM
+      information_schema.tables tbls
+      JOIN information_schema.columns cols USING (table_name)
+  {% endcall -%}
+  {{ return(load_result('catalog').table) }}
+{%- endmacro %}

dbt_firebolt-1.6.4/dbt/include/firebolt/macros/dbt_external_tables/create_external_table.sql

@@ -0,0 +1,137 @@
+{% macro firebolt__create_external_table(source_node) %}
+    {% if source_node.external.strategy == 'copy' %}
+        {{ firebolt__create_with_copy_from(source_node) }}
+    {% else %}
+        {{ firebolt__create_with_external_table(source_node) }}
+    {% endif %}
+{% endmacro %}
+
+{% macro firebolt__create_with_external_table(source_node) %}
+    {%- set external = source_node.external -%}
+    {%- if 'partitions' in external -%}
+        {%- set columns = adapter.make_field_partition_pairs(source_node.columns.values(),
+                                                             external.partitions) -%}
+    {%- else -%}
+        {%- set columns = adapter.make_field_partition_pairs(source_node.columns.values(),
+                                                             []) -%}
+    {%- endif -%}
+    {%- set credentials = external.credentials -%}
+    {# Leaving out "IF NOT EXISTS" because this should only be called by
+       if no DROP IF is necessary. #}
+    CREATE EXTERNAL TABLE {{source(source_node.source_name, source_node.name)}} (
+        {%- for column in columns -%}
+          {{ column }}
+          {{- ',' if not loop.last }}
+        {% endfor -%}
+    )
+    {% if external.url %} URL = '{{external.url}}' {%- endif %}
+    {%- if credentials and credentials.internal_role_arn %}
+        CREDENTIALS = (AWS_ROLE_ARN = '{{credentials.internal_role_arn}}'
+        {%- if credentials.external_role_id %}
+                       AWS_ROLE_EXTERNAL_ID = '{{credentials.external_role_id}}'
+        {%- endif -%}
+        )
+    {% elif credentials and credentials.aws_key_id %}
+        CREDENTIALS = (AWS_KEY_ID = '{{credentials.aws_key_id}}'
+                       AWS_SECRET_KEY = '{{credentials.aws_secret_key}}')
+    {%- endif %}
+    {%- if external.object_pattern -%} OBJECT_PATTERN = '{{external.object_pattern}}' {%- endif %}
+    {% if external.object_patterns -%}
+        OBJECT_PATTERN =
+            {%- for obj in external.object_patterns -%}
+                {{ obj }}
+                {{- ',' if not loop.last }}
+            {%- endfor %}
+    {%- endif %}
+    {%- if external.compression -%} COMPRESSION = {{external.compression}} {%- endif %}
+    TYPE = {{ external.type }}
+{% endmacro %}
+
+{% macro firebolt__create_with_copy_from(source_node) %}
+    {# COPY FROM is only available in Firebolt 2.0. #}
+    {%- set external = source_node.external -%}
+    {%- set credentials = external.credentials -%}
+    {%- set options = external.options -%}
+    {%- set csv_options = options.csv_options -%}
+    {%- set error_file_credentials = options.error_file_credentials -%}
+
+    {# There are no partitions, but this formats the columns correctly. #}
+    {%- if 'partitions' in external -%}
+        {%- set columns = adapter.make_field_partition_pairs(source_node.columns.values(),
+                                                             external.partitions) -%}
+    {%- else -%}
+        {%- set columns = adapter.make_field_partition_pairs(source_node.columns.values(),
+                                                             []) -%}
+    {%- endif -%}
+    COPY INTO {{source(source_node.source_name, source_node.name)}}
+    {%- if columns and columns | length > 0 %}
+    (
+        {%- for column in columns -%}
+          {{ column.name }}
+          {%- if column.default is not none %} DEFAULT {{ column.default }}{% endif %}
+          {%- if column.source_column_name is not none %} {{ '$' ~ loop.index0 }}{% endif %}
+          {{- ',' if not loop.last }}
+        {%- endfor -%}
+    )
+    {%- endif %}
+    FROM '{{external.url}}'
+    {%- if options %}
+        WITH
+        {%- if options.object_pattern %}
+            PATTERN = '{{options.object_pattern}}'
+        {%- endif %}
+        {%- if options.type %}
+            TYPE = {{ options.type }}
+        {%- endif %}
+        {%- if options.auto_create is not none %}
+            AUTO_CREATE = {{ options.auto_create | upper }}
+        {%- endif %}
+        {%- if options.allow_column_mismatch is not none %}
+            ALLOW_COLUMN_MISMATCH = {{ options.allow_column_mismatch | upper }}
+        {%- endif %}
+        {%- if options.error_file %}
+            ERROR_FILE = '{{ options.error_file }}'
+        {%- endif %}
+        {%- if error_file_credentials %}
+            ERROR_FILE_CREDENTIALS = (AWS_KEY_ID = '{{ error_file_credentials.aws_key_id }}' AWS_SECRET_KEY = '{{ error_file_credentials.aws_secret_key }}')
+        {%- endif %}
+        {%- if options.max_errors_per_file %}
+            MAX_ERRORS_PER_FILE = {{ options.max_errors_per_file }}
+        {%- endif %}
+        {%- if csv_options %}
+            {%- if csv_options.header is not none %}
+                HEADER = {{ csv_options.header | upper }}
+            {%- endif %}
+            {%- if csv_options.delimiter %}
+                DELIMITER = '{{ csv_options.delimiter }}'
+            {%- endif %}
+            {%- if csv_options.newline %}
+                NEWLINE = '{{ csv_options.newline }}'
+            {%- endif %}
+            {%- if csv_options.quote %}
+                QUOTE = {{ csv_options.quote }}
+            {%- endif %}
+            {%- if csv_options.escape %}
+                ESCAPE = '{{ csv_options.escape }}'
+            {%- endif %}
+            {%- if csv_options.null_string %}
+                NULL_STRING = '{{ csv_options.null_string }}'
+            {%- endif %}
+            {%- if csv_options.empty_field_as_null is not none %}
+                EMPTY_FIELD_AS_NULL = {{ csv_options.empty_field_as_null | upper }}
+            {%- endif %}
+            {%- if csv_options.skip_blank_lines is not none %}
+                SKIP_BLANK_LINES = {{ csv_options.skip_blank_lines | upper }}
+            {%- endif %}
+            {%- if csv_options.date_format %}
+                DATE_FORMAT = '{{ csv_options.date_format }}'
+            {%- endif %}
+            {%- if csv_options.timestamp_format %}
+                TIMESTAMP_FORMAT = '{{ csv_options.timestamp_format }}'
+            {%- endif %}
+        {%- endif %}
+    {%- endif %}
+    {%- if credentials %}
+    CREDENTIALS = (AWS_KEY_ID = '{{credentials.aws_key_id}}' AWS_SECRET_KEY = '{{credentials.aws_secret_key}}')
+    {%- endif %}
+{% endmacro %}

{dbt_firebolt-1.6.3 → dbt_firebolt-1.6.4}/dbt_firebolt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbt-firebolt
-Version: 1.6.3
+Version: 1.6.4
 Summary: The Firebolt adapter plugin for dbt (data build tool)
 Home-page: https://github.com/firebolt-db/dbt-firebolt
 Author: Firebolt

dbt_firebolt-1.6.3/dbt/include/firebolt/macros/catalog.sql

@@ -1,33 +0,0 @@
-{# This is for building docs. Right now it's an incomplete description of
-the columns (for instance, `is_nullable` is missing) but more could be added later. #}
-
-{% macro firebolt__get_catalog(information_schemas, schemas) -%}
-  {%- call statement('catalog', fetch_result=True) %}
-     SELECT tbls.table_catalog AS table_database
-          , tbls.table_schema as table_schema
-          , table_type
-          , tbls.table_name as table_name
-          , cols.column_name as column_name
-          , cols.data_type AS column_type
-          , UPPER(tbls.table_type) as relation_type
-          , cols.ordinal_position as column_index
-     FROM  information_schema.tables tbls
-          JOIN information_schema.columns cols
-               USING(table_name)
-
-     UNION ALL
-
-     SELECT views.table_catalog AS table_database
-          , views.table_schema as table_schema
-          , 'VIEW' AS table_type
-          , views.table_name as table_name
-          , cols.column_name AS column_name
-          , cols.data_type AS column_type
-          , 'VIEW' as relation_type
-          , cols.ordinal_position as column_index
-     FROM information_schema.views views
-          JOIN information_schema.columns cols
-               USING(table_name)
-  {% endcall -%}
-  {{ return(load_result('catalog').table) }}
-{%- endmacro %}

dbt_firebolt-1.6.3/dbt/include/firebolt/macros/dbt_external_tables/create_external_table.sql

@@ -1,35 +0,0 @@
-{% macro firebolt__create_external_table(source_node) %}
-    {%- set external = source_node.external -%}
-    {%- if 'partitions' in external -%}
-        {%- set columns = adapter.make_field_partition_pairs(source_node.columns.values(),
-                                                             external.partitions) -%}
-    {%- else -%}
-        {%- set columns = adapter.make_field_partition_pairs(source_node.columns.values(),
-                                                             []) -%}
-    {%- endif -%}
-    -- {%- set partitions = external.partitions -%}
-    {%- set credentials = external.credentials -%}
-    {# Leaving out "IF NOT EXISTS" because this should only be called by
-       if no DROP IF is necessary. #}
-    CREATE EXTERNAL TABLE {{source(source_node.source_name, source_node.name)}} (
-        {%- for column in columns -%}
-          {{ column }}
-          {{- ',' if not loop.last }}
-        {% endfor -%}
-    )
-    {% if external.url %} URL = '{{external.url}}' {%- endif %}
-    {%- if credentials %}
-        CREDENTIALS = (AWS_ROLE_ARN = '{{credentials.internal_role_arn}}'
-                       AWS_ROLE_EXTERNAL_ID = '{{credentials.external_role_id}}')
-    {% endif %}
-    {%- if external.object_pattern -%} OBJECT_PATTERN = '{{external.object_pattern}}' {%- endif %}
-    {% if external.object_patterns -%}
-        OBJECT_PATTERN =
-            {%- for obj in external.object_patterns -%}
-                {{ obj }}
-                {{- ',' if not loop.last }}
-            {%- endfor %}
-    {%- endif %}
-    {%- if external.compression -%} COMPRESSION = {{external.compression}} {%- endif %}
-    TYPE = {{ external.type }}
-{% endmacro %}