restored nolock behaviour

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/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 %}