dbt-sqlserver 1.8.6__tar.gz → 1.9.0__tar.gz

{dbt-sqlserver-1.8.6/dbt_sqlserver.egg-info → dbt-sqlserver-1.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbt-sqlserver
-Version: 1.8.6
+Version: 1.9.0
 Summary: A Microsoft SQL Server adapter plugin for dbt
 Home-page: https://github.com/dbt-msft/dbt-sqlserver
 Author: Mikael Ene, Anders Swanson, Sam Debruyn, Cor Zuurmond, Cody Scott

dbt-sqlserver-1.9.0/dbt/adapters/sqlserver/__version__.py

@@ -0,0 +1 @@
+version = "1.9.0"

{dbt-sqlserver-1.8.6 → dbt-sqlserver-1.9.0}/dbt/adapters/sqlserver/sqlserver_adapter.py

@@ -59,3 +59,9 @@ class SQLServerAdapter(FabricAdapter):
     @classmethod
     def date_function(cls):
         return "getdate()"
+
+    def valid_incremental_strategies(self):
+        """The set of standard builtin strategies which this adapter supports out-of-the-box.
+        Not used to validate custom strategies defined by end users.
+        """
+        return ["append", "delete+insert", "merge", "microbatch"]

{dbt-sqlserver-1.8.6 → dbt-sqlserver-1.9.0}/dbt/adapters/sqlserver/sqlserver_relation.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass, field
 from typing import Optional, Type
 
-from dbt.adapters.base.relation import BaseRelation
+from dbt.adapters.base.relation import BaseRelation, EventTimeFilter
 from dbt.adapters.utils import classproperty
 from dbt_common.exceptions import DbtRuntimeError
 
@@ -49,3 +49,28 @@ class SQLServerRelation(BaseRelation):
 
     def relation_max_name_length(self):
         return MAX_CHARACTERS_IN_IDENTIFIER
+
+    def _render_event_time_filtered(self, event_time_filter: EventTimeFilter) -> str:
+        """
+        Returns "" if start and end are both None
+        """
+        filter = ""
+        if event_time_filter.start and event_time_filter.end:
+            filter = (
+                f"{event_time_filter.field_name} >="
+                f" cast('{event_time_filter.start}' as datetimeoffset)"
+                f" and {event_time_filter.field_name} <"
+                f" cast('{event_time_filter.end}' as datetimeoffset)"
+            )
+        elif event_time_filter.start:
+            filter = (
+                f"{event_time_filter.field_name} >="
+                f" cast('{event_time_filter.start}' as datetimeoffset)"
+            )
+        elif event_time_filter.end:
+            filter = (
+                f"{event_time_filter.field_name} <"
+                f" cast('{event_time_filter.end}' as datetimeoffset)"
+            )
+
+        return filter

{dbt-sqlserver-1.8.6 → dbt-sqlserver-1.9.0}/dbt/include/sqlserver/dbt_project.yml

@@ -1,5 +1,5 @@
 name: dbt_sqlserver
-version: 1.8.0
+version: 1.9.0
 config-version: 2
 
 macro-paths: ["macros"]

{dbt-sqlserver-1.8.6 → dbt-sqlserver-1.9.0}/dbt/include/sqlserver/macros/adapter/columns.sql

@@ -1,3 +1,28 @@
+{% macro sqlserver__get_empty_subquery_sql(select_sql, select_sql_header=none) %}
+    {% if select_sql.strip().lower().startswith('with') %}
+        {{ select_sql }}
+    {% else -%}
+        select * from (
+        {{ select_sql }}
+    ) dbt_sbq_tmp
+    where 1 = 0
+    {%- endif -%}
+
+{% endmacro %}
+
+{% macro sqlserver__get_columns_in_query(select_sql) %}
+    {% set query_label = apply_label() %}
+    {% call statement('get_columns_in_query', fetch_result=True, auto_begin=False) -%}
+        select TOP 0 * from (
+            {{ select_sql }}
+        ) as __dbt_sbq
+        where 0 = 1
+        {{ query_label }}
+    {% endcall %}
+
+    {{ return(load_result('get_columns_in_query').table.columns | map(attribute='name') | list) }}
+{% endmacro %}
+
 {% macro sqlserver__alter_column_type(relation, column_name, new_column_type) %}
 
     {%- set tmp_column = column_name + "__dbt_alter" -%}

dbt-sqlserver-1.9.0/dbt/include/sqlserver/macros/materializations/models/incremental/merge.sql

@@ -0,0 +1,31 @@
+{% macro sqlserver__get_incremental_microbatch_sql(arg_dict) %}
+    {%- set target = arg_dict["target_relation"] -%}
+    {%- set source = arg_dict["temp_relation"] -%}
+    {%- set dest_columns = arg_dict["dest_columns"] -%}
+    {%- set incremental_predicates = [] if arg_dict.get('incremental_predicates') is none else arg_dict.get('incremental_predicates') -%}
+
+    {#-- Add additional incremental_predicates to filter for batch --#}
+    {% if model.config.get("__dbt_internal_microbatch_event_time_start") -%}
+    {{ log("incremental append event start time > DBT_INTERNAL_TARGET." ~ model.config.event_time ~ " >= cast('" ~ model.config.__dbt_internal_microbatch_event_time_start ~ "' as datetimeoffset)") }}
+        {% do incremental_predicates.append("DBT_INTERNAL_TARGET." ~ model.config.event_time ~ " >= cast('" ~ model.config.__dbt_internal_microbatch_event_time_start ~ "' as datetimeoffset)") %}
+    {% endif %}
+    {% if model.config.__dbt_internal_microbatch_event_time_end -%}
+    {{ log("incremental append event end time < DBT_INTERNAL_TARGET." ~ model.config.event_time ~ " < cast('" ~ model.config.__dbt_internal_microbatch_event_time_end ~ "' as datetimeoffset)") }}
+        {% do incremental_predicates.append("DBT_INTERNAL_TARGET." ~ model.config.event_time ~ " < cast('" ~ model.config.__dbt_internal_microbatch_event_time_end ~ "' as datetimeoffset)") %}
+    {% endif %}
+    {% do arg_dict.update({'incremental_predicates': incremental_predicates}) %}
+
+    delete DBT_INTERNAL_TARGET from {{ target }} AS DBT_INTERNAL_TARGET
+    where (
+    {% for predicate in incremental_predicates %}
+        {%- if not loop.first %}and {% endif -%} {{ predicate }}
+    {% endfor %}
+    );
+
+    {%- set dest_cols_csv = get_quoted_csv(dest_columns | map(attribute="name")) -%}
+    insert into {{ target }} ({{ dest_cols_csv }})
+    (
+        select {{ dest_cols_csv }}
+        from {{ source }}
+    )
+{% endmacro %}

{dbt-sqlserver-1.8.6 → dbt-sqlserver-1.9.0}/dbt/include/sqlserver/macros/materializations/tests.sql

@@ -8,7 +8,7 @@
   END
 
   {% set testview %}
-    [{{ target.schema }}.testview_{{ range(1300, 19000) | random }}]
+    [{{ target.schema }}].[testview_{{ local_md5(main_sql) }}_{{ range(1300, 19000) | random }}]
   {% endset %}
 
   {% set sql = main_sql.replace("'", "''")%}

{dbt-sqlserver-1.8.6 → dbt-sqlserver-1.9.0}/dbt/include/sqlserver/macros/materializations/unit_tests.sql

@@ -7,13 +7,13 @@ EXEC('CREATE SCHEMA [{{ target.schema }}]')
 END
 
 {% set test_view %}
-    [{{ target.schema }}.testview_{{ range(1300, 19000) | random }}]
+    [{{ target.schema }}].[testview_{{ local_md5(main_sql) }}_{{ range(1300, 19000) | random }}]
 {% endset %}
 {% set test_sql = main_sql.replace("'", "''")%}
 EXEC('create view {{test_view}} as {{ test_sql }};')
 
 {% set expected_view %}
-    [{{ target.schema }}.expectedview_{{ range(1300, 19000) | random }}]
+    [{{ target.schema }}].[expectedview_{{ local_md5(expected_fixture_sql) }}_{{ range(1300, 19000) | random }}]
 {% endset %}
 {% set expected_sql = expected_fixture_sql.replace("'", "''")%}
 EXEC('create view {{expected_view}} as {{ expected_sql }};')

{dbt-sqlserver-1.8.6 → dbt-sqlserver-1.9.0/dbt_sqlserver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbt-sqlserver
-Version: 1.8.6
+Version: 1.9.0
 Summary: A Microsoft SQL Server adapter plugin for dbt
 Home-page: https://github.com/dbt-msft/dbt-sqlserver
 Author: Mikael Ene, Anders Swanson, Sam Debruyn, Cor Zuurmond, Cody Scott

{dbt-sqlserver-1.8.6 → dbt-sqlserver-1.9.0}/dbt_sqlserver.egg-info/SOURCES.txt

@@ -26,6 +26,7 @@ dbt/include/sqlserver/macros/adapter/validate_sql.sql
 dbt/include/sqlserver/macros/materializations/tests.sql
 dbt/include/sqlserver/macros/materializations/unit_tests.sql
 dbt/include/sqlserver/macros/materializations/models/incremental/incremental.sql
+dbt/include/sqlserver/macros/materializations/models/incremental/merge.sql
 dbt/include/sqlserver/macros/materializations/models/table/table.sql
 dbt/include/sqlserver/macros/materializations/models/view/view.sql
 dbt/include/sqlserver/macros/materializations/snapshot/helpers.sql

dbt-sqlserver-1.9.0/dbt_sqlserver.egg-info/requires.txt

@@ -0,0 +1,4 @@
+dbt-fabric==1.9.3
+dbt-core<2.0,>=1.9.0
+dbt-common<2.0,>=1.0
+dbt-adapters<2.0,>=1.11.0

{dbt-sqlserver-1.8.6 → dbt-sqlserver-1.9.0}/setup.py

@@ -8,7 +8,7 @@ from setuptools.command.install import install
 
 package_name = "dbt-sqlserver"
 authors_list = ["Mikael Ene", "Anders Swanson", "Sam Debruyn", "Cor Zuurmond", "Cody Scott"]
-dbt_version = "1.8"
+dbt_version = "1.9"
 description = """A Microsoft SQL Server adapter plugin for dbt"""
 
 this_directory = os.path.abspath(os.path.dirname(__file__))
@@ -66,10 +66,10 @@ setup(
     packages=find_namespace_packages(include=["dbt", "dbt.*"]),
     include_package_data=True,
     install_requires=[
-        "dbt-fabric>=1.8.0,<1.9.0",
-        "dbt-core>=1.8.0,<1.9.0",
+        "dbt-fabric==1.9.3",
+        "dbt-core>=1.9.0,<2.0",
         "dbt-common>=1.0,<2.0",
-        "dbt-adapters>=1.1.1,<2.0",
+        "dbt-adapters>=1.11.0,<2.0",
     ],
     cmdclass={
         "verify": VerifyVersionCommand,

dbt-sqlserver-1.8.6/dbt/adapters/sqlserver/__version__.py

@@ -1 +0,0 @@
-version = "1.8.6"

dbt-sqlserver-1.8.6/dbt_sqlserver.egg-info/requires.txt

@@ -1,4 +0,0 @@
-dbt-fabric<1.9.0,>=1.8.0
-dbt-core<1.9.0,>=1.8.0
-dbt-common<2.0,>=1.0
-dbt-adapters<2.0,>=1.1.1