dbt-firebolt 1.6.2__py3-none-any.whl → 1.6.4__py3-none-any.whl

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.2"
+__version__ = "1.6.4"
 
 Plugin = AdapterPlugin(
     adapter=FireboltAdapter,  # type: ignore

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/include/firebolt/macros/catalog.sql

@@ -3,31 +3,21 @@ the columns (for instance, `is_nullable` is missing) but more could be added lat
 
 {% 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)
+    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/include/firebolt/macros/dbt_external_tables/create_external_table.sql

@@ -1,4 +1,12 @@
 {% 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(),
@@ -7,7 +15,6 @@
         {%- 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. #}
@@ -18,10 +25,16 @@
         {% endfor -%}
     )
     {% if external.url %} URL = '{{external.url}}' {%- endif %}
-    {%- if credentials %}
+    {%- if credentials and credentials.internal_role_arn %}
         CREDENTIALS = (AWS_ROLE_ARN = '{{credentials.internal_role_arn}}'
-                       AWS_ROLE_EXTERNAL_ID = '{{credentials.external_role_id}}')
-    {% endif %}
+        {%- 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 =
@@ -30,6 +43,95 @@
                 {{- ',' if not loop.last }}
             {%- endfor %}
     {%- endif %}
-    {%- if external.compression -%} COMPRESSION = {{external.compression}} {%- 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.2.dist-info → dbt_firebolt-1.6.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbt-firebolt
-Version: 1.6.2
+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.2.dist-info → dbt_firebolt-1.6.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-dbt/adapters/firebolt/__init__.py,sha256=JTtsgQvtntausVLJXwrfGprJ94XEjeFBzAaPWV9NnQY,411
+dbt/adapters/firebolt/__init__.py,sha256=abhy1JQv7eRFwdEtR9pWsB6kYfmZMobu6HweuUPtpeQ,411
 dbt/adapters/firebolt/__version__.py,sha256=zRlZGglif76ZVuWWSjsH_MMPgtVQqmj-SryYJW25FL4,69
 dbt/adapters/firebolt/column.py,sha256=COo_wjhCFgS3GFcPIPcoq7WAWgzN6DB2XqG-gk51WBc,539
 dbt/adapters/firebolt/connections.py,sha256=Sp2C03ynSqmRIQO9z2YGfVIimWZrygST7uKT0t5_RwU,7880
@@ -6,11 +6,11 @@ dbt/adapters/firebolt/impl.py,sha256=0Zn058iDxT6eVAP77vGC1sIyOYuW5FDALNns1ErPl_4
 dbt/adapters/firebolt/relation.py,sha256=z-yv_ICJPZB33IIpnr3o_jusoULlKANLj6BlkaudQQ0,1152
 dbt/include/firebolt/__init__.py,sha256=vBGWeG-dHHkimfnX8axBJ4IgAowFw8xADmo6Auzn2xc,52
 dbt/include/firebolt/dbt_project.yml,sha256=uHJ-i0wD1D74DWSSSzsFKoKbAN1w4LBgVpnkm8e-M1g,76
-dbt/include/firebolt/macros/adapters.sql,sha256=L6AVtG03-JByYyb5JwIdWTYII8H2SStCquqF_le5PdA,9800
-dbt/include/firebolt/macros/catalog.sql,sha256=Ung5LZF3Usm_xIrrTRs6sBP0LiPbGH4aQ99cC-6ol4M,1312
+dbt/include/firebolt/macros/adapters.sql,sha256=btDFso1_NJzHc7_RiuuDKVOmhsafFt0Ng3HuI0R6mhU,9663
+dbt/include/firebolt/macros/catalog.sql,sha256=YCsHQEqA1-bo_expaF_pMorINhKAXOYs73Lj8Mf1GDY,843
 dbt/include/firebolt/macros/adapters/apply_grants.sql,sha256=nEmyDs0K0HENxxMaY8v-5oifIXDMrysmuUb_bo9bCuY,1095
 dbt/include/firebolt/macros/adapters/relation.sql,sha256=1nQZg_vwpGYwFI2EQvHJA5CqFWk7h3w3Yq2uvYXNR5E,2017
-dbt/include/firebolt/macros/dbt_external_tables/create_external_table.sql,sha256=Cs8E0MnHQnKvEshck6RrV0F6pGjOAZTbtq_UsZb2YSQ,1669
+dbt/include/firebolt/macros/dbt_external_tables/create_external_table.sql,sha256=x7awixF-k8neugbKp7_QVb7PhBlQnsaIvvdBtJEeJqE,6153
 dbt/include/firebolt/macros/dbt_external_tables/dropif.sql,sha256=-kZzUVgC6Bcof7tZ9VcDK427agylMHeG-yA8NqSeWkw,167
 dbt/include/firebolt/macros/dbt_external_tables/get_external_build_plan.sql,sha256=BWNSuqB9t0hxbxL9CbIc0UFTBBarQMtGfHv9LLAbqSI,894
 dbt/include/firebolt/macros/materializations/clone.sql,sha256=SKPc_tG0tF2HRKlo1-CQPvxVWGKHpXDwxvubsCwKTG8,79
@@ -39,8 +39,8 @@ dbt/include/firebolt/macros/utils/position.sql,sha256=WPo9_bhvNYJooEAsHC9OcnNAwU
 dbt/include/firebolt/macros/utils/right.sql,sha256=_mm1_2MvlOH4O6CmYhgvVxMLfDxAvgv-EMwZ8OBOq-I,254
 dbt/include/firebolt/macros/utils/split_part.sql,sha256=5dUlbx3Pt1iWWaIlxiXyYUwUqzXuLLXMB-1aGJHNk4o,464
 dbt/include/firebolt/macros/utils/timestamps.sql,sha256=22g-QpJjBuBUQOHNpQ_TuMRa-cHxaxXPv8ItEUo-vEk,397
-dbt_firebolt-1.6.2.dist-info/LICENSE,sha256=Nn0EGvW3qmoZpBV_JVM3iPukFf3RiNCIizrWe_2oTHk,11354
-dbt_firebolt-1.6.2.dist-info/METADATA,sha256=_IwRzSa7I4jV0DYj5PfbQ_3OZbBTQ6YPRrGEIo0kAZ4,5034
-dbt_firebolt-1.6.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-dbt_firebolt-1.6.2.dist-info/top_level.txt,sha256=B2YH4he17ajilEWOGCKHbRcEJlCuZKwCcgFcLPntLsE,4
-dbt_firebolt-1.6.2.dist-info/RECORD,,
+dbt_firebolt-1.6.4.dist-info/LICENSE,sha256=Nn0EGvW3qmoZpBV_JVM3iPukFf3RiNCIizrWe_2oTHk,11354
+dbt_firebolt-1.6.4.dist-info/METADATA,sha256=P9bgeX1hBKX9qJbfs6eaTAFPt-0nvfupj07nZO90I6A,5034
+dbt_firebolt-1.6.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+dbt_firebolt-1.6.4.dist-info/top_level.txt,sha256=B2YH4he17ajilEWOGCKHbRcEJlCuZKwCcgFcLPntLsE,4
+dbt_firebolt-1.6.4.dist-info/RECORD,,