dbt-firebolt 1.9.4__py3-none-any.whl → 1.11.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.9.4"
+__version__ = "1.11.0"
 
 Plugin = AdapterPlugin(
     adapter=FireboltAdapter,  # type: ignore

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/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/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/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/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.dist-info → dbt_firebolt-1.11.0.dist-info}/METADATA

@@ -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.dist-info → dbt_firebolt-1.11.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
-dbt/adapters/firebolt/__init__.py,sha256=2mzeaeqKIIFSrISgifexUgK6B1CAd-F3yGKujM-hHbE,411
+dbt/adapters/firebolt/__init__.py,sha256=FJYFV8XHGfD45cl5tTQEipEwCfklXxAHwo4_XqisDzg,412
 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=dNdha5dDEYUPhLvlSq8_ftbBA1hiqnUCBukt6wLuZH4,7976
-dbt/adapters/firebolt/impl.py,sha256=eIqnXzoMoyHq2lp1yMz7O62WJ0apM16H8IssTTwDMiw,15075
+dbt/adapters/firebolt/connections.py,sha256=W2dwwtuQAUTbpmV2gKhYhcmq9j6xB0BwyWmypSQBY7s,8629
+dbt/adapters/firebolt/impl.py,sha256=zH7X-vHDCbv_c7yHt_nS6JMN850THaE3rABqCRn76I4,15106
 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
@@ -16,7 +16,7 @@ dbt/include/firebolt/macros/dbt_external_tables/dropif.sql,sha256=-kZzUVgC6Bcof7
 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/seed.sql,sha256=QXL5AugRq6sRv1XP-QOgInjvSkXErfxvsGoQXn1ULXk,1830
 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
@@ -26,13 +26,13 @@ dbt/include/firebolt/macros/materializations/models/incremental/incremental.sql,
 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=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=GvqmGbwuxbAY9FBQp3XGzabHWINUaBM8CxVY-aLn4Jk,5928
+dbt/include/firebolt/macros/materializations/models/incremental/strategies.sql,sha256=2-rv3ROoG54PgjARZBjluGjOkw4I1XUxClNmmmVCvyY,6053
 dbt/include/firebolt/macros/relations/materialized_view/alter.sql,sha256=QDMCFwJZZfz7mrx6UcyDICSWAS3zQTs52_urcsW8klU,286
 dbt/include/firebolt/macros/relations/materialized_view/create.sql,sha256=xthF0oHCyC4xu8IKEtoLJIyWh3p-JGBS5Awc3J-sQ8Y,178
 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=5FK3XOICE-9LGojHzh0pjCy5wO-RKyeytzkEQmYT7zY,2507
+dbt/include/firebolt/macros/relations/table/create.sql,sha256=guTzPeg1RHf3OksEXDPBNKjhQngtwF5fxv9Yhvq6Bag,2667
 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
@@ -54,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.9.4.dist-info/LICENSE,sha256=Nn0EGvW3qmoZpBV_JVM3iPukFf3RiNCIizrWe_2oTHk,11354
-dbt_firebolt-1.9.4.dist-info/METADATA,sha256=3-AADXMb9idiZhJ0qG0jvHJU33WkHs3EgPB9Y2UygH0,5237
-dbt_firebolt-1.9.4.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-dbt_firebolt-1.9.4.dist-info/top_level.txt,sha256=B2YH4he17ajilEWOGCKHbRcEJlCuZKwCcgFcLPntLsE,4
-dbt_firebolt-1.9.4.dist-info/RECORD,,
+dbt_firebolt-1.11.0.dist-info/LICENSE,sha256=Nn0EGvW3qmoZpBV_JVM3iPukFf3RiNCIizrWe_2oTHk,11354
+dbt_firebolt-1.11.0.dist-info/METADATA,sha256=HcSPiaFApH7h-wiri-tQsOhkNxJ-ye1zrmKpypDW1SE,5254
+dbt_firebolt-1.11.0.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+dbt_firebolt-1.11.0.dist-info/top_level.txt,sha256=B2YH4he17ajilEWOGCKHbRcEJlCuZKwCcgFcLPntLsE,4
+dbt_firebolt-1.11.0.dist-info/RECORD,,