dbt-adapters 1.3.1__tar.gz → 1.3.3__tar.gz

{dbt_adapters-1.3.1 → dbt_adapters-1.3.3}/.gitignore

@@ -154,3 +154,13 @@ cython_debug/
 
 # PyCharm
 .idea/
+
+# MacOS
+.DS_Store
+
+# vscode
+.vscode/
+.venv/
+
+# Vim
+*.swp

{dbt_adapters-1.3.1 → dbt_adapters-1.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dbt-adapters
-Version: 1.3.1
+Version: 1.3.3
 Summary: The set of adapter protocols and base functionality that supports integration with dbt-core
 Project-URL: Homepage, https://github.com/dbt-labs/dbt-adapters
 Project-URL: Documentation, https://docs.getdbt.com

dbt_adapters-1.3.3/dbt/adapters/__about__.py

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

{dbt_adapters-1.3.1 → dbt_adapters-1.3.3}/dbt/adapters/base/impl.py

@@ -319,14 +319,18 @@ class BaseAdapter(metaclass=AdapterMeta):
         return conn.name
 
     @contextmanager
-    def connection_named(self, name: str, query_header_context: Any = None) -> Iterator[None]:
+    def connection_named(
+        self, name: str, query_header_context: Any = None, should_release_connection=True
+    ) -> Iterator[None]:
         try:
             if self.connections.query_header is not None:
                 self.connections.query_header.set(name, query_header_context)
             self.acquire_connection(name)
             yield
         finally:
-            self.release_connection()
+            if should_release_connection:
+                self.release_connection()
+
             if self.connections.query_header is not None:
                 self.connections.query_header.reset()
 

{dbt_adapters-1.3.1 → dbt_adapters-1.3.3}/dbt/adapters/events/types.py

@@ -190,7 +190,7 @@ class SQLQueryStatus(DebugLevel):
         return "E017"
 
     def message(self) -> str:
-        return f"SQL status: {self.status} in {self.elapsed} seconds"
+        return f"SQL status: {self.status} in {self.elapsed:.3f} seconds"
 
 
 class SQLCommit(DebugLevel):

{dbt_adapters-1.3.1 → dbt_adapters-1.3.3}/dbt/adapters/sql/connections.py

@@ -88,7 +88,8 @@ class SQLConnectionManager(BaseConnectionManager):
                     node_info=get_node_info(),
                 )
             )
-            pre = time.time()
+
+            pre = time.perf_counter()
 
             cursor = connection.handle.cursor()
             cursor.execute(sql, bindings)
@@ -96,7 +97,7 @@ class SQLConnectionManager(BaseConnectionManager):
             fire_event(
                 SQLQueryStatus(
                     status=str(self.get_response(cursor)),
-                    elapsed=round((time.time() - pre)),
+                    elapsed=time.perf_counter() - pre,
                     node_info=get_node_info(),
                 )
             )

{dbt_adapters-1.3.1 → dbt_adapters-1.3.3}/dbt/include/global_project/macros/adapters/apply_grants.sql

@@ -61,7 +61,7 @@
 {% endmacro %}
 
 {% macro default__get_show_grant_sql(relation) %}
-    show grants on {{ relation }}
+    show grants on {{ relation.render() }}
 {% endmacro %}
 
 
@@ -70,7 +70,7 @@
 {% endmacro %}
 
 {%- macro default__get_grant_sql(relation, privilege, grantees) -%}
-    grant {{ privilege }} on {{ relation }} to {{ grantees | join(', ') }}
+    grant {{ privilege }} on {{ relation.render() }} to {{ grantees | join(', ') }}
 {%- endmacro -%}
 
 
@@ -79,7 +79,7 @@
 {% endmacro %}
 
 {%- macro default__get_revoke_sql(relation, privilege, grantees) -%}
-    revoke {{ privilege }} on {{ relation }} from {{ grantees | join(', ') }}
+    revoke {{ privilege }} on {{ relation.render() }} from {{ grantees | join(', ') }}
 {%- endmacro -%}
 
 
@@ -147,7 +147,7 @@
             {% set needs_granting = diff_of_two_dicts(grant_config, current_grants_dict) %}
             {% set needs_revoking = diff_of_two_dicts(current_grants_dict, grant_config) %}
             {% if not (needs_granting or needs_revoking) %}
