dbt-firebolt 1.8.2__py3-none-any.whl → 1.9.0__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.8.2"
+__version__ = "1.9.0"
 
 Plugin = AdapterPlugin(
     adapter=FireboltAdapter,  # type: ignore

dbt/adapters/firebolt/connections.py

@@ -39,7 +39,6 @@ class FireboltCredentials(Credentials):
     client_id: Optional[str] = None
     client_secret: Optional[str] = None
     api_endpoint: Optional[str] = DEFAULT_API_URL
-    driver: str = 'com.firebolt.FireboltDriver'
     engine_name: Optional[str] = None
     account_name: Optional[str] = None
     retries: int = 1

dbt/adapters/firebolt/impl.py

@@ -1,7 +1,6 @@
 import re
 import time
 from dataclasses import dataclass
-from datetime import datetime
 from typing import Any, List, Mapping, Optional, Union
 
 import agate
@@ -29,21 +28,45 @@ from dbt.adapters.firebolt.connections import FireboltConnectionManager
 from dbt.adapters.firebolt.relation import FireboltRelation
 
 
+def quote_columns(columns: Union[str, List[str]]) -> Union[str, List[str]]:
+    if isinstance(columns, str):
+        return f'"{columns}"'
+    quoted_columns = []
+    for col in columns:
+        if col.startswith('"') and col.endswith('"'):
+            quoted_columns.append(col)
+        else:
+            quoted_columns.append(f'"{col}"')
+    return quoted_columns
+
+
 @dataclass
 class FireboltIndexConfig(dbtClassMixin):
     index_type: str
+    index_name: Optional[str] = None
     join_columns: Optional[Union[str, List[str]]] = None
     key_columns: Optional[Union[str, List[str]]] = None
     dimension_column: Optional[Union[str, List[str]]] = None
     aggregation: Optional[Union[str, List[str]]] = None
 
+    def __post_init__(self) -> None:
+        # quote unquoted columns
+        if self.join_columns:
+            self.join_columns = quote_columns(self.join_columns)
+        if self.key_columns:
+            self.key_columns = quote_columns(self.key_columns)
+        if self.dimension_column:
+            self.dimension_column = quote_columns(self.dimension_column)
+
     def render_name(self, relation: FireboltRelation) -> str:
         """
         Name an index according to the following format, joined by `_`:
         index type, relation name, key/join columns, timestamp (unix & UTC)
         example index name: join_my_model_customer_id_1633504263.
         """
-        now_unix = str(int(time.mktime(datetime.utcnow().timetuple())))
+        if self.index_name:
+            return self.index_name
+        now_unix = str(int(time.time()))
         # If column_names is a list with > 1 members, join with _,
         # otherwise do not. We were getting index names like
         # join__idx__emf_customers__f_i_r_s_t___n_a_m_e__165093112.
@@ -51,14 +74,23 @@ class FireboltIndexConfig(dbtClassMixin):
         spine_col = (
             '_'.join(column_names) if isinstance(column_names, list) else column_names
         )
+        # Additional hash to ensure uniqueness after spaces are removed
+        column_hash = str(hash(spine_col))[:5]
         inputs = [
             f'{self.index_type}_idx',
             relation.identifier,
             spine_col,
+            column_hash,
             now_unix,
         ]
-        string = '__'.join([x for x in inputs if x is not None])
-        return string
+        index_name = '__'.join([x for x in inputs if x is not None])
+        if len(index_name) > 255:
+            # Firebolt index names must be <= 255 characters.
+            # If the index name is too long, hash it.
+            return f'{self.index_type}_idx_{hash(index_name)}'
+        # Remove any spaces or quotes from the index name.
+        index_name = index_name.replace(' ', '_').replace('"', '')
+        return index_name
 
     @classmethod
     def parse(cls, raw_index: Optional[Mapping]) -> Optional['FireboltIndexConfig']:
@@ -274,7 +306,6 @@ class FireboltAdapter(SQLAdapter):
         columns: the number of rows that are different between the two
         relations and the number of mismatched rows.
         """
-        # This method only really exists for test reasons.
         names: List[str]
         if column_names is None:
             columns = self.get_columns_in_relation(relation_a)

dbt/include/firebolt/macros/dbt_external_tables/create_external_table.sql

@@ -68,8 +68,8 @@
     (
         {%- 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 column.default %} DEFAULT {{ column.default }}{% endif %}
+          {%- if column.source_column_name %} {{ '$' ~ loop.index0 }}{% endif %}
           {{- ',' if not loop.last }}
         {%- endfor -%}
     )
@@ -83,10 +83,10 @@
         {%- if options.type %}
             TYPE = {{ options.type }}
         {%- endif %}
-        {%- if options.auto_create is not none %}
+        {%- if options.auto_create %}
             AUTO_CREATE = {{ options.auto_create | upper }}
         {%- endif %}
-        {%- if options.allow_column_mismatch is not none %}
+        {%- if options.allow_column_mismatch %}
             ALLOW_COLUMN_MISMATCH = {{ options.allow_column_mismatch | upper }}
         {%- endif %}
         {%- if options.error_file %}
@@ -99,7 +99,7 @@
             MAX_ERRORS_PER_FILE = {{ options.max_errors_per_file }}
         {%- endif %}
         {%- if csv_options %}
-            {%- if csv_options.header is not none %}
+            {%- if csv_options.header %}
                 HEADER = {{ csv_options.header | upper }}
             {%- endif %}
             {%- if csv_options.delimiter %}
@@ -117,10 +117,10 @@
             {%- if csv_options.null_string %}
                 NULL_STRING = '{{ csv_options.null_string }}'
             {%- endif %}
-            {%- if csv_options.empty_field_as_null is not none %}
+            {%- if csv_options.empty_field_as_null %}
                 EMPTY_FIELD_AS_NULL = {{ csv_options.empty_field_as_null | upper }}
             {%- endif %}
-            {%- if csv_options.skip_blank_lines is not none %}
+            {%- if csv_options.skip_blank_lines %}
                 SKIP_BLANK_LINES = {{ csv_options.skip_blank_lines | upper }}
             {%- endif %}
             {%- if csv_options.date_format %}

dbt/include/firebolt/macros/materializations/snapshot_merge.sql

@@ -0,0 +1,19 @@
+{% macro firebolt__snapshot_merge_sql(target, source, insert_cols) -%}
+    {%- set insert_cols_csv = insert_cols | join(', ') -%}
+
+    UPDATE {{ target.render() }} AS DBT_INTERNAL_DEST
+    SET dbt_valid_to = DBT_INTERNAL_SOURCE.dbt_valid_to
+    FROM {{ source }} AS DBT_INTERNAL_SOURCE
+    WHERE DBT_INTERNAL_SOURCE.dbt_scd_id = DBT_INTERNAL_DEST.dbt_scd_id
+    AND DBT_INTERNAL_DEST.dbt_valid_to IS NULL
+    AND DBT_INTERNAL_SOURCE.dbt_change_type IN ('update', 'delete');
+
+    INSERT INTO {{ target.render() }} ({{ insert_cols_csv }})
+    SELECT {{ insert_cols_csv }}
+    FROM {{ source }} AS DBT_INTERNAL_SOURCE
+    WHERE DBT_INTERNAL_SOURCE.dbt_scd_id NOT IN (
+        SELECT dbt_scd_id FROM {{ target.render() }}
+    )
+    AND DBT_INTERNAL_SOURCE.dbt_change_type = 'insert';
+
+{% endmacro %}

dbt/include/firebolt/macros/relations/table/create.sql

@@ -24,6 +24,10 @@
         ) }}
     {%- endif -%}
 
+    {%- if temporary -%}
+        {%- do adapter.drop_relation(relation) -%}
+    {%- endif -%}
+
     {%- set table_type = config.get(
         'table_type',
         default = 'dimension'
@@ -49,9 +53,9 @@
 
     {%- if primary_index %}
         primary INDEX {% if primary_index is iterable and primary_index is not string %}
-            {{ primary_index | join(', ') }}
+            "{{ primary_index | join('", "') }}"
         {%- else -%}
-            {{ primary_index }}
+            "{{ primary_index }}"
         {%- endif -%}
     {%- endif -%}
 

{dbt_firebolt-1.8.2.dist-info → dbt_firebolt-1.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbt-firebolt
-Version: 1.8.2
+Version: 1.9.0
 Summary: The Firebolt adapter plugin for dbt (data build tool)
 Home-page: https://github.com/firebolt-db/dbt-firebolt
 Author: Firebolt
@@ -13,6 +13,9 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -24,7 +27,7 @@ Provides-Extra: dev
 Requires-Dist: allure-pytest ==2.* ; extra == 'dev'
 Requires-Dist: dbt-tests-adapter ~=1.6 ; extra == 'dev'
 Requires-Dist: mypy ==1.4.1 ; extra == 'dev'
-Requires-Dist: pre-commit ==2.15.0 ; extra == 'dev'
+Requires-Dist: pre-commit ==3.5.0 ; extra == 'dev'
 Requires-Dist: pytest ==7.* ; extra == 'dev'
 
 <img width="1113" alt="Screen Shot 2021-12-10 at 1 09 09 PM" src="https://user-images.githubusercontent.com/7674553/145641621-a7dabe78-da92-4f0a-bbd2-54ccf7f34b57.png">
@@ -75,7 +78,7 @@ The table below shows which dbt and Firebolt features are supported by the adapt
 | Incremental materializations - insert_overwrite | :white_check_mark: |
 | Incremental materializations - delete+insert | :white_check_mark: |
 | Incremental materializations - merge | :x: |
-| Snapshots                    | :x: |
+| Snapshots                    | :white_check_mark: |
 | Seeds                        | :white_check_mark: |
 | Tests                        | :white_check_mark: |
 | Documentation                | :white_check_mark: |

{dbt_firebolt-1.8.2.dist-info → dbt_firebolt-1.9.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
-dbt/adapters/firebolt/__init__.py,sha256=4WyLJ7pu9-HKBdCnohQRVqNBbOM6_nFbyOXxAhM2e_g,411
+dbt/adapters/firebolt/__init__.py,sha256=JjZII9vG02tYg2Mx_VhNAvHCmaGklk5xXNQhOpqQcOM,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=r7imGPka0klw1ev-5GTSIwUbO-Df_5DE4Ss-9OfLBMk,7990
-dbt/adapters/firebolt/impl.py,sha256=vHK7AfpmMdZMCHaky3IEufl18IYFPs9mdvdmTpMrUh4,13939
+dbt/adapters/firebolt/connections.py,sha256=_i0wPE6LWmLGo_C50UhPAU8IMUi_I2HU23fBZtfhi0Q,7942
+dbt/adapters/firebolt/impl.py,sha256=xlmGCDezIsUKiQ4gQFR60h_QtvSgW1lOacktv8Lt3ow,15143
 dbt/adapters/firebolt/relation.py,sha256=Xg3Nrjw3UrF_qwnuGbPT97rSXRiDP1GlIAoBF4b7QnY,1922
 dbt/adapters/firebolt/relation_configs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dbt/include/firebolt/__init__.py,sha256=vBGWeG-dHHkimfnX8axBJ4IgAowFw8xADmo6Auzn2xc,52
@@ -11,12 +11,13 @@ dbt/include/firebolt/macros/adapters.sql,sha256=NiTW87XQmC8gGahY6LCw7Fd6Brgin5qB
 dbt/include/firebolt/macros/catalog.sql,sha256=LLhjI9oEoMEQKQfE3LJ5nWS9-u3bwBAYBz4ukrsg5T8,3350
 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=x7awixF-k8neugbKp7_QVb7PhBlQnsaIvvdBtJEeJqE,6153
+dbt/include/firebolt/macros/dbt_external_tables/create_external_table.sql,sha256=MeFyR0oMjQdc0GlUABx6DDm5t76PdcdmXKWGVThi4EE,6069
 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
 dbt/include/firebolt/macros/materializations/materialized_view.sql,sha256=pdWGMP25o0RqNINx1hbn1Q4dTNcdk0Dgrlv3K8XQAbs,202
 dbt/include/firebolt/macros/materializations/seed.sql,sha256=O622lwmzRGeAfaNfRpjR183ARFltILteznwgXZfPXMA,1564
+dbt/include/firebolt/macros/materializations/snapshot_merge.sql,sha256=9Y4tGWkqkBDt53QHKxJPFALboKQxDJ4ZaSrLwNyRgIs,795
 dbt/include/firebolt/macros/materializations/table.sql,sha256=XY0D-df9EoWOBF3kCT3TCE3Rko7bvvfuztQT0-Pqlfs,1752
 dbt/include/firebolt/macros/materializations/test.sql,sha256=Wol19pNIfkPRTpVUYKAGbkipYOMZjixnAaoZ1chuP88,488
 dbt/include/firebolt/macros/materializations/view.sql,sha256=0xg2mO-1UWtZKj2Wlplgm7s93l-FKBswajiBOqPu2Og,1706
@@ -31,7 +32,7 @@ dbt/include/firebolt/macros/relations/materialized_view/create.sql,sha256=xthF0o
 dbt/include/firebolt/macros/relations/materialized_view/describe.sql,sha256=uMJWY-9P-49YjhwH_F1Co4szia0oNAVYqJIv2IVGzM8,164
 dbt/include/firebolt/macros/relations/materialized_view/drop.sql,sha256=Ya03cid5h05t3-SIF4JndKtMMIctD46OX9gPVt9jhVw,160
 dbt/include/firebolt/macros/relations/materialized_view/refresh.sql,sha256=9s4e6cjT9Dx9nCCJPMlhV5SkzHX8574cdIJUhSfNmU8,163
-dbt/include/firebolt/macros/relations/table/create.sql,sha256=4qK5r8EODXDjsBZwbHupLFfp3cDT4JkQkOuH94L9KVQ,2406
+dbt/include/firebolt/macros/relations/table/create.sql,sha256=5FK3XOICE-9LGojHzh0pjCy5wO-RKyeytzkEQmYT7zY,2507
 dbt/include/firebolt/macros/relations/table/drop.sql,sha256=3W0SMqmlDizmZqn-QZvqXeJ9lG2KtooiFvwac3WzSzQ,110
 dbt/include/firebolt/macros/relations/table/rename.sql,sha256=5dmKvuiSnMTARuthnDJBUOORdQCIeEuGMLoyZlgQxVU,185
 dbt/include/firebolt/macros/relations/table/replace.sql,sha256=bw08YDtLMhkM4dO4nYXZ32U50lcnTG5Axb-Lls7XpB0,132
@@ -53,8 +54,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.8.2.dist-info/LICENSE,sha256=Nn0EGvW3qmoZpBV_JVM3iPukFf3RiNCIizrWe_2oTHk,11354
-dbt_firebolt-1.8.2.dist-info/METADATA,sha256=mFMHiN_VwI-l0-MZ-KoCVha61CJDRS8WyHOnLJkZiEA,5070
-dbt_firebolt-1.8.2.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-dbt_firebolt-1.8.2.dist-info/top_level.txt,sha256=B2YH4he17ajilEWOGCKHbRcEJlCuZKwCcgFcLPntLsE,4
-dbt_firebolt-1.8.2.dist-info/RECORD,,
+dbt_firebolt-1.9.0.dist-info/LICENSE,sha256=Nn0EGvW3qmoZpBV_JVM3iPukFf3RiNCIizrWe_2oTHk,11354
+dbt_firebolt-1.9.0.dist-info/METADATA,sha256=cusaAXb1pygjqHsGIE6sk-Xk56vD8NOhOnVzWhWn-_M,5237
+dbt_firebolt-1.9.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+dbt_firebolt-1.9.0.dist-info/top_level.txt,sha256=B2YH4he17ajilEWOGCKHbRcEJlCuZKwCcgFcLPntLsE,4
+dbt_firebolt-1.9.0.dist-info/RECORD,,