Merge pull request #201 from microsoft/v1.8.8-draft

Added support for truncate, fixed seed batch calculation and fixed dbt-show errors

dbt/adapters/fabric/__version__.py

@@ -1 +1 @@
-version = "1.8.7"
+version = "1.8.8"

dbt/include/fabric/macros/adapters/relation.sql

@@ -49,18 +49,8 @@
   {%- endcall %}
 {% endmacro %}
 
--- DROP fabric__truncate_relation when TRUNCATE TABLE is supported
 {% macro fabric__truncate_relation(relation) -%}
-
-  {% set tempTableName %}
-    {{ relation.include(database=False).identifier.replace("#", "") }}_{{ range(21000, 109000) | random }}
-  {% endset %}
-  {{ log("Truncate Statement is not supported, Using random table as a temp table. - " ~ tempTableName) }}
   {% call statement('truncate_relation') -%}
-    CREATE TABLE {{ tempTableName }} AS SELECT * FROM {{ relation }} WHERE 1=2
-    EXEC('DROP TABLE IF EXISTS {{ relation.include(database=False) }};');
-    EXEC('CREATE TABLE {{ relation.include(database=False) }} AS SELECT * FROM {{ tempTableName }};');
-    EXEC('DROP TABLE IF EXISTS {{ tempTableName }};');
-  {%- endcall %}
-
+        truncate table {{ relation }}
+    {%- endcall %}
 {% endmacro %}

dbt/include/fabric/macros/adapters/show.sql

@@ -1,14 +1,24 @@
-{% macro fabric__get_limit_subquery_sql(sql, limit) %}
+{% macro fabric__get_limit_sql(sql, limit) %}
 
-    {% if sql.strip().lower().startswith('with') %}
-        {{ sql }} order by (select null)
-    offset 0 rows fetch first {{ limit }} rows only
-    {% else -%}
-        select *
-        from (
+    {% if limit == -1 or limit is none %}
+        {% if sql.strip().lower().startswith('with') %}
             {{ sql }}
-        ) as model_limit_subq order by (select null)
-    offset 0 rows fetch first {{ limit }} rows only
+        {% else -%}
+            select *
+            from (
+                {{ sql }}
+            ) as model_limit_subq
+        {%- endif -%}
+    {% else -%}
+        {% if sql.strip().lower().startswith('with') %}
+            {{ sql }} order by (select null)
+            offset 0 rows fetch first {{ limit }} rows only
+        {% else -%}
+            select *
+            from (
+                {{ sql }}
+            ) as model_limit_subq order by (select null)
+            offset 0 rows fetch first {{ limit }} rows only
+        {%- endif -%}
     {%- endif -%}
-
 {% endmacro %}

dbt/include/fabric/macros/materializations/seeds/helpers.sql

@@ -14,6 +14,7 @@
     #}
     {% set max_batch_size = get_batch_size() %}
     {% set calculated_batch = (2100 / num_columns)-1|int %}
+    {% set calculated_batch = ((2100 / num_columns)-1)|int %}
     {% set batch_size = [max_batch_size, calculated_batch] | min %}
 
     {{ return(batch_size) }}