dbt-sqlserver 1.8.0rc1__tar.gz → 1.8.1__tar.gz

{dbt-sqlserver-1.8.0rc1/dbt_sqlserver.egg-info → dbt-sqlserver-1.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbt-sqlserver
-Version: 1.8.0rc1
+Version: 1.8.1
 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
@@ -42,9 +42,9 @@ Join us on the [dbt Slack](https://getdbt.slack.com/archives/CMRMDDQ9W) to ask q
 ## Installation
 
 This adapter requires the Microsoft ODBC driver to be installed:
-[Windows](https://docs.microsoft.com/nl-be/sql/connect/odbc/download-odbc-driver-for-sql-server?view=sql-server-ver16#download-for-windows) |
-[macOS](https://docs.microsoft.com/nl-be/sql/connect/odbc/linux-mac/install-microsoft-odbc-driver-sql-server-macos?view=sql-server-ver16) |
-[Linux](https://docs.microsoft.com/nl-be/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver16)
+[Windows](https://docs.microsoft.com/en-us/sql/connect/odbc/download-odbc-driver-for-sql-server?view=sql-server-ver16#download-for-windows) |
+[macOS](https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/install-microsoft-odbc-driver-sql-server-macos?view=sql-server-ver16) |
+[Linux](https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver16)
 
 <details><summary>Debian/Ubuntu</summary>
 <p>

{dbt-sqlserver-1.8.0rc1 → dbt-sqlserver-1.8.1}/README.md

@@ -17,9 +17,9 @@ Join us on the [dbt Slack](https://getdbt.slack.com/archives/CMRMDDQ9W) to ask q
 ## Installation
 
 This adapter requires the Microsoft ODBC driver to be installed:
-[Windows](https://docs.microsoft.com/nl-be/sql/connect/odbc/download-odbc-driver-for-sql-server?view=sql-server-ver16#download-for-windows) |
-[macOS](https://docs.microsoft.com/nl-be/sql/connect/odbc/linux-mac/install-microsoft-odbc-driver-sql-server-macos?view=sql-server-ver16) |
-[Linux](https://docs.microsoft.com/nl-be/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver16)
+[Windows](https://docs.microsoft.com/en-us/sql/connect/odbc/download-odbc-driver-for-sql-server?view=sql-server-ver16#download-for-windows) |
+[macOS](https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/install-microsoft-odbc-driver-sql-server-macos?view=sql-server-ver16) |
+[Linux](https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver16)
 
 <details><summary>Debian/Ubuntu</summary>
 <p>

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

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

{dbt-sqlserver-1.8.0rc1 → dbt-sqlserver-1.8.1}/dbt/adapters/sqlserver/sqlserver_connections.py

@@ -130,7 +130,7 @@ class SQLServerConnectionManager(FabricConnectionManager):
 
         plugin_version = __version__.version
         application_name = f"dbt-{credentials.type}/{plugin_version}"
-        con_str.append(f"Application Name={application_name}")
+        con_str.append(f"APP={application_name}")
 
         con_str_concat = ";".join(con_str)
 

{dbt-sqlserver-1.8.0rc1 → dbt-sqlserver-1.8.1}/dbt/include/sqlserver/macros/adapter/indexes.sql

@@ -108,6 +108,7 @@
         inner join sys.tables {{ information_schema_hints() }}
         on sys.indexes.object_id = sys.tables.object_id
         where sys.indexes.[name] is not null
+        and SCHEMA_NAME(sys.tables.schema_id) = '{{ this.schema }}'
         and sys.tables.[name] = '{{ this.table }}'
         for xml path('')
     ); exec sp_executesql @drop_remaining_indexes_last;

{dbt-sqlserver-1.8.0rc1 → dbt-sqlserver-1.8.1}/dbt/include/sqlserver/macros/materializations/models/incremental/incremental.sql

@@ -59,6 +59,7 @@
     {% set strategy_arg_dict = ({'target_relation': target_relation, 'temp_relation': temp_relation, 'unique_key': unique_key, 'dest_columns': dest_columns, 'incremental_predicates': incremental_predicates }) %}
     {% set build_sql = strategy_sql_macro_func(strategy_arg_dict) %}
 
+    {% do to_drop.append(temp_relation) %}
   {% endif %}
 
   {% call statement("main") %}

{dbt-sqlserver-1.8.0rc1 → dbt-sqlserver-1.8.1}/dbt/include/sqlserver/macros/materializations/snapshot/snapshot.sql

@@ -35,6 +35,7 @@
 
   {% set temp_snapshot_relation_sql = model['compiled_code'].replace("'", "''") %}
   {% call statement('create temp_snapshot_relation') %}
+    USE [{{ model.database}}];
     EXEC('DROP VIEW IF EXISTS {{ temp_snapshot_relation.include(database=False) }};');
     EXEC('create view {{ temp_snapshot_relation.include(database=False) }} as {{ temp_snapshot_relation_sql }};');
   {% endcall %}

dbt-sqlserver-1.8.1/dbt/include/sqlserver/macros/materializations/tests.sql

@@ -0,0 +1,46 @@
+{% macro sqlserver__get_test_sql(main_sql, fail_calc, warn_if, error_if, limit) -%}
+
+  -- Create target schema if it does not
+  USE [{{ target.database }}];
+  IF NOT EXISTS (SELECT * FROM sys.schemas WHERE name = '{{ target.schema }}')
+  BEGIN
+    EXEC('CREATE SCHEMA [{{ target.schema }}]')
+  END
+
+  {% set with_statement_pattern = 'with .+ as\s*\(' %}
+  {% set re = modules.re %}
+  {% set is_match = re.search(with_statement_pattern, main_sql, re.IGNORECASE) %}
+
+  {% if is_match %}
+    {% set testview %}
+      [{{ target.schema }}.testview_{{ range(1300, 19000) | random }}]
+    {% endset %}
+
+    {% set sql = main_sql.replace("'", "''")%}
+    EXEC('create view {{testview}} as {{ sql }};')
+    select
+      {{ "top (" ~ limit ~ ')' if limit != none }}
+      {{ fail_calc }} as failures,
+      case when {{ fail_calc }} {{ warn_if }}
+        then 'true' else 'false' end as should_warn,
+      case when {{ fail_calc }} {{ error_if }}
+        then 'true' else 'false' end as should_error
+    from (
+      select * from {{testview}}
+    ) dbt_internal_test;
+
+    EXEC('drop view {{testview}};')
+
+  {% else -%}
+    select
+      {{ "top (" ~ limit ~ ')' if limit != none }}
+      {{ fail_calc }} as failures,
+      case when {{ fail_calc }} {{ warn_if }}
+        then 'true' else 'false' end as should_warn,
+      case when {{ fail_calc }} {{ error_if }}
+        then 'true' else 'false' end as should_error
+    from (
+      {{ main_sql }}
+    ) dbt_internal_test
+  {%- endif -%}
+{%- endmacro %}

dbt-sqlserver-1.8.1/dbt/include/sqlserver/macros/materializations/unit_tests.sql

@@ -0,0 +1,47 @@
+{% macro sqlserver__get_unit_test_sql(main_sql, expected_fixture_sql, expected_column_names) -%}
+
+USE [{{ target.database }}];
+IF NOT EXISTS (SELECT * FROM sys.schemas WHERE name = '{{ target.schema }}')
+BEGIN
+EXEC('CREATE SCHEMA [{{ target.schema }}]')
+END
+
+{% set test_view %}
+    [{{ target.schema }}.testview_{{ 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 }}]
+{% endset %}
+{% set expected_sql = expected_fixture_sql.replace("'", "''")%}
+EXEC('create view {{expected_view}} as {{ expected_sql }};')
+
+-- Build actual result given inputs
+{% set unittest_sql %}
+with dbt_internal_unit_test_actual as (
+  select
+    {% for expected_column_name in expected_column_names %}{{expected_column_name}}{% if not loop.last -%},{% endif %}{%- endfor -%}, {{ dbt.string_literal("actual") }} as {{ adapter.quote("actual_or_expected") }}
+  from
+    {{ test_view }}
+),
+-- Build expected result
+dbt_internal_unit_test_expected as (
+  select
+    {% for expected_column_name in expected_column_names %}{{expected_column_name}}{% if not loop.last -%}, {% endif %}{%- endfor -%}, {{ dbt.string_literal("expected") }} as {{ adapter.quote("actual_or_expected") }}
+  from
+    {{ expected_view }}
+)
+-- Union actual and expected results
+select * from dbt_internal_unit_test_actual
+union all
+select * from dbt_internal_unit_test_expected
+{% endset %}
+
+EXEC('{{- escape_single_quotes(unittest_sql) -}}')
+
+EXEC('drop view {{test_view}};')
+EXEC('drop view {{expected_view}};')
+
+{%- endmacro %}

{dbt-sqlserver-1.8.0rc1 → dbt-sqlserver-1.8.1}/dbt/include/sqlserver/macros/readme.md

@@ -48,3 +48,7 @@ DBT expects a limit function, but the sqlserver syntax does not support it. Fabr
 ## `sqlserver__snapshot_merge_sql`
 
 Restores logic to the merge statement logic like the dbt core. Merge will probably be slower then the existing logic
+
+## unit tests
+
+To accomidate the nested CTE situation, we create a temp view for the actual/expected and use those both in the test.

dbt-sqlserver-1.8.1/dbt/include/sqlserver/macros/relations/seeds/helpers.sql

@@ -0,0 +1,57 @@
+{% macro sqlserver__get_binding_char() %}
+  {{ return('?') }}
+{% endmacro %}
+
+{% macro sqlserver__get_batch_size() %}
+  {{ return(400) }}
+{% endmacro %}
+
+{% macro calc_batch_size(num_columns) %}
+    {#
+        SQL Server allows for a max of 2098 parameters in a single statement.
+        Check if the max_batch_size fits with the number of columns, otherwise
+        reduce the batch size so it fits.
+    #}
+    {% set max_batch_size = get_batch_size() %}
+    {% set calculated_batch = (2098 / num_columns)|int %}
+    {% set batch_size = [max_batch_size, calculated_batch] | min %}
+
+    {{ return(batch_size) }}
+{%  endmacro %}
+
+{% macro sqlserver__load_csv_rows(model, agate_table) %}
+  {% set cols_sql = get_seed_column_quoted_csv(model, agate_table.column_names) %}
+  {% set batch_size = calc_batch_size(agate_table.column_names|length) %}
+  {% set bindings = [] %}
+  {% set statements = [] %}
+
+  {{ log("Inserting batches of " ~ batch_size ~ " records") }}
+
+  {% for chunk in agate_table.rows | batch(batch_size) %}
+      {% set bindings = [] %}
+
+      {% for row in chunk %}
+          {% do bindings.extend(row) %}
+      {% endfor %}
+
+      {% set sql %}
+          insert into {{ this.render() }} ({{ cols_sql }}) values
+          {% for row in chunk -%}
+              ({%- for column in agate_table.column_names -%}
+                  {{ get_binding_char() }}
+                  {%- if not loop.last%},{%- endif %}
+              {%- endfor -%})
+              {%- if not loop.last%},{%- endif %}
+          {%- endfor %}
+      {% endset %}
+
+      {% do adapter.add_query(sql, bindings=bindings, abridge_sql_log=True) %}
+
+      {% if loop.index0 == 0 %}
+          {% do statements.append(sql) %}
+      {% endif %}
+  {% endfor %}
+
+  {# Return SQL so we can render it out into the compiled files #}
+  {{ return(statements[0]) }}
+{% endmacro %}

{dbt-sqlserver-1.8.0rc1 → dbt-sqlserver-1.8.1}/dbt/include/sqlserver/macros/relations/table/create.sql

@@ -3,12 +3,14 @@
     {%- set tmp_relation = relation.incorporate(path={"identifier": relation.identifier ~ '__dbt_tmp_vw'}, type='view') -%}
 
     {%- do adapter.drop_relation(tmp_relation) -%}
+    USE [{{ relation.database }}];
     {{ get_create_view_as_sql(tmp_relation, sql) }}
 
     {%- set table_name -%}
-        {{ relation.database}}.{{ relation.schema }}.{{ relation.identifier }}
+        {{ relation }}
     {%- endset -%}
 
+
     {%- set contract_config = config.get('contract') -%}
     {%- set query -%}
         {% if contract_config.enforced and (not temporary) %}

{dbt-sqlserver-1.8.0rc1 → dbt-sqlserver-1.8.1}/dbt/include/sqlserver/macros/relations/views/create.sql

@@ -13,7 +13,7 @@
     {% set tst %}
     SELECT '1' as col
     {% endset %}
-
+    USE [{{ relation.database }}];
     EXEC('{{- escape_single_quotes(query) -}}')
 
 {% endmacro %}

{dbt-sqlserver-1.8.0rc1 → dbt-sqlserver-1.8.1/dbt_sqlserver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbt-sqlserver
-Version: 1.8.0rc1
+Version: 1.8.1
 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
@@ -42,9 +42,9 @@ Join us on the [dbt Slack](https://getdbt.slack.com/archives/CMRMDDQ9W) to ask q
 ## Installation
 
 This adapter requires the Microsoft ODBC driver to be installed:
-[Windows](https://docs.microsoft.com/nl-be/sql/connect/odbc/download-odbc-driver-for-sql-server?view=sql-server-ver16#download-for-windows) |
-[macOS](https://docs.microsoft.com/nl-be/sql/connect/odbc/linux-mac/install-microsoft-odbc-driver-sql-server-macos?view=sql-server-ver16) |
-[Linux](https://docs.microsoft.com/nl-be/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver16)
+[Windows](https://docs.microsoft.com/en-us/sql/connect/odbc/download-odbc-driver-for-sql-server?view=sql-server-ver16#download-for-windows) |
+[macOS](https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/install-microsoft-odbc-driver-sql-server-macos?view=sql-server-ver16) |
+[Linux](https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server?view=sql-server-ver16)
 
 <details><summary>Debian/Ubuntu</summary>
 <p>

{dbt-sqlserver-1.8.0rc1 → dbt-sqlserver-1.8.1}/dbt_sqlserver.egg-info/SOURCES.txt

@@ -22,12 +22,15 @@ dbt/include/sqlserver/macros/adapter/metadata.sql
 dbt/include/sqlserver/macros/adapter/relation.sql
 dbt/include/sqlserver/macros/adapter/schemas.sql
 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/table/table.sql
 dbt/include/sqlserver/macros/materializations/models/view/view.sql
 dbt/include/sqlserver/macros/materializations/snapshot/helpers.sql
 dbt/include/sqlserver/macros/materializations/snapshot/snapshot.sql
 dbt/include/sqlserver/macros/materializations/snapshot/snapshot_merge.sql
+dbt/include/sqlserver/macros/relations/seeds/helpers.sql
 dbt/include/sqlserver/macros/relations/table/clone.sql
 dbt/include/sqlserver/macros/relations/table/create.sql
 dbt/include/sqlserver/macros/relations/views/create.sql

dbt-sqlserver-1.8.0rc1/dbt/adapters/sqlserver/__version__.py

@@ -1 +0,0 @@
-version = "1.8.0rc1"