dbt-firebolt 1.9.4__tar.gz → 1.11.0__tar.gz

{dbt_firebolt-1.9.4/dbt_firebolt.egg-info → dbt_firebolt-1.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbt_firebolt
-Version: 1.9.4
+Version: 1.11.0
 Summary: The Firebolt adapter plugin for dbt (data build tool)
 Home-page: https://github.com/firebolt-db/dbt-firebolt
 Author: Firebolt
@@ -21,7 +21,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: dbt-adapters<2.0,>=1.0
 Requires-Dist: dbt-core>=1.8.0
-Requires-Dist: firebolt-sdk>=1.8.1
+Requires-Dist: firebolt-sdk>=1.13.0
 Requires-Dist: pydantic>=0.23
 Provides-Extra: dev
 Requires-Dist: allure-pytest==2.*; extra == "dev"
@@ -77,7 +77,7 @@ The table below shows which dbt and Firebolt features are supported by the adapt
 | Incremental materializations - append | :white_check_mark: |
 | Incremental materializations - insert_overwrite | :white_check_mark: |
 | Incremental materializations - delete+insert | :white_check_mark: |
-| Incremental materializations - merge | :x: |
+| Incremental materializations - merge | :white_check_mark: |
 | Snapshots                    | :white_check_mark: |
 | Seeds                        | :white_check_mark: |
 | Tests                        | :white_check_mark: |

{dbt_firebolt-1.9.4 → dbt_firebolt-1.11.0}/README.md

@@ -45,7 +45,7 @@ The table below shows which dbt and Firebolt features are supported by the adapt
 | Incremental materializations - append | :white_check_mark: |
 | Incremental materializations - insert_overwrite | :white_check_mark: |
 | Incremental materializations - delete+insert | :white_check_mark: |
-| Incremental materializations - merge | :x: |
+| Incremental materializations - merge | :white_check_mark: |
 | Snapshots                    | :white_check_mark: |
 | Seeds                        | :white_check_mark: |
 | Tests                        | :white_check_mark: |

{dbt_firebolt-1.9.4 → dbt_firebolt-1.11.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.9.4"
+__version__ = "1.11.0"
 
 Plugin = AdapterPlugin(
     adapter=FireboltAdapter,  # type: ignore

{dbt_firebolt-1.9.4 → dbt_firebolt-1.11.0}/dbt/adapters/firebolt/connections.py

@@ -19,7 +19,12 @@ from dbt_common.exceptions import (
     NotImplementedError,
 )
 from firebolt.client import DEFAULT_API_URL
-from firebolt.client.auth import Auth, ClientCredentials, UsernamePassword
+from firebolt.client.auth import (
+    Auth,
+    ClientCredentials,
+    FireboltCore,
+    UsernamePassword,
+)
 from firebolt.db import ARRAY, DECIMAL, ExtendedType
 from firebolt.db import connect as sdk_connect
 from firebolt.db.connection import Connection as SDKConnection
@@ -41,6 +46,7 @@ class FireboltCredentials(Credentials):
     api_endpoint: Optional[str] = DEFAULT_API_URL
     engine_name: Optional[str] = None
     account_name: Optional[str] = None
+    url: Optional[str] = None
     retries: int = 1
 
     _ALIASES = {
@@ -48,26 +54,14 @@ class FireboltCredentials(Credentials):
     }
 
     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 DbtConfigError(
-                    'Either user and password or client_id and client_secret'
-                    ' must be provided'
-                )
-        else:
-            if self.client_id or self.client_secret:
-                raise DbtConfigError(
-                    'Either user and password or client_id and client_secret'
-                    ' must be provided'
-                )
+        # Check the credentials are valid and we can determine the auth method
+        _determine_auth(self)
 
     @property
     def type(self) -> str:
         return 'firebolt'
 
-    def _connection_keys(self) -> Tuple[str, str, str, str, str, str, str]:
+    def _connection_keys(self) -> Tuple[str, str, str, str, str, str, str, str]:
         """
         Return tuple of keys (i.e. not values) to display
         in the `dbt debug` output.
@@ -80,6 +74,7 @@ class FireboltCredentials(Credentials):
             'database',
             'engine_name',
             'params',
+            'url',
         )
 
     @property
@@ -222,17 +217,50 @@ class FireboltConnectionManager(SQLConnectionManager):
 
 
 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
+    """Determine the appropriate authentication method based on provided credentials."""
+
+    def _has_client_credentials() -> bool:
+        return bool(credentials.client_id and credentials.client_secret)
+
+    def _has_user_password() -> bool:
+        return bool(credentials.user and credentials.password)
+
+    def _is_email_auth() -> bool:
+        return bool(credentials.user and '@' in credentials.user)
+
+    # Handle Firebolt Core authentication (no other credentials allowed)
+    if credentials.url:
+        if _has_client_credentials() or _has_user_password():
+            raise DbtConfigError(
+                'If url is provided, do not provide user, password, '
+                'client_id, or client_secret.'
+            )
+        return FireboltCore()
+
+    # Handle client credentials authentication
+    if _has_client_credentials():
         return ClientCredentials(
-            credentials.user,  # type: ignore[arg-type]
-            credentials.password,  # type: ignore[arg-type]
+            credentials.client_id,  # type: ignore[arg-type]
+            credentials.client_secret,  # type: ignore[arg-type]
         )
+
+    # Handle username/password authentication
+    if _has_user_password():
+        if _is_email_auth():
+            return UsernamePassword(
+                credentials.user,  # type: ignore[arg-type]
+                credentials.password,  # type: ignore[arg-type]
+            )
+        else:
+            return ClientCredentials(
+                credentials.user,  # type: ignore[arg-type]
+                credentials.password,  # type: ignore[arg-type]
+            )
+
+    # If we reach here, no valid authentication method was found
+    raise DbtConfigError(
+        'No valid authentication method found. Provide either:\n'
+        '- client_id and client_secret\n'
+        '- user and password\n'
+        '- or use url for Firebolt Core connection'
+    )

{dbt_firebolt-1.9.4 → dbt_firebolt-1.11.0}/dbt/adapters/firebolt/impl.py

@@ -313,7 +313,8 @@ class FireboltAdapter(SQLAdapter):
             names = sorted((self.quote(n) for n in column_names))
 
         where_expressions = [
-            f'{relation_a}.{name} = {relation_b}.{name}' for name in names
+            f'{relation_a}.{name} IS NOT DISTINCT FROM {relation_b}.{name}'
+            for name in names
         ]
         where_clause = ' AND '.join(where_expressions)
         columns_csv = ', '.join(names)

{dbt_firebolt-1.9.4 → dbt_firebolt-1.11.0}/dbt/include/firebolt/macros/materializations/models/incremental/strategies.sql

@@ -19,6 +19,8 @@
     {{ get_insert_overwrite_sql(source, target, dest_columns) }}
   {%- elif strategy == 'delete+insert' -%}
     {% do return(get_delete_insert_merge_sql(target, source, unique_key, dest_columns, incremental_predicates)) %}
+  {%- elif strategy == 'merge' -%}
+    {{ get_merge_sql(target, source, unique_key, dest_columns, incremental_predicates) }}
   {%- elif strategy is not none -%}
     {% do exceptions.raise_compiler_error('Model %s has incremental strategy %s '
                                           'specified, but that strategy is not '

{dbt_firebolt-1.9.4 → dbt_firebolt-1.11.0}/dbt/include/firebolt/macros/materializations/seed.sql

@@ -7,9 +7,15 @@
 {% macro firebolt__create_csv_table(model, agate_table) %}
     {%- set column_override = model['config'].get('column_types', {}) -%}
     {%- set quote_seed_column = model['config'].get('quote_columns', None) -%}
+    {%- set is_firebolt_core = target.url is defined and target.url -%}
+    {%- set default_table_type = 'fact' if is_firebolt_core else 'dimension' -%}
+    {%- set table_type = config.get(
+    'table_type',
+    default = default_table_type
+    ) | upper -%}
     {% set sql %}
 
-      CREATE DIMENSION TABLE IF NOT EXISTS {{ this.render() }} (
+      CREATE {{ table_type }} TABLE IF NOT EXISTS {{ this.render() }} (
           {%- for col_name in agate_table.column_names -%}
               {%- set inferred_type = adapter.convert_type(agate_table, loop.index0) -%}
               {%- set type = column_override.get(col_name, inferred_type) -%}

{dbt_firebolt-1.9.4 → dbt_firebolt-1.11.0}/dbt/include/firebolt/macros/relations/table/create.sql

@@ -28,9 +28,11 @@
         {%- do adapter.drop_relation(relation) -%}
     {%- endif -%}
 
+    {%- set is_firebolt_core = target.url is defined and target.url -%}
+    {%- set default_table_type = 'fact' if is_firebolt_core else 'dimension' -%}
     {%- set table_type = config.get(
         'table_type',
-        default = 'dimension'
+        default = default_table_type
     ) | upper -%}
     {%- set primary_index = config.get('primary_index') -%}
     {%- set incremental_strategy = config.get('incremental_strategy') -%}

{dbt_firebolt-1.9.4 → dbt_firebolt-1.11.0/dbt_firebolt.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbt_firebolt
-Version: 1.9.4
+Version: 1.11.0
 Summary: The Firebolt adapter plugin for dbt (data build tool)
 Home-page: https://github.com/firebolt-db/dbt-firebolt
 Author: Firebolt
@@ -21,7 +21,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: dbt-adapters<2.0,>=1.0
 Requires-Dist: dbt-core>=1.8.0
-Requires-Dist: firebolt-sdk>=1.8.1
+Requires-Dist: firebolt-sdk>=1.13.0
 Requires-Dist: pydantic>=0.23
 Provides-Extra: dev
 Requires-Dist: allure-pytest==2.*; extra == "dev"
@@ -77,7 +77,7 @@ The table below shows which dbt and Firebolt features are supported by the adapt
 | Incremental materializations - append | :white_check_mark: |
 | Incremental materializations - insert_overwrite | :white_check_mark: |
 | Incremental materializations - delete+insert | :white_check_mark: |
-| Incremental materializations - merge | :x: |
+| Incremental materializations - merge | :white_check_mark: |
 | Snapshots                    | :white_check_mark: |
 | Seeds                        | :white_check_mark: |
 | Tests                        | :white_check_mark: |

{dbt_firebolt-1.9.4 → dbt_firebolt-1.11.0}/dbt_firebolt.egg-info/requires.txt

@@ -1,6 +1,6 @@
 dbt-adapters<2.0,>=1.0
 dbt-core>=1.8.0
-firebolt-sdk>=1.8.1
+firebolt-sdk>=1.13.0
 pydantic>=0.23
 
 [dev]

{dbt_firebolt-1.9.4 → dbt_firebolt-1.11.0}/setup.cfg

@@ -27,7 +27,7 @@ packages = find_namespace:
 install_requires = 
 	dbt-adapters>=1.0,<2.0
 	dbt-core>=1.8.0
-	firebolt-sdk>=1.8.1
+	firebolt-sdk>=1.13.0
 	pydantic>=0.23
 python_requires = >=3.8
 include_package_data = True