dbt-sqlserver 1.11.2rc2__tar.gz → 1.11.3__tar.gz

{dbt_sqlserver-1.11.2rc2/dbt_sqlserver.egg-info → dbt_sqlserver-1.11.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbt-sqlserver
-Version: 1.11.2rc2
+Version: 1.11.3
 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.11.3/dbt/adapters/sqlserver/__version__.py

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

{dbt_sqlserver-1.11.2rc2 → dbt_sqlserver-1.11.3}/dbt/adapters/sqlserver/sqlserver_adapter.py

@@ -1,5 +1,6 @@
 import re
-from typing import Any, Dict, List, Optional
+from contextlib import contextmanager
+from typing import Any, Dict, Iterator, List, Optional
 
 import agate
 import dbt_common.exceptions
@@ -375,8 +376,15 @@ class SQLServerAdapter(SQLAdapter):
 
     @classmethod
     def convert_number_type(cls, agate_table, col_idx):
-        decimals = agate_table.aggregate(agate.MaxPrecision(col_idx))
-        return "float" if decimals else "int"
+        if agate_table.aggregate(agate.MaxPrecision(col_idx)):
+            return "float"
+        values = agate_table.columns[col_idx].values_without_nulls()
+        low, high = (min(values), max(values)) if values else (0, 0)
+        if -(2**31) <= low and high < 2**31:
+            return "int"
+        if -(2**63) <= low and high < 2**63:
+            return "bigint"
+        return "numeric(38,0)"
 
     def create_schema(self, relation: BaseRelation) -> None:
         relation = relation.without_identifier()
@@ -399,6 +407,8 @@ class SQLServerAdapter(SQLAdapter):
         # see https://github.com/fishtown-analytics/dbt/pull/2255
         lens = [len(d.encode("utf-8")) for d in column.values_without_nulls()]
         max_len = max(lens) if lens else 64
+        if max_len > 8000:
+            return "varchar(max)"
         length = max_len if max_len > 16 else 16
         return "varchar({})".format(length)
 
@@ -822,6 +832,28 @@ class SQLServerAdapter(SQLAdapter):
             return False
         return create_needs_own_batch(parsed.build_options)
 
+    # dbt-core's run-operation runs on connections with these names.
+    _RUN_OPERATION_CONNECTION_PREFIXES = ("macro_", "inline_query")
+
+    @contextmanager
+    def connection_named(
+        self, name: str, query_header_context: Any = None, should_release_connection: bool = True
+    ) -> Iterator[None]:
+        """Commit a run-operation's open transaction when it finishes cleanly.
+
+        Stopgap for dbt-labs/dbt#16434, remove once dbt-core commits after a
+        run-operation: dbt-core never does, so with dbt-managed transactions
+        on, a write through ``statement()`` (auto_begin) is rolled back when
+        the connection closes. The commit sits after the ``yield`` so it runs
+        only when the macro did not raise; a failed macro still rolls back.
+        Matching on the connection name is a heuristic, since dbt-core marks
+        run-operation connections no other way.
+        """
+        with super().connection_named(name, query_header_context, should_release_connection):
+            yield
+            if name.startswith(self._RUN_OPERATION_CONNECTION_PREFIXES):
+                self.commit_if_open()
+
     @available
     def commit_if_open(self) -> None:
         """Commit the current transaction if one is open - a no-op otherwise.

{dbt_sqlserver-1.11.2rc2 → dbt_sqlserver-1.11.3}/dbt/include/sqlserver/macros/adapters/columns.sql

@@ -40,10 +40,17 @@
 
     {% set prefer_single = config.get('prefer_single_alter_column', false) %}
 
+    {#-- ALTER COLUMN without NOT NULL makes the column nullable --#}
+    {% set nullable_sql %}
+        {{ get_use_database_sql(relation.database) }}
+        select columnproperty(object_id('{{ escape_single_quotes(relation) }}'), '{{ escape_single_quotes(column_name) }}', 'AllowsNull')
+    {%- endset %}
+    {%- set not_null = run_query(nullable_sql).columns[0].values()[0] == 0 -%}
+
     {% if prefer_single and relation.type == 'table' %}
         {% set alter_sql %}
             alter {{ relation.type }} {{ relation }}
-            alter column "{{ column_name }}" {{ new_column_type }};
+            alter column "{{ column_name }}" {{ new_column_type }}{{ ' not null' if not_null }};
         {%- endset %}
         {% do run_query(alter_sql) %}
 
@@ -64,11 +71,18 @@
         {% set rename_column %}
             exec sp_rename '{{ relation | replace('"', '') }}.{{ tmp_column }}', '{{ column_name }}', 'column'
         {%- endset %}
+        {% set alter_sql_not_null %}
+            alter {{ relation.type }} {{ relation }}
+            alter column "{{ column_name }}" {{ new_column_type }} not null;
+        {%- endset %}
 
         {% do run_query(add_column) %}
         {% do run_query(update_column) %}
         {% do run_query(drop_column) %}
         {% do run_query(rename_column) %}
+        {% if not_null %}
+            {% do run_query(alter_sql_not_null) %}
+        {% endif %}
     {% endif %}
 
 {% endmacro %}

{dbt_sqlserver-1.11.2rc2 → dbt_sqlserver-1.11.3}/dbt/include/sqlserver/macros/materializations/snapshots/helpers.sql

@@ -1,7 +1,7 @@
 {% macro sqlserver__create_columns(relation, columns) %}
   {% set column_list %}
     {% for column_entry in columns %}
-      {{column_entry.name}} {{column_entry.data_type}}{{ ", " if not loop.last }}
+      {{ adapter.quote(column_entry.name) }} {{column_entry.data_type}}{{ ", " if not loop.last }}
     {% endfor %}
   {% endset %}
 

dbt_sqlserver-1.11.3/dbt/include/sqlserver/macros/materializations/snapshots/strategies.sql

@@ -0,0 +1,65 @@
+{% macro sqlserver__snapshot_hash_arguments(args) %}
+    CONVERT(VARCHAR(32), HashBytes('MD5', {% for arg in args %}
+        coalesce(cast({{ arg }} as varchar(8000)), '') {% if not loop.last %} + '|' + {% endif %}
+    {% endfor %}), 2)
+{% endmacro %}
+
+
+{#
+    dbt-adapters does not dispatch "snapshot_check_all_get_existing_columns", so
+    this shadows the global project's macro; adapter package macros take
+    precedence. Keep in sync with dbt-adapters when upgrading. When upstream
+    dispatches it, delete the public wrapper and keep the sqlserver__ handler.
+
+    Change from upstream: for a check_cols list, upstream reads the columns'
+    casing from "select <check_cols> from (<sql>) subq", and T-SQL can't nest a
+    WITH in a subquery. This reads the query's columns unwrapped, as the 'all'
+    branch does, and picks check_cols from them case-insensitively.
+#}
+
+{% macro snapshot_check_all_get_existing_columns(node, target_exists, check_cols_config) -%}
+    {{ return(sqlserver__snapshot_check_all_get_existing_columns(node, target_exists, check_cols_config)) }}
+{%- endmacro %}
+
+
+{% macro sqlserver__snapshot_check_all_get_existing_columns(node, target_exists, check_cols_config) -%}
+    {%- if not target_exists -%}
+        {#-- no table yet -> return whatever the query does --#}
+        {{ return((false, query_columns)) }}
+    {%- endif -%}
+
+    {#-- handle any schema changes --#}
+    {%- set target_relation = adapter.get_relation(database=node.database, schema=node.schema, identifier=node.alias) -%}
+
+    {% if check_cols_config == 'all' %}
+        {%- set query_columns = get_columns_in_query(node['compiled_code']) -%}
+
+    {% elif check_cols_config is iterable and (check_cols_config | length) > 0 %}
+        {%- set all_columns = get_columns_in_query(node['compiled_code']) -%}
+        {%- set all_columns_lower = all_columns | map('lower') | list -%}
+        {%- set query_columns = [] -%}
+        {%- for check_col in check_cols_config -%}
+            {%- if (check_col | lower) not in all_columns_lower -%}
+                {% do exceptions.raise_compiler_error("check_cols column '" ~ check_col ~ "' is not in the snapshot query") %}
+            {%- endif -%}
+            {%- do query_columns.append(all_columns[all_columns_lower.index(check_col | lower)]) -%}
+        {%- endfor -%}
+
+    {% else %}
+        {% do exceptions.raise_compiler_error("Invalid value for 'check_cols': " ~ check_cols_config) %}
+    {% endif %}
+
+    {%- set existing_cols = adapter.get_columns_in_relation(target_relation) | map(attribute = 'name') | list -%}
+    {%- set ns = namespace() -%} {#-- handle for-loop scoping with a namespace --#}
+    {%- set ns.column_added = false -%}
+
+    {%- set intersection = [] -%}
+    {%- for col in query_columns -%}
+        {%- if col in existing_cols -%}
+            {%- do intersection.append(adapter.quote(col)) -%}
+        {%- else -%}
+            {% set ns.column_added = true %}
+        {%- endif -%}
+    {%- endfor -%}
+    {{ return((ns.column_added, intersection)) }}
+{%- endmacro %}

dbt_sqlserver-1.11.3/dbt/include/sqlserver/macros/utils/array_append.sql

@@ -0,0 +1,3 @@
+{% macro sqlserver__array_append(array, new_element) -%}
+    JSON_MODIFY({{ array }}, 'append $', {{ new_element }})
+{%- endmacro %}

{dbt_sqlserver-1.11.2rc2 → dbt_sqlserver-1.11.3/dbt_sqlserver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dbt-sqlserver
-Version: 1.11.2rc2
+Version: 1.11.3
 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.11.2rc2 → dbt_sqlserver-1.11.3}/dbt_sqlserver.egg-info/SOURCES.txt

@@ -58,6 +58,7 @@ 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/include/sqlserver/macros/utils/any_value.sql
+dbt/include/sqlserver/macros/utils/array_append.sql
 dbt/include/sqlserver/macros/utils/array_construct.sql
 dbt/include/sqlserver/macros/utils/cast_bool_to_text.sql
 dbt/include/sqlserver/macros/utils/concat.sql

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

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

dbt_sqlserver-1.11.2rc2/dbt/include/sqlserver/macros/materializations/snapshots/strategies.sql

@@ -1,5 +0,0 @@
-{% macro sqlserver__snapshot_hash_arguments(args) %}
-    CONVERT(VARCHAR(32), HashBytes('MD5', {% for arg in args %}
-        coalesce(cast({{ arg }} as varchar(8000)), '') {% if not loop.last %} + '|' + {% endif %}
-    {% endfor %}), 2)
-{% endmacro %}