dbt-sqlserver 1.12.0rc1__tar.gz → 1.12.0rc2__tar.gz

{dbt_sqlserver-1.12.0rc1/dbt_sqlserver.egg-info → dbt_sqlserver-1.12.0rc2}/PKG-INFO

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

dbt_sqlserver-1.12.0rc2/dbt/adapters/sqlserver/__version__.py

@@ -0,0 +1 @@
+version = "1.12.0rc2"

{dbt_sqlserver-1.12.0rc1 → dbt_sqlserver-1.12.0rc2}/dbt/adapters/sqlserver/sqlserver_adapter.py

@@ -188,6 +188,22 @@ class SQLServerAdapter(SQLAdapter):
         ]
         return columns
 
+    @classmethod
+    def quote(cls, identifier: str) -> str:
+        """Double-quote an identifier, doubling any embedded double quote.
+
+        ``SQLAdapter.quote`` interpolates the identifier verbatim, so a name
+        containing a ``"`` would close the quoted identifier early and the
+        remainder would parse as SQL. T-SQL escapes a delimiter by doubling
+        it -- the same rule ``QUOTENAME()`` applies to brackets -- so
+        ``ab"cd`` must render as ``"ab""cd"``.
+
+        This is the quoting used by every macro that formats an identifier
+        (see #785). Relation rendering escapes nothing, since it goes through
+        ``BaseRelation.quote_character`` upstream rather than this method.
+        """
+        return '"{}"'.format(str(identifier).replace('"', '""'))
+
     @classmethod
     def convert_boolean_type(cls, agate_table, col_idx):
         return "bit"

{dbt_sqlserver-1.12.0rc1 → dbt_sqlserver-1.12.0rc2}/dbt/adapters/sqlserver/sqlserver_relation.py

@@ -26,6 +26,15 @@ class SQLServerRelation(BaseRelation):
     def get_relation_type(cls) -> Type[SQLServerRelationType]:
         return SQLServerRelationType
 
+    def quoted(self, identifier):
+        """Quote a path part, doubling any embedded quote character (#785).
+
+        Not delegated to super(): that wraps verbatim, so pre-escaping the
+        input would double-escape if upstream ever starts escaping too.
+        """
+        quote_char = self.quote_character
+        return f"{quote_char}{str(identifier).replace(quote_char, quote_char * 2)}{quote_char}"
+
     def _render_limited_alias(self) -> str:
         if self.disable_empty_relation_aliases:
             return ""

{dbt_sqlserver-1.12.0rc1 → dbt_sqlserver-1.12.0rc2}/dbt/include/sqlserver/macros/adapters/apply_grants.sql

@@ -48,7 +48,7 @@
 {%- macro sqlserver__get_grant_sql(relation, privilege, grantees) -%}
     {%- set grantees_safe = [] -%}
     {%- for grantee in grantees -%}
-        {%- set grantee_safe = "[" ~ grantee ~ "]" -%}
+        {%- set grantee_safe = adapter.quote(grantee) -%}
         {%- do grantees_safe.append(grantee_safe) -%}
     {%- endfor -%}
     grant {{ privilege }} on {{ relation }} to {{ grantees_safe | join(', ') }}
@@ -57,7 +57,7 @@
 {%- macro sqlserver__get_revoke_sql(relation, privilege, grantees) -%}
     {%- set grantees_safe = [] -%}
     {%- for grantee in grantees -%}
-        {%- set grantee_safe = "[" ~ grantee ~ "]" -%}
+        {%- set grantee_safe = adapter.quote(grantee) -%}
         {%- do grantees_safe.append(grantee_safe) -%}
     {%- endfor -%}
     revoke {{ privilege }} on {{ relation }} from {{ grantees_safe | join(', ') }}
@@ -66,6 +66,6 @@
 {% macro get_provision_sql(relation, privilege, grantees) %}
     {% for grantee in grantees %}
         if not exists(select name from sys.database_principals where name = '{{ grantee }}')
-        create user [{{ grantee }}] from external provider;
+        create user {{ adapter.quote(grantee) }} from external provider;
     {% endfor %}
 {% endmacro %}

{dbt_sqlserver-1.12.0rc1 → dbt_sqlserver-1.12.0rc2}/dbt/include/sqlserver/macros/adapters/apply_masks.sql

@@ -33,7 +33,7 @@
         c.name as name,
         c.masking_function as masking_function
     from sys.masked_columns c {{ information_schema_hints() }}
