PyPI - dbt-sqlserver - Versions diffs - 1.12.1__tar.gz → 1.12.2__tar.gz - Mend

@@ -8,14 +8,9 @@
 {% macro sqlserver__get_drop_sql(relation) -%}
   {% if relation.type == 'view' -%}
-      {#- auto_begin=false, matching dbt-adapters' own relations/drop.sql: a
-          read-only lookup must not open the ambient transaction. This is the
-          first statement of the temp-relation build (create.sql ->
-          adapter.drop_relation), so with the default auto_begin=True it held
-          that build's sys.sysschobjs X locks until the materialization
-          committed, deadlocking a concurrent worker (error 1205). -#}
-      {% call statement('find_references', fetch_result=true, auto_begin=false) %}
-        {{ get_use_database_sql(relation.database) }}
+      {#- Run through sp_executesql, so the statement text is the same for every
+          relation and SQL Server caches one plan for all of them. -#}
+      {%- set find_references_sql -%}
         select
             sch.name as schema_name,
             obj.name as view_name
@@ -24,11 +19,25 @@
         on refs.referencing_id = obj.object_id
         inner join sys.schemas sch {{ information_schema_hints() }}
         on obj.schema_id = sch.schema_id
-        where refs.referenced_database_name = '{{ relation.database }}'
-        and refs.referenced_schema_name = '{{ relation.schema }}'
-        and refs.referenced_entity_name = '{{ relation.identifier }}'
+        where refs.referenced_database_name = @database
+        and refs.referenced_schema_name = @schema
+        and refs.referenced_entity_name = @identifier
         and obj.type = 'V'
         {{ get_query_options() }}
+      {%- endset %}
+      {#- auto_begin=false, matching dbt-adapters' own relations/drop.sql: a
+          read-only lookup must not open the ambient transaction. This is the
+          first statement of the temp-relation build (create.sql ->
+          adapter.drop_relation), so with the default auto_begin=True it held
+          that build's sys.sysschobjs X locks until the materialization
+          committed, deadlocking a concurrent worker (error 1205). -#}
+      {% call statement('find_references', fetch_result=true, auto_begin=false) %}
+        {{ get_use_database_sql(relation.database) }}
+        exec sp_executesql N'{{ escape_single_quotes(find_references_sql) }}',
+            N'@database sysname, @schema sysname, @identifier sysname',
+            @database = N'{{ escape_single_quotes(relation.database) }}',
+            @schema = N'{{ escape_single_quotes(relation.schema) }}',
+            @identifier = N'{{ escape_single_quotes(relation.identifier) }}';
       {% endcall %}
       {% set references = load_result('find_references')['data'] %}
       {% for reference in references -%}

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbt-sqlserver
-Version: 1.12.1
+Version: 1.12.2
 Summary: A Microsoft SQL Server adapter plugin for dbt
 Author: Mikael Ene, Anders Swanson, Sam Debruyn, Cor Zuurmond, Cody Scott
 License: MIT

@@ -197,11 +197,13 @@
     - dm_exec_describe_first_result_set is referenced once: each reference compiles the body.
     - Its error row is kept, so a body it cannot describe is refreshed.
     - COLLATE DATABASE_DEFAULT, or the join fails where catalog and database collations differ.
-    - The body is inlined: the function needs nvarchar and mssql-python binds str as varchar. -#}
+    - Run through sp_executesql, so the statement text is the same for every view and SQL
+      Server caches one plan for all of them.
+    - The values are inlined, typed by the parameter list: the function needs nvarchar and
+      mssql-python binds str as varchar. -#}
 {% macro sqlserver__get_view_skip_check_sql(relation, compiled_sql) -%}
-  {%- set object_name = "quotename('" ~ relation.schema ~ "') + '.' + quotename('" ~ relation.identifier ~ "')" -%}
-  {{ get_use_database_sql(relation.database) }}
-  declare @dbt_sqlserver_skip_check_body nvarchar(max) = N'{{ escape_single_quotes(compiled_sql) }}';
+  {%- set object_name = "quotename(@schema) + '.' + quotename(@identifier)" -%}
+  {%- set check_sql -%}
   select
       object_definition(object_id({{ object_name }}, 'V')) as definition,
       case when exists (
@@ -234,6 +236,13 @@
                     <> isnull(cached.collation_name, '') collate database_default
       ) then 1 else 0 end as needs_refresh
   where object_id({{ object_name }}, 'V') is not null
+  {%- endset -%}
+  {{ get_use_database_sql(relation.database) }}
+  exec sp_executesql N'{{ escape_single_quotes(check_sql) }}',
+      N'@schema sysname, @identifier sysname, @dbt_sqlserver_skip_check_body nvarchar(max)',
+      @schema = N'{{ escape_single_quotes(relation.schema) }}',
+      @identifier = N'{{ escape_single_quotes(relation.identifier) }}',
+      @dbt_sqlserver_skip_check_body = N'{{ escape_single_quotes(compiled_sql) }}';
 {% endmacro %}
 {% macro sqlserver__get_relation_last_modified(information_schema, relations) -%}

@@ -134,7 +134,11 @@
   {{ adapter.commit() }}
-  {{ drop_relation_if_exists(backup_relation) }}
+  {#- Only the table branch above makes a backup. A view is altered in place, and a
+      drop would still query the missing backup's dependents. -#}
+  {% if existing_relation is not none and existing_relation.type != 'view' %}
+    {{ drop_relation_if_exists(backup_relation) }}
+  {% endif %}
   {{ run_hooks(post_hooks, inside_transaction=False) }}

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbt-sqlserver
-Version: 1.12.1
+Version: 1.12.2
 Summary: A Microsoft SQL Server adapter plugin for dbt
 Author: Mikael Ene, Anders Swanson, Sam Debruyn, Cor Zuurmond, Cody Scott
 License: MIT

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

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

dbt-sqlserver 1.12.1__tar.gz → 1.12.2__tar.gz

dbt-sqlserver 1.12.1tar.gz → 1.12.2tar.gz