dbt-postgres 1.8.2__tar.gz → 1.9.0b1__tar.gz

{dbt_postgres-1.8.2 → dbt_postgres-1.9.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dbt-postgres
-Version: 1.8.2
+Version: 1.9.0b1
 Summary: The set of adapter protocols and base functionality that supports integration with dbt-core
 Project-URL: Homepage, https://github.com/dbt-labs/dbt-postgres
 Project-URL: Documentation, https://docs.getdbt.com
@@ -20,11 +20,12 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8.0
 Requires-Dist: agate<2.0,>=1.0
-Requires-Dist: dbt-adapters<2.0,>=0.1.0a1
-Requires-Dist: dbt-common<2.0,>=0.1.0a1
-Requires-Dist: dbt-core>=1.8.0a1
+Requires-Dist: dbt-adapters<2.0,>=1.7.0
+Requires-Dist: dbt-common<2.0,>=1.0.4
+Requires-Dist: dbt-core>=1.8.0
 Requires-Dist: psycopg2-binary<3.0,>=2.9
 Description-Content-Type: text/markdown
 
@@ -65,6 +66,11 @@ fi
 
 This ensures the version of `psycopg2` will match that of `psycopg2-binary`.
 
+
+## Contribute
+
+See `CONTRIBUTING.md` for a detailed overview of contributing a code change to this adapter.
+
 ## Join the dbt Community
 
 - Be part of the conversation in the [dbt Community Slack](http://community.getdbt.com/)

{dbt_postgres-1.8.2 → dbt_postgres-1.9.0b1}/README.md

@@ -35,6 +35,11 @@ fi
 
 This ensures the version of `psycopg2` will match that of `psycopg2-binary`.
 
+
+## Contribute
+
+See `CONTRIBUTING.md` for a detailed overview of contributing a code change to this adapter.
+
 ## Join the dbt Community
 
 - Be part of the conversation in the [dbt Community Slack](http://community.getdbt.com/)

dbt_postgres-1.9.0b1/dbt/adapters/postgres/__version__.py

@@ -0,0 +1 @@
+version = "1.9.0b1"

{dbt_postgres-1.8.2 → dbt_postgres-1.9.0b1}/dbt/adapters/postgres/connections.py

@@ -5,10 +5,12 @@ from typing import Optional, Union
 from dbt.adapters.contracts.connection import AdapterResponse, Credentials
 from dbt.adapters.events.logging import AdapterLogger
 from dbt.adapters.events.types import TypeCodeNotFound
+from dbt.adapters.postgres.record import PostgresRecordReplayHandle
 from dbt.adapters.sql import SQLConnectionManager
 from dbt_common.exceptions import DbtDatabaseError, DbtRuntimeError
 from dbt_common.events.functions import warn_or_error
 from dbt_common.helper_types import Port
+from dbt_common.record import get_record_mode_from_env, RecorderMode
 from mashumaro.jsonschema.annotations import Maximum, Minimum
 import psycopg2
 from typing_extensions import Annotated
@@ -132,17 +134,31 @@ class PostgresConnectionManager(SQLConnectionManager):
             kwargs["application_name"] = credentials.application_name
 
         def connect():
-            handle = psycopg2.connect(
-                dbname=credentials.database,
-                user=credentials.user,
-                host=credentials.host,
-                password=credentials.password,
-                port=credentials.port,
-                connect_timeout=credentials.connect_timeout,
-                **kwargs,
-            )
+            handle = None
+
+            # In replay mode, we won't connect to a real database at all, while
+            # in record and diff modes we do, but insert an intermediate handle
+            # object which monitors native connection activity.
+            rec_mode = get_record_mode_from_env()
+            if rec_mode != RecorderMode.REPLAY:
+                handle = psycopg2.connect(
+                    dbname=credentials.database,
+                    user=credentials.user,
+                    host=credentials.host,
+                    password=credentials.password,
+                    port=credentials.port,
+                    connect_timeout=credentials.connect_timeout,
+                    **kwargs,
+                )
+
+            if rec_mode is not None:
+                # If using the record/replay mechanism, regardless of mode, we
+                # use a wrapper.
+                handle = PostgresRecordReplayHandle(handle, connection)
+
             if credentials.role:
                 handle.cursor().execute("set role {}".format(credentials.role))
+
             return handle
 
         retryable_exceptions = [

{dbt_postgres-1.8.2 → dbt_postgres-1.9.0b1}/dbt/adapters/postgres/impl.py

@@ -151,7 +151,7 @@ class PostgresAdapter(SQLAdapter):
         """The set of standard builtin strategies which this adapter supports out-of-the-box.
         Not used to validate custom strategies defined by end users.
         """
-        return ["append", "delete+insert", "merge"]
+        return ["append", "delete+insert", "merge", "microbatch"]
 
     def debug_query(self):
         self.execute("select 1 as id")

dbt_postgres-1.9.0b1/dbt/adapters/postgres/record/__init__.py

@@ -0,0 +1,2 @@
+from dbt.adapters.postgres.record.cursor.cursor import PostgresRecordReplayCursor
+from dbt.adapters.postgres.record.handle import PostgresRecordReplayHandle

dbt_postgres-1.9.0b1/dbt/adapters/postgres/record/cursor/cursor.py

@@ -0,0 +1,15 @@
+from dbt_common.record import record_function
+
+from dbt.adapters.record import RecordReplayCursor
+
+from dbt.adapters.postgres.record.cursor.status import CursorGetStatusMessageRecord
+
+
+class PostgresRecordReplayCursor(RecordReplayCursor):
+    """A custom extension of RecordReplayCursor that adds the statusmessage
+    property which is specific to psycopg."""
+
+    @property
+    @record_function(CursorGetStatusMessageRecord, method=True, id_field_name="connection_name")
+    def statusmessage(self):
+        return self.native_cursor.statusmessage

dbt_postgres-1.9.0b1/dbt/adapters/postgres/record/cursor/status.py

@@ -0,0 +1,21 @@
+import dataclasses
+from typing import Optional
+
+from dbt_common.record import Record, Recorder
+
+
+@dataclasses.dataclass
+class CursorGetStatusMessageParams:
+    connection_name: str
+
+
+@dataclasses.dataclass
+class CursorGetStatusMessageResult:
+    msg: Optional[str]
+
+
+@Recorder.register_record_type
+class CursorGetStatusMessageRecord(Record):
+    params_cls = CursorGetStatusMessageParams
+    result_cls = CursorGetStatusMessageResult
+    group = "Database"

dbt_postgres-1.9.0b1/dbt/adapters/postgres/record/handle.py

@@ -0,0 +1,12 @@
+from dbt.adapters.record import RecordReplayHandle
+
+from dbt.adapters.postgres.record.cursor.cursor import PostgresRecordReplayCursor
+
+
+class PostgresRecordReplayHandle(RecordReplayHandle):
+    """A custom extension of RecordReplayHandle that returns
+    a psycopg-specific PostgresRecordReplayCursor object."""
+
+    def cursor(self):
+        cursor = None if self.native_handle is None else self.native_handle.cursor()
+        return PostgresRecordReplayCursor(cursor, self.connection)

{dbt_postgres-1.8.2 → dbt_postgres-1.9.0b1}/dbt/include/postgres/macros/adapters.sql

@@ -196,7 +196,12 @@
 
 {% macro postgres__alter_relation_comment(relation, comment) %}
   {% set escaped_comment = postgres_escape_comment(comment) %}
-  comment on {{ relation.type }} {{ relation }} is {{ escaped_comment }};
+  {% if relation.type == 'materialized_view' -%}
+    {% set relation_type = "materialized view" %}
+  {%- else -%}
+    {%- set relation_type = relation.type -%}
+  {%- endif -%}
+  comment on {{ relation_type }} {{ relation }} is {{ escaped_comment }};
 {% endmacro %}
 
 

dbt_postgres-1.9.0b1/dbt/include/postgres/macros/materializations/incremental_strategies.sql

@@ -0,0 +1,20 @@
+{% macro postgres__get_incremental_default_sql(arg_dict) %}
+
+  {% if arg_dict["unique_key"] %}
+    {% do return(get_incremental_delete_insert_sql(arg_dict)) %}
+  {% else %}
+    {% do return(get_incremental_append_sql(arg_dict)) %}
+  {% endif %}
+
+{% endmacro %}
+
+
+{% macro postgres__get_incremental_microbatch_sql(arg_dict) %}
+
+  {% if arg_dict["unique_key"] %}
+    {% do return(adapter.dispatch('get_incremental_merge_sql', 'dbt')(arg_dict)) %}
+  {% else %}
+    {{ exceptions.raise_compiler_error("dbt-postgres 'microbatch' requires a `unique_key` config") }}
+  {% endif %}
+
+{% endmacro %}

{dbt_postgres-1.8.2 → dbt_postgres-1.9.0b1}/dbt/include/postgres/macros/materializations/snapshot_merge.sql

@@ -2,12 +2,14 @@
 {% macro postgres__snapshot_merge_sql(target, source, insert_cols) -%}
     {%- set insert_cols_csv = insert_cols | join(', ') -%}
 
+    {%- set columns = config.get("snapshot_table_column_names") or get_snapshot_table_column_names() -%}
+
     update {{ target }}
-    set dbt_valid_to = DBT_INTERNAL_SOURCE.dbt_valid_to
+    set {{ columns.dbt_valid_to }} = DBT_INTERNAL_SOURCE.{{ columns.dbt_valid_to }}
     from {{ source }} as DBT_INTERNAL_SOURCE
-    where DBT_INTERNAL_SOURCE.dbt_scd_id::text = {{ target }}.dbt_scd_id::text
+    where DBT_INTERNAL_SOURCE.{{ columns.dbt_scd_id }}::text = {{ target }}.{{ columns.dbt_scd_id }}::text
       and DBT_INTERNAL_SOURCE.dbt_change_type::text in ('update'::text, 'delete'::text)
-      and {{ target }}.dbt_valid_to is null;
+      and {{ target }}.{{ columns.dbt_valid_to }} is null;
 
     insert into {{ target }} ({{ insert_cols_csv }})
     select {% for column in insert_cols -%}

{dbt_postgres-1.8.2 → dbt_postgres-1.9.0b1}/pyproject.toml

@@ -21,17 +21,17 @@ classifiers = [
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
 ]
 dependencies = [
     "psycopg2-binary>=2.9,<3.0",
-    "dbt-adapters>=0.1.0a1,<2.0",
+    "dbt-adapters>=1.7.0,<2.0",
     # add dbt-core to ensure backwards compatibility of installation, this is not a functional dependency
-    "dbt-core>=1.8.0a1",
+    "dbt-core>=1.8.0",
     # installed via dbt-adapters but used directly
-    "dbt-common>=0.1.0a1,<2.0",
+    "dbt-common>=1.0.4,<2.0",
     "agate>=1.0,<2.0",
 ]
-
 [project.urls]
 Homepage = "https://github.com/dbt-labs/dbt-postgres"
 Documentation = "https://docs.getdbt.com"
@@ -56,38 +56,31 @@ path = "dbt/adapters/postgres/__version__.py"
 dependencies = [
     "dbt-adapters @ git+https://github.com/dbt-labs/dbt-adapters.git",
     "dbt-common @ git+https://github.com/dbt-labs/dbt-common.git",
+    "dbt-tests-adapter @ git+https://github.com/dbt-labs/dbt-adapters.git#subdirectory=dbt-tests-adapter",
+    "dbt-core @ git+https://github.com/dbt-labs/dbt-core.git#subdirectory=core",
     'pre-commit==3.7.0;python_version>="3.9"',
     'pre-commit==3.5.0;python_version=="3.8"',
-]
-[tool.hatch.envs.default.scripts]
-dev = "pre-commit install"
-code-quality = "pre-commit run --all-files"
-
-[tool.hatch.envs.unit-tests]
-dependencies = [
-    "dbt-adapters @ git+https://github.com/dbt-labs/dbt-adapters.git",
-    "dbt-common @ git+https://github.com/dbt-labs/dbt-common.git",
-    "dbt-core @ git+https://github.com/dbt-labs/dbt-core.git#subdirectory=core",
     "freezegun",
     "pytest",
     "pytest-dotenv",
     "pytest-mock",
     "pytest-xdist",
 ]
-[tool.hatch.envs.unit-tests.scripts]
-all = "python -m pytest {args:tests/unit}"
-
-[tool.hatch.envs.integration-tests]
-template = "unit-tests"
-extra-dependencies = [
-    "dbt-tests-adapter @ git+https://github.com/dbt-labs/dbt-adapters.git#subdirectory=dbt-tests-adapter",
-]
-[tool.hatch.envs.integration-tests.env-vars]
+[tool.hatch.envs.default.env-vars]
 DBT_TEST_USER_1 = "dbt_test_user_1"
 DBT_TEST_USER_2 = "dbt_test_user_2"
 DBT_TEST_USER_3 = "dbt_test_user_3"
-[tool.hatch.envs.integration-tests.scripts]
-all = "python -m pytest {args:tests/functional}"
+[tool.hatch.envs.default.scripts]
+setup = "pre-commit install"
+code-quality = "pre-commit run --all-files"
+unit-tests = "python -m pytest {args:tests/unit}"
+integration-tests = "python -m pytest {args:tests/functional}"
+docker-dev = [
+    "echo Does not support integration testing, only development and unit testing. See issue https://github.com/dbt-labs/dbt-postgres/issues/99",
+	"docker build -f docker/dev.Dockerfile -t dbt-postgres-dev .",
+	"docker run --rm -it --name dbt-postgres-dev -v $(pwd):/opt/code dbt-postgres-dev",
+]
+docker-prod = "docker build -f docker/Dockerfile -t dbt-postgres ."
 
 [tool.hatch.envs.build]
 detached = true

dbt_postgres-1.8.2/dbt/adapters/postgres/__version__.py

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

dbt_postgres-1.8.2/dbt/include/postgres/macros/materializations/incremental_strategies.sql

@@ -1,9 +0,0 @@
-{% macro postgres__get_incremental_default_sql(arg_dict) %}
-
-  {% if arg_dict["unique_key"] %}
-    {% do return(get_incremental_delete_insert_sql(arg_dict)) %}
-  {% else %}
-    {% do return(get_incremental_append_sql(arg_dict)) %}
-  {% endif %}
-
-{% endmacro %}