dbt-firebolt 1.4.2__py3-none-any.whl → 1.4.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.4.2"
+__version__ = "1.4.4"
 
 Plugin = AdapterPlugin(
     adapter=FireboltAdapter,  # type: ignore

dbt/adapters/firebolt/column.py

@@ -17,4 +17,4 @@ class FireboltColumn(Column):
     def from_description(cls, name: str, raw_data_type: str) -> Column:
         if raw_data_type.startswith('ARRAY'):
             return cls(name, raw_data_type)
-        return Column.from_description(name, raw_data_type)
+        return super().from_description(name, raw_data_type)

dbt/adapters/firebolt/connections.py

@@ -14,7 +14,7 @@ from dbt.contracts.connection import (
 from dbt.events import AdapterLogger  # type: ignore
 from dbt.exceptions import DbtRuntimeError
 from firebolt.client import DEFAULT_API_URL
-from firebolt.client.auth import UsernamePassword
+from firebolt.client.auth import Auth, ClientCredentials, UsernamePassword
 from firebolt.db import connect as sdk_connect
 from firebolt.db.connection import Connection as SDKConnection
 from firebolt.db.cursor import Cursor
@@ -27,14 +27,33 @@ logger = AdapterLogger('Firebolt')
 @dataclass
 class FireboltCredentials(Credentials):
     # These values all come from either profiles.yml or dbt_project.yml.
-    user: str
-    password: str
+    user: Optional[str] = None
+    password: Optional[str] = None
+    # New way to authenticate
+    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
 
+    def __post_init__(self) -> None:
+        # If user and password are not provided, assume client_id and client_secret
+        # are provided instead
+        if not self.user and not self.password:
+            if not self.client_id or not self.client_secret:
+                raise dbt.exceptions.DbtProfileError(
+                    'Either user and password or client_id and client_secret'
+                    ' must be provided'
+                )
+        else:
+            if self.client_id or self.client_secret:
+                raise dbt.exceptions.DbtProfileError(
+                    'Either user and password or client_id and client_secret'
+                    ' must be provided'
+                )
+
     @property
     def type(self) -> str:
         return 'firebolt'
@@ -94,10 +113,11 @@ class FireboltConnectionManager(SQLConnectionManager):
         if connection.state == 'open':
             return connection
         credentials = connection.credentials
+        auth: Auth = _determine_auth(credentials)
 
         def connect() -> SDKConnection:
             handle = sdk_connect(
-                auth=UsernamePassword(credentials.user, credentials.password),
+                auth=auth,
                 engine_name=credentials.engine_name,
                 database=credentials.database,
                 api_endpoint=credentials.api_endpoint,
@@ -162,3 +182,20 @@ class FireboltConnectionManager(SQLConnectionManager):
         raise dbt.exceptions.NotImplementedError(
             '`cancel` is not implemented for this adapter!'
         )
+
+
+def _determine_auth(credentials: FireboltCredentials) -> Auth:
+    if credentials.client_id and credentials.client_secret:
+        return ClientCredentials(credentials.client_id, credentials.client_secret)
+    elif '@' in credentials.user:  # type: ignore # checked in the dataclass
+        # email auth can only be used with UsernamePassword
+        return UsernamePassword(
+            credentials.user,  # type: ignore[arg-type]
+            credentials.password,  # type: ignore[arg-type]
+        )
+    else:
+        # assume user provided id and secret in the user/password fields
+        return ClientCredentials(
+            credentials.user,  # type: ignore[arg-type]
+            credentials.password,  # type: ignore[arg-type]
+        )

dbt/adapters/firebolt/impl.py

@@ -14,7 +14,6 @@ from dbt.exceptions import (
     CompilationError,
     DbtRuntimeError,
     NotImplementedError,
-    validator_error_message,
 )
 
 from dbt.adapters.firebolt.column import FireboltColumn
@@ -91,7 +90,7 @@ class FireboltIndexConfig(dbtClassMixin):
                 )
             return index_config
         except ValidationError as exc:
-            msg = validator_error_message(exc)
+            msg = DbtRuntimeError('').validator_error_message(exc)
             raise CompilationError(f'Could not parse index config: {msg}.')
         return None
 

dbt/include/firebolt/macros/materializations/models/incremental/merge.sql

@@ -5,17 +5,16 @@
     {% if unique_key %}
         {% if unique_key is sequence and unique_key is not string %}
             delete from {{ target }}
-            where (
-                {% for key in unique_key %}
-                    {{ target }}.{{ key }} in (select {{ key }} from {{ source }})
-                    {{ "and " if not loop.last }}
-                {% endfor %}
+            where
+                ({{ get_quoted_csv(unique_key) }}) in (
+                    select {{ get_quoted_csv(unique_key) }}
+                    from {{ source }}
+                )
                 {% if incremental_predicates %}
                     {% for predicate in incremental_predicates %}
                         and {{ predicate }}
                     {% endfor %}
-                {% endif %}
-            );
+                {% endif %};
         {% else %}
             delete from {{ target }}
             where (

dbt/include/firebolt/macros/materializations/models/incremental/on_schema_change.sql

@@ -71,11 +71,19 @@
       {% do exceptions.raise_compiler_error(
           'A schema change was detected and `on_schema_change` was set to "fail".') %}
     {% else %}
-      {% do exceptions.raise_compiler_error(
-          'Schema changes detected. Either revert the change or run the model with the ' ~
-          '--full-refresh flag on the command line to recreate the model with the new ' ~
-          'schema definition. Running with the --full-refresh flag drops and recreates ' ~
-          'the database object.') %}
+      {% set fail_msg %}
+          Schema changes detected on this incremental!
+          Either revert the change or run the model with the --full-refresh flag
+          on the command line to recreate the model with the new schema definition.
+          Running with the --full-refresh flag drops and recreates the database object.
+
+          Additional troubleshooting context:
+              Source columns not in target: {{ schema_changes_dict['source_not_in_target'] }}
+              Target columns not in source: {{ schema_changes_dict['target_not_in_source'] }}
+              New column types: {{ schema_changes_dict['new_target_types'] }}
+      {% endset %}
+
+      {% do exceptions.raise_compiler_error(fail_msg) %}
     {% endif %}
   {% endif %}
   {{ return(schema_changes_dict['common_columns']) }}

dbt/include/firebolt/macros/utils/cast_bool_to_text.sql

@@ -1,7 +1,7 @@
 {% macro firebolt__cast_bool_to_text(field) %}
     CASE
-        WHEN {{ field }} = 0 THEN 'false'
-        WHEN {{ field }} = 1 THEN 'true'
+        WHEN {{ field }} = false THEN 'false'
+        WHEN {{ field }} = true THEN 'true'
         ELSE NULL
     END
 {% endmacro %}

dbt/include/firebolt/macros/utils/datediff.sql

@@ -1,6 +1,6 @@
 {% macro firebolt__datediff(first_date, second_date, datepart) -%}
 
-    datediff(
+    date_diff(
         '{{ datepart }}',
         {{ first_date }} :: TIMESTAMP,
         {{ second_date }} :: TIMESTAMP

{dbt_firebolt-1.4.2.dist-info → dbt_firebolt-1.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbt-firebolt
-Version: 1.4.2
+Version: 1.4.4
 Summary: The Firebolt adapter plugin for dbt (data build tool)
 Home-page: https://github.com/firebolt-db/dbt-firebolt
 Author: Firebolt
@@ -17,13 +17,14 @@ Classifier: Programming Language :: Python :: 3.9
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: dbt-core (~=1.4)
-Requires-Dist: firebolt-sdk (>=0.10.0)
+Requires-Dist: dbt-core ~=1.4
+Requires-Dist: firebolt-sdk >=1.1.0
 Provides-Extra: dev
-Requires-Dist: dbt-tests-adapter (~=1.4) ; extra == 'dev'
-Requires-Dist: mypy (==0.910) ; extra == 'dev'
-Requires-Dist: pre-commit (==2.15.0) ; extra == 'dev'
-Requires-Dist: pytest (==7.*) ; extra == 'dev'
+Requires-Dist: allure-pytest ==2.* ; extra == 'dev'
+Requires-Dist: dbt-tests-adapter ~=1.4 ; extra == 'dev'
+Requires-Dist: mypy ==0.910 ; extra == 'dev'
+Requires-Dist: pre-commit ==2.15.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">
 

{dbt_firebolt-1.4.2.dist-info → dbt_firebolt-1.4.4.dist-info}/RECORD

@@ -1,8 +1,8 @@
-dbt/adapters/firebolt/__init__.py,sha256=C7xxcsh_nOLZ475uW8mzYpiYlEHAjuVWW-NOTX4KRlc,411
+dbt/adapters/firebolt/__init__.py,sha256=H1o-mp-HofZFT8IxEoZr97TDxLxzw47xngjETDNCTfA,411
 dbt/adapters/firebolt/__version__.py,sha256=zRlZGglif76ZVuWWSjsH_MMPgtVQqmj-SryYJW25FL4,69
-dbt/adapters/firebolt/column.py,sha256=iX0W2nWQ7xfnLKW3FWKcPBQPIld_MFoMULfVTbGF-_4,538
-dbt/adapters/firebolt/connections.py,sha256=3Pkeb9U19VcRKQPHX-eXTp68BEXV2HgT47MXU4YMxn4,5026
-dbt/adapters/firebolt/impl.py,sha256=TVAIwGQR9t4JSW4WPQVfG1_-kNaxSpBxnFSic9wwnlo,13013
+dbt/adapters/firebolt/column.py,sha256=COo_wjhCFgS3GFcPIPcoq7WAWgzN6DB2XqG-gk51WBc,539
+dbt/adapters/firebolt/connections.py,sha256=m7PZF_i43LN0q4K_4dV4DhCs0_DoAYwh95rjY8IhUcI,6645
+dbt/adapters/firebolt/impl.py,sha256=Fm_KeGiuQgpMm-pOIFv1DDbeRuX_OeneHL8IQTgIMBY,13004
 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
@@ -20,16 +20,16 @@ dbt/include/firebolt/macros/materializations/view.sql,sha256=0xg2mO-1UWtZKj2Wlpl
 dbt/include/firebolt/macros/materializations/models/incremental/column_helpers.sql,sha256=7XQsKdqcnKaIUxll4Etfa59HtF-3R3NfeSgpavBSJQE,917
 dbt/include/firebolt/macros/materializations/models/incremental/incremental.sql,sha256=bd8f-O9KPo5wpL9MpKDHxTJ8wAjT7BOxyUFybR9MPu8,5905
 dbt/include/firebolt/macros/materializations/models/incremental/is_incremental.sql,sha256=8Zgg0wOgIDQK_SAwxi7zk7gr_6Q7WyqN8nflTYpoyG0,581
-dbt/include/firebolt/macros/materializations/models/incremental/merge.sql,sha256=oKdm2ohWa0PMclfk0m0oDKoQr0equU0MewbMwgUd8mw,1361
-dbt/include/firebolt/macros/materializations/models/incremental/on_schema_change.sql,sha256=nZ7uFT42MnEEGtCW--N4K4W-fUm_qG90xar66ErqQe8,3564
+dbt/include/firebolt/macros/materializations/models/incremental/merge.sql,sha256=YPryPkUfVVrKVk5bSdGt0eMa5NdFMMvJW1OuQ6o2umw,1311
+dbt/include/firebolt/macros/materializations/models/incremental/on_schema_change.sql,sha256=WxGhX22oJRhDVsR4nUWilCSIG-bb7efDC3AXcU8VbbQ,3933
 dbt/include/firebolt/macros/materializations/models/incremental/strategies.sql,sha256=8Xrr-XqWeTRTbgvbVuH7EikklCzooSl0tMtLvhNKT4A,5925
 dbt/include/firebolt/macros/utils/array_append.sql,sha256=woAedZFXFYh6TYXwJQCxKj4o5yo71yXBdk-nxcF4Kss,117
 dbt/include/firebolt/macros/utils/array_concat.sql,sha256=Q9yY_rhcITJH0bS12MJOkBl5PXJ-ScgFZTBrqmQtdmw,117
 dbt/include/firebolt/macros/utils/array_construct.sql,sha256=C1I8STXIEN4-Ms6_b1Fw7QqzaAiesjC3M4RWa6e3pBY,105
 dbt/include/firebolt/macros/utils/bool_or.sql,sha256=PlnQTFU2NFH1d8nbzLss_VHbYO06dd0f7hEyadSkxkk,87
-dbt/include/firebolt/macros/utils/cast_bool_to_text.sql,sha256=zascZw9BPvyNaqHDwSw4uh56a42ZvEW4PvEcrcQMsPA,180
+dbt/include/firebolt/macros/utils/cast_bool_to_text.sql,sha256=ZUst68Bx6Xuls2TO2BjDkBUS1gj0z7upZwvF4r6cmN0,187
 dbt/include/firebolt/macros/utils/dateadd.sql,sha256=5xRi047b42aOYpCLnVPuQa3wXN9k1-3xNC4ta5p9AEA,202
-dbt/include/firebolt/macros/utils/datediff.sql,sha256=t5Fu_3PKeXoJcg8FYnv_UYjFL8qVoMSU7m8t2N_LbFs,213
+dbt/include/firebolt/macros/utils/datediff.sql,sha256=cy-Ex1TOyddF23JnvqprOVFeCEpag_wTvNazEh7BURY,214
 dbt/include/firebolt/macros/utils/except.sql,sha256=AoIC6Lr9_qMpD3dNw0Fp_wqtT2nM3WhbvF8drHKx_zQ,186
 dbt/include/firebolt/macros/utils/intersect.sql,sha256=b8T-mB_qXgHN7dHTy0iA5oX029EPnyNfphW_96j0c94,192
 dbt/include/firebolt/macros/utils/listagg.sql,sha256=ncnvHyiD_S4cdAxU05_yIftkqc3mS6FB6742hyXG1ns,588
@@ -37,8 +37,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.4.2.dist-info/LICENSE,sha256=Nn0EGvW3qmoZpBV_JVM3iPukFf3RiNCIizrWe_2oTHk,11354
-dbt_firebolt-1.4.2.dist-info/METADATA,sha256=Q2kI86wUizELMSW-IVenJdYa8cCbPurkArSVT9dJqxI,4402
-dbt_firebolt-1.4.2.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-dbt_firebolt-1.4.2.dist-info/top_level.txt,sha256=B2YH4he17ajilEWOGCKHbRcEJlCuZKwCcgFcLPntLsE,4
-dbt_firebolt-1.4.2.dist-info/RECORD,,
+dbt_firebolt-1.4.4.dist-info/LICENSE,sha256=Nn0EGvW3qmoZpBV_JVM3iPukFf3RiNCIizrWe_2oTHk,11354
+dbt_firebolt-1.4.4.dist-info/METADATA,sha256=aULXmg1kh0jJMuxwbO48I7ovklnZVI071m5zNz41c2U,4441
+dbt_firebolt-1.4.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+dbt_firebolt-1.4.4.dist-info/top_level.txt,sha256=B2YH4he17ajilEWOGCKHbRcEJlCuZKwCcgFcLPntLsE,4
+dbt_firebolt-1.4.4.dist-info/RECORD,,

{dbt_firebolt-1.4.2.dist-info → dbt_firebolt-1.4.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.40.0)
+Generator: bdist_wheel (0.42.0)
 Root-Is-Purelib: true
 Tag: py3-none-any