-                {{ log('On ' ~ relation ~': All grants are in place, no revocation or granting needed.')}}
+                {{ log('On ' ~ relation.render() ~': All grants are in place, no revocation or granting needed.')}}
             {% endif %}
         {% else %}
             {#-- We don't think there's any chance of previous grants having carried over. --#}

{dbt_adapters-1.3.1 → dbt_adapters-1.3.3}/dbt/include/global_project/macros/adapters/columns.sql

@@ -96,10 +96,10 @@
   {%- set tmp_column = column_name + "__dbt_alter" -%}
 
   {% call statement('alter_column_type') %}
-    alter table {{ relation }} add column {{ adapter.quote(tmp_column) }} {{ new_column_type }};
-    update {{ relation }} set {{ adapter.quote(tmp_column) }} = {{ adapter.quote(column_name) }};
-    alter table {{ relation }} drop column {{ adapter.quote(column_name) }} cascade;
-    alter table {{ relation }} rename column {{ adapter.quote(tmp_column) }} to {{ adapter.quote(column_name) }}
+    alter table {{ relation.render() }} add column {{ adapter.quote(tmp_column) }} {{ new_column_type }};
+    update {{ relation.render() }} set {{ adapter.quote(tmp_column) }} = {{ adapter.quote(column_name) }};
+    alter table {{ relation.render() }} drop column {{ adapter.quote(column_name) }} cascade;
+    alter table {{ relation.render() }} rename column {{ adapter.quote(tmp_column) }} to {{ adapter.quote(column_name) }}
   {% endcall %}
 
 {% endmacro %}
@@ -120,7 +120,7 @@
 
   {% set sql -%}
 
-     alter {{ relation.type }} {{ relation }}
+     alter {{ relation.type }} {{ relation.render() }}
 
             {% for column in add_columns %}
                add column {{ column.name }} {{ column.data_type }}{{ ',' if not loop.last }}

{dbt_adapters-1.3.1 → dbt_adapters-1.3.3}/dbt/include/global_project/macros/adapters/relation.sql

@@ -38,7 +38,7 @@
 
 {% macro default__truncate_relation(relation) -%}
   {% call statement('truncate_relation') -%}
-    truncate table {{ relation }}
+    truncate table {{ relation.render() }}
   {%- endcall %}
 {% endmacro %}
 

dbt_adapters-1.3.3/dbt/include/global_project/macros/adapters/show.sql

@@ -0,0 +1,26 @@
+{#
+    We expect a syntax error if dbt show is invoked both with a --limit flag to show
+    and with a limit predicate embedded in its inline query. No special handling is
+    provided out-of-box.
+#}
+{% macro get_show_sql(compiled_code, sql_header, limit) -%}
+  {%- if sql_header is not none -%}
+  {{ sql_header }}
+  {%- endif %}
+  {{ get_limit_subquery_sql(compiled_code, limit) }}
+{% endmacro %}
+
+{#
+    Not necessarily a true subquery anymore. Now, merely a query subordinate
+    to the calling macro.
+#}
+{%- macro get_limit_subquery_sql(sql, limit) -%}
+  {{ adapter.dispatch('get_limit_sql', 'dbt')(sql, limit) }}
+{%- endmacro -%}
+
+{% macro default__get_limit_sql(sql, limit) %}
+  {{ compiled_code }}
+  {% if limit is not none %}
+  limit {{ limit }}
+  {%- endif -%}
+{% endmacro %}

{dbt_adapters-1.3.1 → dbt_adapters-1.3.3}/dbt/include/global_project/macros/materializations/models/clone/clone.sql

@@ -27,14 +27,14 @@
 
       {%- set target_relation = this.incorporate(type='table') -%}
       {% if existing_relation is not none and not existing_relation.is_table %}
-        {{ log("Dropping relation " ~ existing_relation ~ " because it is of type " ~ existing_relation.type) }}
+        {{ log("Dropping relation " ~ existing_relation.render() ~ " because it is of type " ~ existing_relation.type) }}
         {{ drop_relation_if_exists(existing_relation) }}
       {% endif %}
 
       -- as a general rule, data platforms that can clone tables can also do atomic 'create or replace'
       {% call statement('main') %}
           {% if target_relation and defer_relation and target_relation == defer_relation %}
-              {{ log("Target relation and defer relation are the same, skipping clone for relation: " ~ target_relation) }}
+              {{ log("Target relation and defer relation are the same, skipping clone for relation: " ~ target_relation.render()) }}
           {% else %}
               {{ create_or_replace_clone(target_relation, defer_relation) }}
           {% endif %}

{dbt_adapters-1.3.1 → dbt_adapters-1.3.3}/dbt/include/global_project/macros/materializations/models/clone/create_or_replace_clone.sql

@@ -3,5 +3,5 @@
 {% endmacro %}
 
 {% macro default__create_or_replace_clone(this_relation, defer_relation) %}
-    create or replace table {{ this_relation }} clone {{ defer_relation }}
+    create or replace table {{ this_relation.render() }} clone {{ defer_relation.render() }}
 {% endmacro %}

{dbt_adapters-1.3.1 → dbt_adapters-1.3.3}/dbt/include/global_project/macros/materializations/models/materialized_view.sql

@@ -71,9 +71,9 @@
             {% set build_sql = get_alter_materialized_view_as_sql(target_relation, configuration_changes, sql, existing_relation, backup_relation, intermediate_relation) %}
         {% elif on_configuration_change == 'continue' %}
             {% set build_sql = '' %}
-            {{ exceptions.warn("Configuration changes were identified and `on_configuration_change` was set to `continue` for `" ~ target_relation ~ "`") }}
+            {{ exceptions.warn("Configuration changes were identified and `on_configuration_change` was set to `continue` for `" ~ target_relation.render() ~ "`") }}
         {% elif on_configuration_change == 'fail' %}
-            {{ exceptions.raise_fail_fast_error("Configuration changes were identified and `on_configuration_change` was set to `fail` for `" ~ target_relation ~ "`") }}
+            {{ exceptions.raise_fail_fast_error("Configuration changes were identified and `on_configuration_change` was set to `fail` for `" ~ target_relation.render() ~ "`") }}
 
         {% else %}
             -- this only happens if the user provides a value other than `apply`, 'skip', 'fail'

{dbt_adapters-1.3.1 → dbt_adapters-1.3.3}/dbt/include/global_project/macros/materializations/seeds/helpers.sql

@@ -37,7 +37,7 @@
         {% set sql = create_csv_table(model, agate_table) %}
     {% else %}
         {{ adapter.truncate_relation(old_relation) }}
-        {% set sql = "truncate table " ~ old_relation %}
+        {% set sql = "truncate table " ~ old_relation.render() %}
     {% endif %}
 
     {{ return(sql) }}

{dbt_adapters-1.3.1 → dbt_adapters-1.3.3}/dbt/include/global_project/macros/materializations/seeds/seed.sql

@@ -22,7 +22,7 @@
   -- build model
   {% set create_table_sql = "" %}
   {% if exists_as_view %}
-    {{ exceptions.raise_compiler_error("Cannot seed to '{}', it is a view".format(old_relation)) }}
+    {{ exceptions.raise_compiler_error("Cannot seed to '{}', it is a view".format(old_relation.render())) }}
   {% elif exists_as_table %}
     {% set create_table_sql = reset_csv_table(model, full_refresh_mode, old_relation, agate_table) %}
   {% else %}

{dbt_adapters-1.3.1 → dbt_adapters-1.3.3}/dbt/include/global_project/macros/materializations/snapshots/helpers.sql

@@ -8,7 +8,7 @@
 {% macro default__create_columns(relation, columns) %}
   {% for column in columns %}
     {% call statement() %}
-      alter table {{ relation }} add column "{{ column.name }}" {{ column.data_type }};
+      alter table {{ relation.render() }} add column "{{ column.name }}" {{ column.data_type }};
     {% endcall %}
   {% endfor %}
 {% endmacro %}

{dbt_adapters-1.3.1 → dbt_adapters-1.3.3}/dbt/include/global_project/macros/materializations/snapshots/snapshot_merge.sql

@@ -7,7 +7,7 @@
 {% macro default__snapshot_merge_sql(target, source, insert_cols) -%}
     {%- set insert_cols_csv = insert_cols | join(', ') -%}
 
-    merge into {{ target }} as DBT_INTERNAL_DEST
+    merge into {{ target.render() }} as DBT_INTERNAL_DEST
     using {{ source }} as DBT_INTERNAL_SOURCE
     on DBT_INTERNAL_SOURCE.dbt_scd_id = DBT_INTERNAL_DEST.dbt_scd_id
 

{dbt_adapters-1.3.1 → dbt_adapters-1.3.3}/dbt/include/global_project/macros/relations/drop.sql

@@ -16,7 +16,7 @@
         {{ drop_materialized_view(relation) }}
 
     {%- else -%}
-        drop {{ relation.type }} if exists {{ relation }} cascade
+        drop {{ relation.type }} if exists {{ relation.render() }} cascade
 
     {%- endif -%}
 

{dbt_adapters-1.3.1 → dbt_adapters-1.3.3}/dbt/include/global_project/macros/relations/materialized_view/drop.sql

@@ -10,5 +10,5 @@ actually executes the drop, and `get_drop_sql`, which returns the template.
 
 
 {% macro default__drop_materialized_view(relation) -%}
-    drop materialized view if exists {{ relation }} cascade
+    drop materialized view if exists {{ relation.render() }} cascade
 {%- endmacro %}

{dbt_adapters-1.3.1 → dbt_adapters-1.3.3}/dbt/include/global_project/macros/relations/rename.sql

@@ -30,6 +30,6 @@
 {% macro default__rename_relation(from_relation, to_relation) -%}
   {% set target_name = adapter.quote_as_configured(to_relation.identifier, 'identifier') %}
   {% call statement('rename_relation') -%}
-    alter table {{ from_relation }} rename to {{ target_name }}
+    alter table {{ from_relation.render() }} rename to {{ target_name }}
   {%- endcall %}
 {% endmacro %}

{dbt_adapters-1.3.1 → dbt_adapters-1.3.3}/dbt/include/global_project/macros/relations/table/drop.sql

@@ -10,5 +10,5 @@ actually executes the drop, and `get_drop_sql`, which returns the template.
 
 
 {% macro default__drop_table(relation) -%}
-    drop table if exists {{ relation }} cascade
+    drop table if exists {{ relation.render() }} cascade
 {%- endmacro %}

{dbt_adapters-1.3.1 → dbt_adapters-1.3.3}/dbt/include/global_project/macros/relations/view/create.sql

@@ -16,7 +16,7 @@
   {%- set sql_header = config.get('sql_header', none) -%}
 
   {{ sql_header if sql_header is not none }}
-  create view {{ relation }}
+  create view {{ relation.render() }}
     {% set contract_config = config.get('contract') %}
     {% if contract_config.enforced %}
       {{ get_assert_columns_equivalent(sql) }}

{dbt_adapters-1.3.1 → dbt_adapters-1.3.3}/dbt/include/global_project/macros/relations/view/drop.sql

@@ -10,5 +10,5 @@ actually executes the drop, and `get_drop_sql`, which returns the template.
 
 
 {% macro default__drop_view(relation) -%}
-    drop view if exists {{ relation }} cascade
+    drop view if exists {{ relation.render() }} cascade
 {%- endmacro %}

{dbt_adapters-1.3.1 → dbt_adapters-1.3.3}/dbt/include/global_project/macros/relations/view/replace.sql

@@ -61,6 +61,6 @@
 {% endmacro %}
 
 {% macro default__handle_existing_table(full_refresh, old_relation) %}
-    {{ log("Dropping relation " ~ old_relation ~ " because it is of type " ~ old_relation.type) }}
+    {{ log("Dropping relation " ~ old_relation.render() ~ " because it is of type " ~ old_relation.type) }}
     {{ adapter.drop_relation(old_relation) }}
 {% endmacro %}

dbt_adapters-1.3.1/dbt/adapters/__about__.py

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

dbt_adapters-1.3.1/dbt/include/global_project/macros/adapters/show.sql

@@ -1,22 +0,0 @@
-{% macro get_show_sql(compiled_code, sql_header, limit) -%}
-  {%- if sql_header -%}
-  {{ sql_header }}
-  {%- endif -%}
-  {%- if limit is not none -%}
-  {{ get_limit_subquery_sql(compiled_code, limit) }}
-  {%- else -%}
-  {{ compiled_code }}
-  {%- endif -%}
-{% endmacro %}
-
-{% macro get_limit_subquery_sql(sql, limit) %}
-  {{ adapter.dispatch('get_limit_subquery_sql', 'dbt')(sql, limit) }}
-{% endmacro %}
-
-{% macro default__get_limit_subquery_sql(sql, limit) %}
-    select *
-    from (
-        {{ sql }}
-    ) as model_limit_subq
-    limit {{ limit }}
-{% endmacro %}