-    where c.object_id = OBJECT_ID('{{ relation.schema }}.{{ relation.identifier }}')
+    where c.object_id = OBJECT_ID('{{ escape_single_quotes(relation.include(database=False)) }}')
 {% endmacro %}
 
 
@@ -47,7 +47,7 @@
         from sys.index_columns ic {{ information_schema_hints() }}
         inner join sys.columns col {{ information_schema_hints() }}
             on col.object_id = ic.object_id and col.column_id = ic.column_id
-        where ic.object_id = OBJECT_ID('{{ relation.schema }}.{{ relation.identifier }}')
+        where ic.object_id = OBJECT_ID('{{ escape_single_quotes(relation.include(database=False)) }}')
           and ic.is_included_column = 0
     {% endcall %}
     {% set result = [] %}
@@ -64,7 +64,7 @@
     {% call statement('get_unmaskable_columns', fetch_result=True) %}
         select col.name as name
         from sys.columns col {{ information_schema_hints() }}
-        where col.object_id = OBJECT_ID('{{ relation.schema }}.{{ relation.identifier }}')
+        where col.object_id = OBJECT_ID('{{ escape_single_quotes(relation.include(database=False)) }}')
           and (
                 col.is_computed = 1
              or col.is_filestream = 1

{dbt_sqlserver-1.12.0rc1 → dbt_sqlserver-1.12.0rc2}/dbt/include/sqlserver/macros/adapters/columns.sql

@@ -62,7 +62,7 @@
             drop column "{{ column_name }}";
         {%- endset %}
         {% set rename_column %}
-            exec sp_rename '{{ relation | replace('"', '') }}.{{ tmp_column }}', '{{ column_name }}', 'column'
+            exec sp_rename '{{ escape_single_quotes(relation.include(database=False)) }}.{{ escape_single_quotes(adapter.quote(tmp_column)) }}', '{{ escape_single_quotes(column_name) }}', 'column'
         {%- endset %}
 
         {% do run_query(add_column) %}

{dbt_sqlserver-1.12.0rc1 → dbt_sqlserver-1.12.0rc2}/dbt/include/sqlserver/macros/adapters/indexes.sql

@@ -1,17 +1,28 @@
+{#- Quoted, comma-separated column list for index DDL. -#}
+{% macro quote_column_list(columns) -%}
+    {%- set quoted = [] -%}
+    {%- for column in columns -%}
+        {%- do quoted.append(adapter.quote(column)) -%}
+    {%- endfor -%}
+    {{- quoted | join(', ') -}}
+{%- endmacro %}
+
+
 {% macro sqlserver__create_clustered_columnstore_index(relation) -%}
+    {#- cci_name embeds the schema, so it must be quoted as an identifier
+        (raw only in the string comparison below) -- issue #409 -#}
     {%- set cci_name = (relation.schema ~ '_' ~ relation.identifier ~ '_cci') | replace(".", "") | replace(" ", "") -%}
     {%- set relation_name = relation.include(database=False) -%}
-    {%- set full_relation = '"' ~ relation.schema ~ '"."' ~ relation.identifier ~ '"' -%}
-    use [{{ relation.database }}];
+    {{ get_use_database_sql(relation.database) }}
     if EXISTS (
         SELECT *
         FROM sys.indexes {{ information_schema_hints() }}
-        WHERE name = '{{cci_name}}'
-        AND object_id=object_id('{{relation_name}}')
+        WHERE name = '{{ escape_single_quotes(cci_name) }}'
+        AND object_id=object_id('{{ escape_single_quotes(relation_name) }}')
     )
-    DROP index {{full_relation}}.{{cci_name}}
-    CREATE CLUSTERED COLUMNSTORE INDEX {{cci_name}}
-    ON {{full_relation}}
+    DROP index {{ relation_name }}.{{ adapter.quote(cci_name) }}
+    CREATE CLUSTERED COLUMNSTORE INDEX {{ adapter.quote(cci_name) }}
+    ON {{ relation_name }}
 {% endmacro %}
 
 {% macro drop_xml_indexes() -%}
@@ -58,15 +69,25 @@
 
     {{ log("Running drop_fk_constraints() macro...") }}
 
-    {# The schema filter applies to the referenced table (this model). The
-       constraint itself is dropped from the referencing (parent) table, which
-       may legitimately live in another schema, so it is not filtered. #}
+    {# Both directions are dropped (issue #632): the inbound keys of other
+       tables that reference this model, and this model's own outbound keys.
+       An inbound key blocks dropping this table or its primary key; an
+       outbound one blocks a truncate/rebuild of the table it points at and
+       would otherwise survive a rebuild of this one.
+
+       The schema filter applies to this model's table only, so same-named
+       tables in other schemas keep their constraints. The counterparty of
+       either key may legitimately live in another schema and is not filtered.
+       ALTER TABLE always targets the constraint's own schema and parent table,
+       which is correct in both directions. #}
 
     declare @drop_fk_constraints nvarchar(max);
     select @drop_fk_constraints = (
         select 'IF OBJECT_ID(''' + REPLACE(QUOTENAME(SCHEMA_NAME(sys.foreign_keys.[schema_id])) + '.' + QUOTENAME(sys.foreign_keys.[name]), '''', '''''') + ''', ''F'') IS NOT NULL ALTER TABLE ' + QUOTENAME(SCHEMA_NAME(sys.foreign_keys.[schema_id])) + '.' + QUOTENAME(OBJECT_NAME(sys.foreign_keys.[parent_object_id])) + ' DROP CONSTRAINT ' + QUOTENAME(sys.foreign_keys.[name]) + ';'
-        from sys.foreign_keys
-        inner join sys.tables on sys.foreign_keys.[referenced_object_id] = sys.tables.[object_id]
+        from sys.foreign_keys {{ information_schema_hints() }}
+        inner join sys.tables {{ information_schema_hints() }}
+            on sys.foreign_keys.[referenced_object_id] = sys.tables.[object_id]
+            or sys.foreign_keys.[parent_object_id] = sys.tables.[object_id]
         where SCHEMA_NAME(sys.tables.[schema_id]) = '{{ this.schema }}'
         and sys.tables.[name] = '{{ this.table }}'
         for xml path('')
@@ -90,8 +111,8 @@
     declare @drop_pk_constraints nvarchar(max);
     select @drop_pk_constraints = (
         select 'IF INDEXPROPERTY(' + CONVERT(VARCHAR(MAX), sys.tables.[object_id]) + ', ' + QUOTENAME(sys.indexes.[name], '''') + ', ''IndexId'') IS NOT NULL ALTER TABLE ' + QUOTENAME(SCHEMA_NAME(sys.tables.[schema_id])) + '.' + QUOTENAME(sys.tables.[name]) + ' DROP CONSTRAINT ' + QUOTENAME(sys.indexes.[name]) + ';'
-        from sys.indexes
-        inner join sys.tables on sys.indexes.[object_id] = sys.tables.[object_id]
+        from sys.indexes {{ information_schema_hints() }}
+        inner join sys.tables {{ information_schema_hints() }} on sys.indexes.[object_id] = sys.tables.[object_id]
         where sys.indexes.is_primary_key = 1
         and SCHEMA_NAME(sys.tables.[schema_id]) = '{{ this.schema }}'
         and sys.tables.[name] = '{{ this.table }}'
@@ -142,7 +163,7 @@
     {% endif %}
     clustered index
         {{ idx_name }}
-        on {{ this }} ({{ '[' + columns|join("], [") + ']' }})
+        on {{ this }} ({{ quote_column_list(columns) }})
     end
 {%- endmacro %}
 
@@ -170,9 +191,9 @@
     begin
     create nonclustered index
         {{ idx_name }}
-        on {{ this }} ({{ '[' + columns|join("], [") + ']' }})
+        on {{ this }} ({{ quote_column_list(columns) }})
         {% if includes -%}
-            include ({{ '[' + includes|join("], [") + ']' }})
+            include ({{ quote_column_list(includes) }})
         {% endif %}
     end
 {% endmacro %}
@@ -180,32 +201,32 @@
 
 {% macro drop_fk_indexes_on_table(relation) -%}
   {% call statement('find_references', fetch_result=true) %}
-      USE [{{ relation.database }}];
+      {{ get_use_database_sql(relation.database) }}
       SELECT  obj.name AS FK_NAME,
       sch.name AS [schema_name],
       tab1.name AS [table],
       col1.name AS [column],
       tab2.name AS [referenced_table],
       col2.name AS [referenced_column]
-      FROM sys.foreign_key_columns fkc
-      INNER JOIN sys.objects obj
+      FROM sys.foreign_key_columns fkc {{ information_schema_hints() }}
+      INNER JOIN sys.objects obj {{ information_schema_hints() }}
           ON obj.object_id = fkc.constraint_object_id
-      INNER JOIN sys.tables tab1
+      INNER JOIN sys.tables tab1 {{ information_schema_hints() }}
           ON tab1.object_id = fkc.parent_object_id
-      INNER JOIN sys.schemas sch
+      INNER JOIN sys.schemas sch {{ information_schema_hints() }}
           ON tab1.schema_id = sch.schema_id
-      INNER JOIN sys.columns col1
+      INNER JOIN sys.columns col1 {{ information_schema_hints() }}
           ON col1.column_id = parent_column_id AND col1.object_id = tab1.object_id
-      INNER JOIN sys.tables tab2
+      INNER JOIN sys.tables tab2 {{ information_schema_hints() }}
           ON tab2.object_id = fkc.referenced_object_id
-      INNER JOIN sys.columns col2
+      INNER JOIN sys.columns col2 {{ information_schema_hints() }}
           ON col2.column_id = referenced_column_id AND col2.object_id = tab2.object_id
       WHERE sch.name = '{{ relation.schema }}' and tab2.name = '{{ relation.identifier }}'
   {% endcall %}
       {% set references = load_result('find_references')['data'] %}
       {% for reference in references -%}
         {% call statement('main') -%}
-           alter table [{{reference[1]}}].[{{reference[2]}}] drop constraint [{{reference[0]}}]
+           alter table {{ adapter.quote(reference[1]) }}.{{ adapter.quote(reference[2]) }} drop constraint {{ adapter.quote(reference[0]) }}
         {%- endcall %}
       {% endfor %}
 {% endmacro %}
@@ -216,28 +237,28 @@
     SELECT i.name AS index_name
     , i.name + '__dbt_backup' as index_new_name
     , COL_NAME(ic.object_id,ic.column_id) AS column_name
-    FROM sys.indexes AS i
-    INNER JOIN sys.index_columns AS ic
+    FROM sys.indexes AS i {{ information_schema_hints() }}
+    INNER JOIN sys.index_columns AS ic {{ information_schema_hints() }}
         ON i.object_id = ic.object_id AND i.index_id = ic.index_id and i.type <> 5
-    WHERE i.object_id = OBJECT_ID('{{ relation.schema }}.{{ relation.identifier }}')
+    WHERE i.object_id = OBJECT_ID('{{ escape_single_quotes(relation.include(database=False)) }}')
 
     UNION ALL
 
     SELECT  obj.name AS index_name
     , obj.name + '__dbt_backup' as index_new_name
     , col1.name AS column_name
-    FROM sys.foreign_key_columns fkc
-    INNER JOIN sys.objects obj
+    FROM sys.foreign_key_columns fkc {{ information_schema_hints() }}
+    INNER JOIN sys.objects obj {{ information_schema_hints() }}
         ON obj.object_id = fkc.constraint_object_id
-    INNER JOIN sys.tables tab1
+    INNER JOIN sys.tables tab1 {{ information_schema_hints() }}
         ON tab1.object_id = fkc.parent_object_id
-    INNER JOIN sys.schemas sch
+    INNER JOIN sys.schemas sch {{ information_schema_hints() }}
         ON tab1.schema_id = sch.schema_id
-    INNER JOIN sys.columns col1
+    INNER JOIN sys.columns col1 {{ information_schema_hints() }}
         ON col1.column_id = parent_column_id AND col1.object_id = tab1.object_id
-    INNER JOIN sys.tables tab2
+    INNER JOIN sys.tables tab2 {{ information_schema_hints() }}
         ON tab2.object_id = fkc.referenced_object_id
-    INNER JOIN sys.columns col2
+    INNER JOIN sys.columns col2 {{ information_schema_hints() }}
         ON col2.column_id = referenced_column_id AND col2.object_id = tab2.object_id
     WHERE sch.name = '{{ relation.schema }}' and tab1.name = '{{ relation.identifier }}'
 
@@ -273,21 +294,21 @@
                   and object_id = OBJECT_ID('{{ relation }}')
   )
   begin
-  {# key columns: bracket-quoted (with ]] escaping) plus per-column direction #}
+  {# key columns: quoted (adapter.quote escapes embedded quotes) plus per-column direction #}
   {%- set key_columns = [] -%}
   {%- for column in index_config.columns -%}
     {%- do key_columns.append(
-        '[' ~ column | replace(']', ']]') ~ ']'
+        adapter.quote(column)
         ~ (' desc' if column in index_config.descending_columns else '')
     ) -%}
   {%- endfor -%}
   {%- set include_columns = [] -%}
   {%- for column in index_config.included_columns -%}
-    {%- do include_columns.append('[' ~ column | replace(']', ']]') ~ ']') -%}
+    {%- do include_columns.append(adapter.quote(column)) -%}
   {%- endfor %}
   create
   {% if index_config.unique -%} unique {% endif %}{{ index_config.type }}
-  index [{{ index_name }}]
+  index {{ adapter.quote(index_name) }}
   on {{ relation }}
   ({{ key_columns | join(', ') }})
     {% if include_columns -%}
@@ -426,7 +447,7 @@
         from sys.partitions p {{ information_schema_hints() }}
         where p.object_id = i.object_id and p.index_id = i.index_id
     ) part
-    where i.object_id = OBJECT_ID('{{ relation.schema }}.{{ relation.identifier }}')
+    where i.object_id = OBJECT_ID('{{ escape_single_quotes(relation.include(database=False)) }}')
       and i.index_id > 0
       and i.[type] not in (3, 4, 7)  /* xml, spatial, memory-optimized hash */
   {%- endcall %}
@@ -435,7 +456,7 @@
 
 
 {% macro sqlserver__get_drop_index_sql(relation, index_name) -%}
-    drop index [{{ index_name }}] on {{ relation }}
+    drop index {{ adapter.quote(index_name) }} on {{ relation }}
 {%- endmacro %}
 
 

{dbt_sqlserver-1.12.0rc1 → dbt_sqlserver-1.12.0rc2}/dbt/include/sqlserver/macros/adapters/metadata.sql

@@ -109,7 +109,7 @@
 {% endmacro %}
 
 {%- macro sqlserver__get_use_database_sql(database) -%}
-  USE [{{database | replace('"', '')}}];
+  USE {{ adapter.quote(database | replace('"', '')) }};
 {%- endmacro -%}
 
 {% macro sqlserver__list_schemas(database) %}
@@ -194,8 +194,8 @@
             , s.name as [schema]
             , o.modify_date as last_modified
             , current_timestamp as snapshotted_at
-        from sys.objects o
-        inner join sys.schemas s on o.schema_id = s.schema_id and [type] = 'U'
+        from sys.objects o {{ information_schema_hints() }}
+        inner join sys.schemas s {{ information_schema_hints() }} on o.schema_id = s.schema_id and [type] = 'U'
         where (
             {%- for relation in relations -%}
             (upper(s.name) = upper('{{ relation.schema }}') and

{dbt_sqlserver-1.12.0rc1 → dbt_sqlserver-1.12.0rc2}/dbt/include/sqlserver/macros/adapters/relation.sql

@@ -8,15 +8,21 @@
 
 {% macro sqlserver__get_drop_sql(relation) -%}
   {% if relation.type == 'view' -%}
-      {% call statement('find_references', fetch_result=true) %}
+      {#- 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) }}
         select
             sch.name as schema_name,
             obj.name as view_name
-        from sys.sql_expression_dependencies refs
-        inner join sys.objects obj
+        from sys.sql_expression_dependencies refs {{ information_schema_hints() }}
+        inner join sys.objects obj {{ information_schema_hints() }}
         on refs.referencing_id = obj.object_id
-        inner join sys.schemas sch
+        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 }}'
@@ -44,7 +50,8 @@
 {% macro sqlserver__rename_relation(from_relation, to_relation) -%}
   {% call statement('rename_relation') -%}
      {{ get_use_database_sql(from_relation.database) }}
-      EXEC sp_rename '{{ from_relation.schema }}.{{ from_relation.identifier }}', '{{ to_relation.identifier }}'
+      {#- @objname takes a quoted, qualified name; @newname must stay bare -#}
+      EXEC sp_rename '{{ escape_single_quotes(from_relation.include(database=False)) }}', '{{ escape_single_quotes(to_relation.identifier) }}'
   {%- endcall %}
 {% endmacro %}
 

{dbt_sqlserver-1.12.0rc1 → dbt_sqlserver-1.12.0rc2}/dbt/include/sqlserver/macros/adapters/schema.sql

@@ -1,9 +1,9 @@
 {% macro sqlserver__create_schema(relation) -%}
   {% call statement('create_schema') -%}
-    USE [{{ relation.database }}];
+    {{ get_use_database_sql(relation.database) }}
     IF NOT EXISTS (SELECT * FROM sys.schemas WHERE name = '{{ relation.schema }}')
     BEGIN
-    EXEC('CREATE SCHEMA [{{ relation.schema }}]')
+    EXEC('CREATE SCHEMA {{ adapter.quote(relation.schema) }}')
     END
   {% endcall %}
 {% endmacro %}
@@ -13,7 +13,7 @@
     {{ get_use_database_sql(relation.database) }}
     IF NOT EXISTS (SELECT * FROM sys.schemas WHERE name = '{{ relation.schema }}')
     BEGIN
-    EXEC('CREATE SCHEMA [{{ relation.schema }}] AUTHORIZATION [{{ schema_authorization }}]')
+    EXEC('CREATE SCHEMA {{ adapter.quote(relation.schema) }} AUTHORIZATION {{ adapter.quote(schema_authorization) }}')
     END
   {% endcall %}
 {% endmacro %}

{dbt_sqlserver-1.12.0rc1 → dbt_sqlserver-1.12.0rc2}/dbt/include/sqlserver/macros/materializations/hooks.sql

@@ -5,7 +5,11 @@
         {% if not adapter.behavior.dbt_sqlserver_use_dbt_transactions %}
           if @@trancount > 0 commit; -- post hooks after fictitious transaction work as expected
         {% else %}
-          commit; -- align transaction=False hook behavior with dbt-core transaction semantics.
+          {#- guarded, not a bare COMMIT: nothing guarantees a transaction is
+              open here. A bare one appeared safe only because some earlier
+              statement had auto-begun one (find_references, until relation.sql
+              stopped doing that); with @@TRANCOUNT = 0 it raises Msg 3902. -#}
+          if @@trancount > 0 commit; -- align transaction=False hook behavior with dbt-core transaction semantics.
         {% endif %}
       {% endcall %}
     {% endif %}

{dbt_sqlserver-1.12.0rc1 → dbt_sqlserver-1.12.0rc2}/dbt/include/sqlserver/macros/materializations/models/incremental/incremental.sql

@@ -31,6 +31,10 @@
 
   {% set to_drop = [] %}
   {% set prebuilt_handled = false %}
+  {#- true only where the statement('main') batch below carries create_table_as
+      DDL, i.e. the fresh-create / full-refresh branches. The incremental
+      branch's strategy DML stays transactional, so it leaves this false. -#}
+  {% set build_sql_is_create_table_as = false %}
 
   {% if existing_relation is none %}
     {% if config.get('full_refresh_build', 'heap_then_index') == 'prebuilt' %}
@@ -43,6 +47,7 @@
       {% set prebuilt_handled = true %}
     {% else %}
       {% set build_sql = get_create_table_as_sql(False, target_relation, sql) %}
+      {% set build_sql_is_create_table_as = true %}
     {% endif %}
   {% elif full_refresh_mode %}
     {#- the target is marked as having a full refresh in flight (blocking
@@ -69,6 +74,7 @@
       {% set prebuilt_handled = true %}
     {% else %}
       {% set build_sql = get_create_table_as_sql(False, intermediate_relation, sql) %}
+      {% set build_sql_is_create_table_as = true %}
       {% if existing_relation.type == 'table' %}
         {% do sqlserver__mark_full_refresh_incomplete(existing_relation) %}
       {% endif %}
@@ -82,6 +88,14 @@
       {% do sqlserver__assert_no_incomplete_full_refresh(existing_relation) %}
     {% endif %}
 
+    {#- The temp build is all catalog DDL (CREATE OR ALTER VIEW / SELECT *
+        INTO / DROP VIEW) and must not share the ambient transaction with the
+        strategy DML: held to commit, its sysschobjs X keylocks deadlock a
+        second worker. Nothing opens a transaction here - run_query never
+        auto-begins, and find_references (relation.sql) no longer does either -
+        so each statement autocommits and drops its catalog locks as it
+        finishes. The strategy DML below still runs transactionally, via
+        statement('main')'s default auto_begin through to adapter.commit(). -#}
     {% do run_query(get_create_table_as_sql(True, temp_relation, sql)) %}
 
     {% set contract_config = config.get('contract') %}
@@ -109,9 +123,28 @@
   {% endif %}
 
   {% if not prebuilt_handled %}
-    {% call statement("main") %}
-        {{ build_sql }}
-    {% endcall %}
+    {% if build_sql_is_create_table_as %}
+      {#- Same reason as the temp build above: this batch is create_table_as
+          catalog DDL, so letting statement() open the ambient transaction
+          would hold its sysschobjs X keylocks until adapter.commit() and
+          deadlock a second worker. -#}
+      {% call statement("main", auto_begin=False) %}
+          {{ build_sql }}
+      {% endcall %}
+    {% else %}
+      {% call statement("main") %}
+          {{ build_sql }}
+      {% endcall %}
+    {% endif %}
+    {% if build_sql_is_create_table_as %}
+      {#- Reopen the ambient transaction the batch above declined to start,
+          so the swap and the tail (grants/persist_docs/masks/indexes/
+          post-hooks) keep their semantics and adapter.commit() below has a
+          matching BEGIN rather than raising Msg 3902. No-op when the flag is
+          off. -#}
+      {% do adapter.commit_if_open() %}
+      {% do adapter.begin_if_closed() %}
+    {% endif %}
   {% endif %}
 
   {% if need_swap %}

{dbt_sqlserver-1.12.0rc1 → dbt_sqlserver-1.12.0rc2}/dbt/include/sqlserver/macros/materializations/models/unit_test/unit_test_create_table_as.sql

@@ -37,7 +37,7 @@
 
         {% set listColumns %}
             {% for column in model['columns'] %}
-                {{ "["~column~"]" }}{{ ", " if not loop.last }}
+                {{ adapter.quote(column) }}{{ ", " if not loop.last }}
             {% endfor %}
         {%endset%}
 

{dbt_sqlserver-1.12.0rc1 → dbt_sqlserver-1.12.0rc2}/dbt/include/sqlserver/macros/materializations/tests.sql

@@ -1,14 +1,15 @@
 {% macro sqlserver__get_test_sql(main_sql, fail_calc, warn_if, error_if, limit) -%}
 
   -- Create target schema if it does not
-  USE [{{ target.database }}];
+  {{ get_use_database_sql(target.database) }}
   IF NOT EXISTS (SELECT * FROM sys.schemas WHERE name = '{{ target.schema }}')
   BEGIN
-    EXEC('CREATE SCHEMA [{{ target.schema }}]')
+    EXEC('CREATE SCHEMA {{ adapter.quote(target.schema) }}')
   END
 
+  {% set testview_name = "testview_" ~ local_md5(main_sql) ~ "_" ~ (range(1300, 19000) | random) %}
   {% set testview %}
-    [{{ target.schema }}].[testview_{{ local_md5(main_sql) }}_{{ range(1300, 19000) | random }}]
+    {{ adapter.quote(target.schema) }}.{{ adapter.quote(testview_name) }}
   {% endset %}
 
   {% set sql = main_sql.replace("'", "''")%}

{dbt_sqlserver-1.12.0rc1 → dbt_sqlserver-1.12.0rc2}/dbt/include/sqlserver/macros/materializations/unit_tests.sql

@@ -1,19 +1,21 @@
 {% macro sqlserver__get_unit_test_sql(main_sql, expected_fixture_sql, expected_column_names) -%}
 
-  USE [{{ target.database }}];
+  {{ get_use_database_sql(target.database) }}
   IF NOT EXISTS (SELECT * FROM sys.schemas WHERE name = '{{ target.schema }}')
   BEGIN
-  EXEC('CREATE SCHEMA [{{ target.schema }}]')
+  EXEC('CREATE SCHEMA {{ adapter.quote(target.schema) }}')
   END
 
+  {% set test_view_name = "testview_" ~ local_md5(main_sql) ~ "_" ~ (range(1300, 19000) | random) %}
   {% set test_view %}
-      [{{ target.schema }}].[testview_{{ local_md5(main_sql) }}_{{ range(1300, 19000) | random }}]
+      {{ adapter.quote(target.schema) }}.{{ adapter.quote(test_view_name) }}
   {% endset %}
   {% set test_sql = main_sql.replace("'", "''")%}
   EXEC('create view {{test_view}} as {{ test_sql }};')
 
+  {% set expected_view_name = "expectedview_" ~ local_md5(expected_fixture_sql) ~ "_" ~ (range(1300, 19000) | random) %}
   {% set expected_view %}
-      [{{ target.schema }}].[expectedview_{{ local_md5(expected_fixture_sql) }}_{{ range(1300, 19000) | random }}]
+      {{ adapter.quote(target.schema) }}.{{ adapter.quote(expected_view_name) }}
   {% endset %}
   {% set expected_sql = expected_fixture_sql.replace("'", "''")%}
   EXEC('create view {{expected_view}} as {{ expected_sql }};')

{dbt_sqlserver-1.12.0rc1 → dbt_sqlserver-1.12.0rc2}/dbt/include/sqlserver/macros/relations/table/create.sql

@@ -9,8 +9,21 @@
     {%- endif -%}
     {%- set tmp_relation = relation.incorporate(path={"identifier": relation.identifier ~ '__dbt_tmp_vw'}, type='view') -%}
 
+    {#- Now that the incremental temp build commits standalone (see
+        incremental.sql), a crash can leave a throwaway table behind and the
+        SELECT * INTO below would hit Msg 2714. Drop it first, but only for
+        adapter-generated throwaways: `temporary` covers the incremental
+        __dbt_temp build, the suffix covers the full-refresh / table-refresh
+        __dbt_tmp intermediate. Suffix match is exact, never substring, so a
+        user model named stg__dbt_tmp_x is untouched.
+        Never guard a fresh-create of the real target: dbt has decided that
+        table does not exist, so 2714 must still surface rather than silently
+        destroying an object dbt does not know about. -#}
+    {%- set _ident = relation.identifier -%}
+    {%- set build_into_temp = temporary or _ident.endswith('__dbt_tmp') or _ident.endswith('__dbt_tmp_vw') -%}
+
     {%- do adapter.drop_relation(tmp_relation) -%}
-    USE [{{ relation.database }}];
+    {{ get_use_database_sql(relation.database) }}
     {{ get_create_view_as_sql(tmp_relation, sql) }}
 
     {%- set table_name -%}
@@ -26,13 +39,17 @@
             {{ build_columns_constraints(relation) }}
             {% set listColumns %}
                 {% for column in model['columns'] %}
-                    {{ "["~column~"]" }}{{ ", " if not loop.last }}
+                    {{ adapter.quote(column) }}{{ ", " if not loop.last }}
                 {% endfor %}
             {%endset%}
             INSERT INTO {{relation}} WITH (TABLOCK) ({{listColumns}})
             SELECT {{listColumns}} FROM {{tmp_relation}} {{ query_label }}
 
         {% else %}
+            {%- if build_into_temp -%}
+            IF OBJECT_ID('{{ escape_single_quotes(relation.include(database=False)) }}', 'U') IS NOT NULL
+                EXEC('DROP TABLE {{ relation }}');
+            {%- endif -%}
             SELECT * INTO {{ table_name }} FROM {{ tmp_relation }} {{ query_label }}
         {% endif %}
     {%- endset -%}
@@ -103,7 +120,7 @@
         later failure during the load would roll the marker back right along
         with it, defeating the point. -#}
     {%- set setup_sql -%}
-        USE [{{ relation.database }}];
+        {{ get_use_database_sql(relation.database) }}
         {{ get_create_view_as_sql(tmp_relation, sql) }}
 
         {#- drop any physical target before the bare CREATE / SELECT ... INTO
@@ -111,7 +128,7 @@
             dbt's relation cache being stale (reporting none while the table
             exists) - which would otherwise collide with Msg 2714 (object
             already exists) -#}
-        IF OBJECT_ID('{{ escape_single_quotes(relation.schema) }}.{{ escape_single_quotes(relation.identifier) }}', 'U') IS NOT NULL
+        IF OBJECT_ID('{{ escape_single_quotes(relation.include(database=False)) }}', 'U') IS NOT NULL
             EXEC('DROP TABLE {{ relation }}');
 
         {% if contract_enforced %}
@@ -152,7 +169,7 @@
     {%- if contract_enforced -%}
         {%- set listColumns -%}
             {%- for column in model['columns'] -%}
-                {{ "["~column~"]" }}{{ ", " if not loop.last }}
+                {{ adapter.quote(column) }}{{ ", " if not loop.last }}
             {%- endfor -%}
         {%- endset -%}
         {%- set insert_statement -%}

{dbt_sqlserver-1.12.0rc1 → dbt_sqlserver-1.12.0rc2}/dbt/include/sqlserver/macros/relations/views/create.sql

@@ -24,7 +24,7 @@
         CREATE OR ALTER VIEW {{ relation.include(database=False) }} AS {{ sql }};
     {% endset %}
 
-    USE [{{ relation.database }}];
+    {{ get_use_database_sql(relation.database) }}
     EXEC('{{- escape_single_quotes(query) -}}')
 
 {% endmacro %}

{dbt_sqlserver-1.12.0rc1 → dbt_sqlserver-1.12.0rc2/dbt_sqlserver.egg-info}/PKG-INFO

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

dbt_sqlserver-1.12.0rc1/dbt/adapters/sqlserver/__version__.py

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