dbt-sqlserver 1.8.0rc2__tar.gz → 1.8.2__tar.gz

{dbt-sqlserver-1.8.0rc2/dbt_sqlserver.egg-info → dbt-sqlserver-1.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbt-sqlserver
-Version: 1.8.0rc2
+Version: 1.8.2
 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.2/dbt/adapters/sqlserver/__version__.py

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

dbt-sqlserver-1.8.2/dbt/include/sqlserver/macros/adapter/catalog.sql

@@ -0,0 +1,269 @@
+{% macro sqlserver__get_catalog(information_schemas, schemas) -%}
+    {% set query_label = apply_label() %}
+    {%- call statement('catalog', fetch_result=True) -%}
+
+        with
+        principals as (
+            select
+                name as principal_name,
+                principal_id as principal_id
+            from
+                sys.database_principals {{ information_schema_hints() }}
+        ),
+
+        schemas as (
+            select
+                name as schema_name,
+                schema_id as schema_id,
+                principal_id as principal_id
+            from
+                sys.schemas {{ information_schema_hints() }}
+        ),
+
+        tables as (
+            select
+                object_id,
+                name as table_name,
+                schema_id as schema_id,
+                principal_id as principal_id,
+                'BASE TABLE' as table_type
+            from
+                sys.tables {{ information_schema_hints() }}
+        ),
+
+        tables_with_metadata as (
+            select
+                object_id,
+                table_name,
+                schema_name,
+                coalesce(tables.principal_id, schemas.principal_id) as owner_principal_id,
+                table_type
+            from
+                tables
+            join schemas on tables.schema_id = schemas.schema_id
+        ),
+
+        views as (
+            select
+                object_id,
+                name as table_name,
+                schema_id as schema_id,
+                principal_id as principal_id,
+                'VIEW' as table_type
+            from
+                sys.views {{ information_schema_hints() }}
+        ),
+
+        views_with_metadata as (
+            select
+                object_id,
+                table_name,
+                schema_name,
+                coalesce(views.principal_id, schemas.principal_id) as owner_principal_id,
+                table_type
+            from
+                views
+            join schemas on views.schema_id = schemas.schema_id
+        ),
+
+        tables_and_views as (
+            select
+                object_id,
+                table_name,
+                schema_name,
+                principal_name,
+                table_type
+            from
+                tables_with_metadata
+            join principals on tables_with_metadata.owner_principal_id = principals.principal_id
+            union all
+            select
+                object_id,
+                table_name,
+                schema_name,
+                principal_name,
+                table_type
+            from
+                views_with_metadata
+            join principals on views_with_metadata.owner_principal_id = principals.principal_id
+        ),
+
+        cols as (
+
+            select
+                c.object_id,
+                c.name as column_name,
+                c.column_id as column_index,
+                t.name as column_type
+            from sys.columns as c {{ information_schema_hints() }}
+            left join sys.types {{ information_schema_hints() }} as t on c.system_type_id = t.system_type_id
+        )
+
+        select
+            DB_NAME() as table_database,
+            tv.schema_name as table_schema,
+            tv.table_name,
+            tv.table_type,
+            null as table_comment,
+            tv.principal_name as table_owner,
+            cols.column_name,
+            cols.column_index,
+            cols.column_type,
+            null as column_comment
+        from tables_and_views tv
+        join cols on tv.object_id = cols.object_id
+        where ({%- for schema in schemas -%}
+            upper(tv.schema_name) = upper('{{ schema }}'){%- if not loop.last %} or {% endif -%}
+        {%- endfor -%})
+
+        order by column_index
+        {{ query_label }}
+
+        {%- endcall -%}
+
+    {{ return(load_result('catalog').table) }}
+
+{%- endmacro %}
+
+{% macro sqlserver__get_catalog_relations(information_schema, relations) -%}
+    {% set query_label = apply_label() %}
+    {%- call statement('catalog', fetch_result=True) -%}
+
+    with
+    principals as (
+        select
+            name as principal_name,
+            principal_id as principal_id
+        from
+            sys.database_principals {{ information_schema_hints() }}
+    ),
+
+    schemas as (
+        select
+            name as schema_name,
+            schema_id as schema_id,
+            principal_id as principal_id
+        from
+            sys.schemas {{ information_schema_hints() }}
+    ),
+
+    tables as (
+        select
+            object_id,
+            name as table_name,
+            schema_id as schema_id,
+            principal_id as principal_id,
+            'BASE TABLE' as table_type
+        from
+            sys.tables {{ information_schema_hints() }}
+    ),
+
+    tables_with_metadata as (
+        select
+            object_id,
+            table_name,
+            schema_name,
+            coalesce(tables.principal_id, schemas.principal_id) as owner_principal_id,
+            table_type
+        from
+            tables
+        join schemas on tables.schema_id = schemas.schema_id
+    ),
+
+    views as (
+        select
+            object_id,
+            name as table_name,
+            schema_id as schema_id,
+            principal_id as principal_id,
+            'VIEW' as table_type
+        from
+            sys.views {{ information_schema_hints() }}
+    ),
+
+    views_with_metadata as (
+        select
+            object_id,
+            table_name,
+            schema_name,
+            coalesce(views.principal_id, schemas.principal_id) as owner_principal_id,
+            table_type
+        from
+            views
+        join schemas on views.schema_id = schemas.schema_id
+    ),
+
+    tables_and_views as (
+        select
+            object_id,
+            table_name,
+            schema_name,
+            principal_name,
+            table_type
+        from
+            tables_with_metadata
+        join principals on tables_with_metadata.owner_principal_id = principals.principal_id
+        union all
+        select
+            object_id,
+            table_name,
+            schema_name,
+            principal_name,
+            table_type
+        from
+            views_with_metadata
+        join principals on views_with_metadata.owner_principal_id = principals.principal_id
+    ),
+
+    cols as (
+
+        select
+            c.object_id,
+            c.name as column_name,
+            c.column_id as column_index,
+            t.name as column_type
+        from sys.columns as c {{ information_schema_hints() }}
+        left join sys.types as t on c.system_type_id = t.system_type_id
+    )
+
+    select
+        DB_NAME() as table_database,
+        tv.schema_name as table_schema,
+        tv.table_name,
+        tv.table_type,
+        null as table_comment,
+        tv.principal_name as table_owner,
+        cols.column_name,
+        cols.column_index,
+        cols.column_type,
+        null as column_comment
+    from tables_and_views tv
+    join cols on tv.object_id = cols.object_id
+    where (
+        {%- for relation in relations -%}
+            {% if relation.schema and relation.identifier %}
+                (
+                    upper(tv.schema_name) = upper('{{ relation.schema }}')
+                    and upper(tv.table_name) = upper('{{ relation.identifier }}')
+                )
+            {% elif relation.schema %}
+                (
+                    upper(tv.schema_name) = upper('{{ relation.schema }}')
+                )
+            {% else %}
+                {% do exceptions.raise_compiler_error(
+                    '`get_catalog_relations` requires a list of relations, each with a schema'
+                ) %}
+            {% endif %}
+
+            {%- if not loop.last %} or {% endif -%}
+        {%- endfor -%}
+    )
+
+    order by column_index
+    {{ query_label }}
+    {%- endcall -%}
+
+  {{ return(load_result('catalog').table) }}
+
+{%- endmacro %}

{dbt-sqlserver-1.8.0rc2 → dbt-sqlserver-1.8.2}/dbt/include/sqlserver/macros/adapter/metadata.sql

@@ -3,3 +3,6 @@
     {%- set query_label = config.get('query_tag','dbt-sqlserver') -%}
     OPTION (LABEL = '{{query_label}}');
 {% endmacro %}
+
+{% macro default__information_schema_hints() %}{% endmacro %}
+{% macro sqlserver__information_schema_hints() %}with (nolock){% endmacro %}

{dbt-sqlserver-1.8.0rc2 → dbt-sqlserver-1.8.2}/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.2/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.0rc2 → dbt-sqlserver-1.8.2}/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.0rc2 → dbt-sqlserver-1.8.2}/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.0rc2 → dbt-sqlserver-1.8.2}/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.0rc2 → dbt-sqlserver-1.8.2/dbt_sqlserver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dbt-sqlserver
-Version: 1.8.0rc2
+Version: 1.8.2
 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.0rc2 → dbt-sqlserver-1.8.2}/dbt_sqlserver.egg-info/SOURCES.txt

@@ -16,6 +16,7 @@ dbt/include/sqlserver/__init__.py
 dbt/include/sqlserver/dbt_project.yml
 dbt/include/sqlserver/profile_template.yml
 dbt/include/sqlserver/macros/readme.md
+dbt/include/sqlserver/macros/adapter/catalog.sql
 dbt/include/sqlserver/macros/adapter/columns.sql
 dbt/include/sqlserver/macros/adapter/indexes.sql
 dbt/include/sqlserver/macros/adapter/metadata.sql
@@ -23,6 +24,7 @@ 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-sqlserver-1.8.0rc2/dbt/adapters/sqlserver/__version__.py

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