V 1.9.6 update (#315)

prdpsvs · web-flow · commit 9882d7a39265 · 2025-08-10T14:24:58.000-07:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,5 +1,5 @@
 default_language_version:
-  python: python3.11.9
+  python: python3.12.0
 
 repos:
   - repo: 'https://github.com/pre-commit/pre-commit-hooks'
@@ -32,12 +32,12 @@ repos:
     rev: v0.3.1
     hooks:
       - id: absolufy-imports
-  - repo: 'https://github.com/hadialqattan/pycln'
-    rev: v2.1.3
-    hooks:
-      - id: pycln
-        args:
-          - '--all'
+  # - repo: 'https://github.com/hadialqattan/pycln'
+  #   rev: v2.1.3
+  #   hooks:
+  #     - id: pycln
+  #       args:
+  #         - '--all'
   - repo: 'https://github.com/pycqa/isort'
     rev: 5.12.0
     hooks:
diff --git a/.python-version b/.python-version
@@ -0,0 +1 @@
+3.12.0
diff --git a/dbt/adapters/fabric/__version__.py b/dbt/adapters/fabric/__version__.py
@@ -1 +1 @@
-version = "1.9.5"
+version = "1.9.6"
diff --git a/dbt/adapters/fabric/fabric_adapter.py b/dbt/adapters/fabric/fabric_adapter.py
@@ -11,6 +11,7 @@
 from dbt.adapters.events.types import SchemaCreation
 from dbt.adapters.sql import SQLAdapter
 from dbt.adapters.sql.impl import CREATE_SCHEMA_MACRO_NAME
+from dbt_common.behavior_flags import BehaviorFlag
 from dbt_common.contracts.constraints import (
     ColumnLevelConstraint,
     ConstraintType,
@@ -44,6 +45,16 @@ class FabricAdapter(SQLAdapter):
         ConstraintType.foreign_key: ConstraintSupport.ENFORCED,
     }
 
+    @property
+    def _behavior_flags(self) -> List[BehaviorFlag]:
+        return [
+            {
+                "name": "empty",
+                "default": False,
+                "description": "When enabled, table and view materializations will be created as empty structures (no data).",
+            },
+        ]
+
     @available.parse(lambda *a, **k: [])
     def get_column_schema_from_query(self, sql: str) -> List[BaseColumn]:
         """Get a list of the Columns with names and data types from the given sql."""
diff --git a/dbt/adapters/fabric/fabric_column.py b/dbt/adapters/fabric/fabric_column.py
@@ -1,15 +1,37 @@
 from typing import Any, ClassVar, Dict
 
 from dbt.adapters.base import Column
+from dbt_common.exceptions import DbtRuntimeError
 
 
 class FabricColumn(Column):
     TYPE_LABELS: ClassVar[Dict[str, str]] = {
         "STRING": "VARCHAR(8000)",
+        "VARCHAR": "VARCHAR(8000)",
+        "CHAR": "CHAR(1)",
+        "NCHAR": "CHAR(1)",
+        "NVARCHAR": "VARCHAR(8000)",
         "TIMESTAMP": "DATETIME2(6)",
+        "DATETIME2": "DATETIME2(6)",
+        "DATETIME2(6)": "DATETIME2(6)",
+        "DATE": "DATE",
+        "TIME": "TIME(6)",
         "FLOAT": "FLOAT",
+        "REAL": "REAL",
+        "INT": "INT",
         "INTEGER": "INT",
+        "BIGINT": "BIGINT",
+        "SMALLINT": "SMALLINT",
+        "TINYINT": "SMALLINT",
+        "BIT": "BIT",
         "BOOLEAN": "BIT",
+        "DECIMAL": "DECIMAL",
+        "NUMERIC": "NUMERIC",
+        "MONEY": "DECIMAL",
+        "SMALLMONEY": "DECIMAL",
+        "UNIQUEIDENTIFIER": "UNIQUEIDENTIFIER",
+        "VARBINARY": "VARBINARY(MAX)",
+        "BINARY": "BINARY(1)",
     }
 
     @classmethod
@@ -18,3 +40,43 @@ def string_type(cls, size: int) -> str:
 
     def literal(self, value: Any) -> str:
         return "cast('{}' as {})".format(value, self.data_type)
+
+    @property
+    def data_type(self) -> str:
+        # Always enforce datetime2 precision
+        if self.dtype.lower() == "datetime2":
+            return "datetime2(6)"
+        if self.is_string():
+            return self.string_type(self.string_size())
+        elif self.is_numeric():
+            return self.numeric_type(self.dtype, self.numeric_precision, self.numeric_scale)
+        else:
+            return self.dtype
+
+    def is_string(self) -> bool:
+        return self.dtype.lower() in ["varchar", "char"]
+
+    def is_number(self):
+        return any([self.is_integer(), self.is_numeric(), self.is_float()])
+
+    def is_float(self):
+        return self.dtype.lower() in ["float", "real"]
+
+    def is_integer(self) -> bool:
+        return self.dtype.lower() in ["int", "integer", "bigint", "smallint", "tinyint"]
+
+    def is_numeric(self) -> bool:
+        return self.dtype.lower() in ["numeric", "decimal", "money", "smallmoney"]
+
+    def string_size(self) -> int:
+        if not self.is_string():
+            raise DbtRuntimeError("Called string_size() on non-string field!")
+        if self.char_size is None:
+            return 8000
+        else:
+            return int(self.char_size)
+
+    def can_expand_to(self, other_column: "FabricColumn") -> bool:
+        if not self.is_string() or not other_column.is_string():
+            return False
+        return other_column.string_size() > self.string_size()
diff --git a/dbt/adapters/fabric/fabric_connection_manager.py b/dbt/adapters/fabric/fabric_connection_manager.py
@@ -132,7 +132,9 @@ def get_cli_access_token(credentials: FabricCredentials) -> AccessToken:
         Access token.
     """
     _ = credentials
-    token = AzureCliCredential().get_token(AZURE_CREDENTIAL_SCOPE)
+    token = AzureCliCredential().get_token(
+        AZURE_CREDENTIAL_SCOPE, timeout=getattr(credentials, "login_timeout", None)
+    )
     return token
 
 
@@ -150,7 +152,9 @@ def get_auto_access_token(credentials: FabricCredentials) -> AccessToken:
     out : AccessToken
         The access token.
     """
-    token = DefaultAzureCredential().get_token(AZURE_CREDENTIAL_SCOPE)
+    token = DefaultAzureCredential().get_token(
+        AZURE_CREDENTIAL_SCOPE, timeout=getattr(credentials, "login_timeout", None)
+    )
     return token
 
 
@@ -168,7 +172,9 @@ def get_environment_access_token(credentials: FabricCredentials) -> AccessToken:
     out : AccessToken
         The access token.
     """
-    token = EnvironmentCredential().get_token(AZURE_CREDENTIAL_SCOPE)
+    token = EnvironmentCredential().get_token(
+        AZURE_CREDENTIAL_SCOPE, timeout=getattr(credentials, "login_timeout", None)
+    )
     return token
 
 
diff --git a/dbt/adapters/fabric/fabric_relation.py b/dbt/adapters/fabric/fabric_relation.py
@@ -2,10 +2,13 @@
 from typing import Optional, Type
 
 from dbt.adapters.base.relation import BaseRelation
+from dbt.adapters.events.logging import AdapterLogger
 from dbt.adapters.utils import classproperty
 
 from dbt.adapters.fabric.relation_configs import FabricQuotePolicy, FabricRelationType
 
+logger = AdapterLogger("fabric")
+
 
 @dataclass(frozen=True, eq=False, repr=False)
 class FabricRelation(BaseRelation):
@@ -17,12 +20,16 @@ class FabricRelation(BaseRelation):
     def get_relation_type(cls) -> Type[FabricRelationType]:
         return FabricRelationType
 
-    @classmethod
     def render_limited(self) -> str:
         rendered = self.render()
         if self.limit is None:
             return rendered
         elif self.limit == 0:
-            return f"(select * from {rendered} where 1=0) {self._render_limited_alias()}"
+            return f"(select * from {rendered} where 1=0) AS {self._render_limited_alias()}"
         else:
-            return f"(select TOP {self.limit} * from {rendered}) {self._render_limited_alias()}"
+            return f"(select TOP {self.limit} * from {rendered}) AS {self._render_limited_alias()}"
+
+    def _render_limited_alias(
+        self,
+    ) -> str:
+        return "_dbt_limit_subq"
diff --git a/dbt/include/fabric/macros/adapters/columns.sql b/dbt/include/fabric/macros/adapters/columns.sql
@@ -66,7 +66,7 @@
         FROM
         (
             SELECT
-            CAST(c.COLUMN_NAME AS VARCHAR(128)) AS ColumnName
+            '"' + CAST(c.COLUMN_NAME AS VARCHAR(128)) + '"' AS ColumnName
             FROM INFORMATION_SCHEMA.TABLES t
             JOIN INFORMATION_SCHEMA.COLUMNS c
                 ON t.TABLE_SCHEMA = c.TABLE_SCHEMA
@@ -87,7 +87,7 @@
 
     {% set tempTable %}
         CREATE TABLE {{tempTableName}}
-        AS SELECT {{query_result_text}}, CAST({{ column_name }} AS {{new_column_type}}) AS {{column_name}} FROM {{ relation.schema }}.{{ relation.identifier }}
+        AS SELECT {{query_result_text}}, CAST("{{ column_name }}" AS {{new_column_type}}) AS "{{column_name}}" FROM {{ relation.schema }}.{{ relation.identifier }}
         {{ apply_label() }}
     {% endset %}
 
diff --git a/dbt/include/fabric/macros/materializations/models/incremental/incremental.sql b/dbt/include/fabric/macros/materializations/models/incremental/incremental.sql
@@ -37,6 +37,9 @@
     -- Dropping temp view relation
     {{ adapter.drop_relation(tmp_vw_relation) }}
 
+    -- Add constraints including FK relation.
+    {{ build_model_constraints(target_relation) }}
+
   {% else %}
 
     {%- set temp_relation = make_temp_relation(target_relation)-%}
diff --git a/dbt/include/fabric/macros/materializations/models/table/create_table_as.sql b/dbt/include/fabric/macros/materializations/models/table/create_table_as.sql
@@ -16,11 +16,19 @@
             {% endfor %}
         {%endset%}
 
-        INSERT INTO {{relation}} ({{listColumns}})
-        SELECT {{listColumns}} FROM {{tmp_vw_relation}} {{ query_label }}
+        {% if not adapter.behavior.empty.no_warn %}
+            INSERT INTO {{relation}} ({{listColumns}})
+            SELECT {{listColumns}} FROM {{tmp_vw_relation}} {{ query_label }}
+        {% endif %}
+
 
     {%- else %}
         {%- set query_label_option = query_label.replace("'", "''") -%}
-        EXEC('CREATE TABLE {{relation}} AS SELECT * FROM {{tmp_vw_relation}} {{ query_label_option }}');
+        {% if adapter.behavior.empty.no_warn %}
+            EXEC('CREATE TABLE {{relation}} AS SELECT * FROM {{tmp_vw_relation}} WHERE 0=1 {{ query_label_option }}');
+        {% else %}
+            EXEC('CREATE TABLE {{relation}} AS SELECT * FROM {{tmp_vw_relation}} {{ query_label_option }}');
+        {% endif %}
+
     {% endif %}
 {% endmacro %}
diff --git a/dbt/include/fabric/macros/materializations/models/unit_test/unit_test_create_table_as.sql b/dbt/include/fabric/macros/materializations/models/unit_test/unit_test_create_table_as.sql
@@ -0,0 +1,58 @@
+{% macro check_for_nested_cte(sql) %}
+    {% if execute %}  {# Ensure this runs only at execution time #}
+        {% set cleaned_sql = sql | lower | replace("\n", " ") %}  {# Convert to lowercase and remove newlines #}
+        {% set cte_count = cleaned_sql.count("with ") %}  {# Count occurrences of "WITH " #}
+        {% if cte_count > 1 %}
+            {{ return(True) }}
+        {% else %}
+            {{ return(False) }}  {# No nested CTEs found #}
+        {% endif %}
+    {% else %}
+        {{ return(False) }}  {# Return False during parsing #}
+    {% endif %}
+{% endmacro %}
+
+{% macro fabric__unit_test_create_table_as(temporary, relation, sql) -%}
+    {% set query_label = apply_label() %}
+    {% set contract_config = config.get('contract') %}
+    {% set is_nested_cte = check_for_nested_cte(sql) %}
+
+    {% if is_nested_cte %}
+        {{ exceptions.warn(
+            "Nested CTE warning: Nested CTE's do not support CTAS. However, 2-level nested CTEs are supported due to a code bug. Please expect this fix in the future."
+        ) }}
+    {% endif %}
+
+    {% if is_nested_cte and contract_config.enforced %}
+
+        {{ exceptions.raise_compiler_error(
+            "Unit test Materialization error: Since the contract is enforced and the model contains a nested CTE, unit tests cannot be materialized. Please refactor your model or unenforce model and try again."
+        ) }}
+
+    {%- elif not is_nested_cte and contract_config.enforced %}
+
+        CREATE TABLE {{relation}}
+        {{ build_columns_constraints(relation) }}
+        {{ get_assert_columns_equivalent(sql)  }}
+
+        {% set listColumns %}
+            {% for column in model['columns'] %}
+                {{ "["~column~"]" }}{{ ", " if not loop.last }}
+            {% endfor %}
+        {%endset%}
+
+        {% set tmp_vw_relation = relation.incorporate(path={"identifier": relation.identifier ~ '__dbt_tmp_vw'}, type='view')-%}
+        {% do adapter.drop_relation(tmp_vw_relation) %}
+        {{ get_create_view_as_sql(tmp_vw_relation, sql) }}
+
+        INSERT INTO {{relation}} ({{listColumns}})
+        SELECT {{listColumns}} FROM {{tmp_vw_relation}} {{ query_label }}
+
+    {%- else %}
+
+        {%- set query_label_option = query_label.replace("'", "''") -%}
+        {%- set sql_with_quotes = sql.replace("'", "''") -%}
+        EXEC('CREATE TABLE {{relation}} AS {{sql_with_quotes}} {{ query_label_option }}');
+
+    {% endif %}
+{% endmacro %}
diff --git a/dbt/include/fabric/macros/materializations/models/unit_test/unit_test_table.sql b/dbt/include/fabric/macros/materializations/models/unit_test/unit_test_table.sql
@@ -0,0 +1,40 @@
+{%- materialization unit, adapter='fabric' -%}
+
+  {% set relations = [] %}
+
+  {% set expected_rows = config.get('expected_rows') %}
+  {% set expected_sql = config.get('expected_sql') %}
+  {% set tested_expected_column_names = expected_rows[0].keys() if (expected_rows | length ) > 0 else get_columns_in_query(sql) %}
+
+  {%- set target_relation = this.incorporate(type='table') -%}
+  {%- set temp_relation = make_temp_relation(target_relation)-%}
+  {% do run_query(fabric__unit_test_create_table_as(True, temp_relation, get_empty_subquery_sql(sql))) %}
+  {%- set columns_in_relation = adapter.get_columns_in_relation(temp_relation) -%}
+  {%- set column_name_to_data_types = {} -%}
+  {%- set column_name_to_quoted = {} -%}
+  {%- for column in columns_in_relation -%}
+  {%-   do column_name_to_data_types.update({column.name|lower: column.data_type}) -%}
+  {%-   do column_name_to_quoted.update({column.name|lower: column.quoted}) -%}
+  {%- endfor -%}
+
+  {%- set expected_column_names_quoted = [] -%}
+  {%- for column_name in tested_expected_column_names -%}
+  {%-   do expected_column_names_quoted.append(column_name_to_quoted[column_name]) -%}
+  {%- endfor -%}
+
+  {% if not expected_sql %}
+  {%   set expected_sql = get_expected_sql(expected_rows, column_name_to_data_types, column_name_to_quoted) %}
+  {% endif %}
+  {% set unit_test_sql = get_unit_test_sql(sql, expected_sql, expected_column_names_quoted) %}
+
+  {% call statement('main', fetch_result=True) -%}
+
+    {{ unit_test_sql }}
+
+  {%- endcall %}
+
+  {% do adapter.drop_relation(temp_relation) %}
+
+  {{ return({'relations': relations}) }}
+
+{%- endmaterialization -%}
diff --git a/dbt/include/fabric/macros/materializations/seeds/helpers.sql b/dbt/include/fabric/macros/materializations/seeds/helpers.sql
diff --git a/setup.py b/setup.py
diff --git a/tests/functional/adapter/test_empty.py b/tests/functional/adapter/test_empty.py
diff --git a/tests/functional/adapter/test_timestamps.py b/tests/functional/adapter/test_timestamps.py
