dbt-firebolt 1.8.2__tar.gz → 1.9.0__tar.gz

{dbt_firebolt-1.8.2 → dbt_firebolt-1.9.0}/PKG-INFO

@@ -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
 Provides-Extra: dev
@@ -66,7 +69,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 → dbt_firebolt-1.9.0}/README.md

@@ -46,7 +46,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 → dbt_firebolt-1.9.0}/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_firebolt-1.8.2 → dbt_firebolt-1.9.0}/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_firebolt-1.8.2 → dbt_firebolt-1.9.0}/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_firebolt-1.8.2 → dbt_firebolt-1.9.0}/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_firebolt-1.9.0/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_firebolt-1.8.2 → dbt_firebolt-1.9.0}/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 → dbt_firebolt-1.9.0}/dbt_firebolt.egg-info/PKG-INFO

@@ -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
 Provides-Extra: dev
@@ -66,7 +69,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 → dbt_firebolt-1.9.0}/dbt_firebolt.egg-info/SOURCES.txt

@@ -22,6 +22,7 @@ setup.cfg
 ./dbt/include/firebolt/macros/materializations/clone.sql
 ./dbt/include/firebolt/macros/materializations/materialized_view.sql
 ./dbt/include/firebolt/macros/materializations/seed.sql
+./dbt/include/firebolt/macros/materializations/snapshot_merge.sql
 ./dbt/include/firebolt/macros/materializations/table.sql
 ./dbt/include/firebolt/macros/materializations/test.sql
 ./dbt/include/firebolt/macros/materializations/view.sql

{dbt_firebolt-1.8.2 → dbt_firebolt-1.9.0}/dbt_firebolt.egg-info/requires.txt

@@ -7,5 +7,5 @@ pydantic>=0.23
 allure-pytest==2.*
 dbt-tests-adapter~=1.6
 mypy==1.4.1
-pre-commit==2.15.0
+pre-commit==3.5.0
 pytest==7.*

{dbt_firebolt-1.8.2 → dbt_firebolt-1.9.0}/setup.cfg

@@ -8,7 +8,7 @@ url = https://github.com/firebolt-db/dbt-firebolt
 author = Firebolt
 author_email = support@firebolt.io
 license = Apache-2.0
-license_file = LICENSE
+license_files = LICENSE
 classifiers = 
 	License :: OSI Approved :: Apache Software License
 	Operating System :: OS Independent
@@ -16,6 +16,9 @@ classifiers =
 	Programming Language :: Python :: 3 :: Only
 	Programming Language :: Python :: 3.8
 	Programming Language :: Python :: 3.9
+	Programming Language :: Python :: 3.10
+	Programming Language :: Python :: 3.11
+	Programming Language :: Python :: 3.12
 project_urls = 
 	Bug Tracker = https://github.com/firebolt-db/dbt-firebolt/issues
 
@@ -40,7 +43,7 @@ dev =
 	allure-pytest==2.*
 	dbt-tests-adapter~=1.6
 	mypy==1.4.1
-	pre-commit==2.15.0
+	pre-commit==3.5.0
 	pytest==7.*
 
 [black]