dbt-firebolt 1.4.3__tar.gz → 1.4.4__tar.gz

{dbt_firebolt-1.4.3 → dbt_firebolt-1.4.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbt_firebolt
-Version: 1.4.3
+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

{dbt_firebolt-1.4.3 → dbt_firebolt-1.4.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.4.3"
+__version__ = "1.4.4"
 
 Plugin = AdapterPlugin(
     adapter=FireboltAdapter,  # type: ignore

{dbt_firebolt-1.4.3 → dbt_firebolt-1.4.4}/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_firebolt-1.4.3 → dbt_firebolt-1.4.4}/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_firebolt-1.4.3 → dbt_firebolt-1.4.4}/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_firebolt-1.4.3 → dbt_firebolt-1.4.4}/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_firebolt-1.4.3 → dbt_firebolt-1.4.4}/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_firebolt-1.4.3 → dbt_firebolt-1.4.4}/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.3 → dbt_firebolt-1.4.4}/dbt_firebolt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbt-firebolt
-Version: 1.4.3
+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

{dbt_firebolt-1.4.3 → dbt_firebolt-1.4.4}/dbt_firebolt.egg-info/requires.txt

@@ -1,7 +1,8 @@
 dbt-core~=1.4
-firebolt-sdk>=0.10.0
+firebolt-sdk>=1.1.0
 
 [dev]
+allure-pytest==2.*
 dbt-tests-adapter~=1.4
 mypy==0.910
 pre-commit==2.15.0

{dbt_firebolt-1.4.3 → dbt_firebolt-1.4.4}/setup.cfg

@@ -24,7 +24,7 @@ project_urls =
 packages = find_namespace:
 install_requires = 
 	dbt-core~=1.4
-	firebolt-sdk>=0.10.0
+	firebolt-sdk>=1.1.0
 python_requires = >=3.7
 include_package_data = True
 package_dir = 
@@ -36,6 +36,7 @@ include = dbt, dbt.*
 
 [options.extras_require]
 dev = 
+	allure-pytest==2.*
 	dbt-tests-adapter~=1.4
 	mypy==0.910
 	pre-commit==2.15.0