apache-airflow-providers-postgres 6.0.0rc2__py3-none-any.whl → 6.1.0__py3-none-any.whl

airflow/providers/postgres/LICENSE

@@ -199,55 +199,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-
-============================================================================
-   APACHE AIRFLOW SUBCOMPONENTS:
-
-   The Apache Airflow project contains subcomponents with separate copyright
-   notices and license terms. Your use of the source code for the these
-   subcomponents is subject to the terms and conditions of the following
-   licenses.
-
-
-========================================================================
-Third party Apache 2.0 licenses
-========================================================================
-
-The following components are provided under the Apache 2.0 License.
-See project link for details. The text of each license is also included
-at 3rd-party-licenses/LICENSE-[project].txt.
-
-    (ALv2 License) hue v4.3.0 (https://github.com/cloudera/hue/)
-    (ALv2 License) jqclock v2.3.0 (https://github.com/JohnRDOrazio/jQuery-Clock-Plugin)
-    (ALv2 License) bootstrap3-typeahead v4.0.2 (https://github.com/bassjobsen/Bootstrap-3-Typeahead)
-    (ALv2 License) connexion v2.7.0 (https://github.com/zalando/connexion)
-
-========================================================================
-MIT licenses
-========================================================================
-
-The following components are provided under the MIT License. See project link for details.
-The text of each license is also included at 3rd-party-licenses/LICENSE-[project].txt.
-
-    (MIT License) jquery v3.5.1 (https://jquery.org/license/)
-    (MIT License) dagre-d3 v0.6.4 (https://github.com/cpettitt/dagre-d3)
-    (MIT License) bootstrap v3.4.1 (https://github.com/twbs/bootstrap/)
-    (MIT License) d3-tip v0.9.1 (https://github.com/Caged/d3-tip)
-    (MIT License) dataTables v1.10.25 (https://datatables.net)
-    (MIT License) normalize.css v3.0.2 (http://necolas.github.io/normalize.css/)
-    (MIT License) ElasticMock v1.3.2 (https://github.com/vrcmarcos/elasticmock)
-    (MIT License) MomentJS v2.24.0 (http://momentjs.com/)
-    (MIT License) eonasdan-bootstrap-datetimepicker v4.17.49 (https://github.com/eonasdan/bootstrap-datetimepicker/)
-
-========================================================================
-BSD 3-Clause licenses
-========================================================================
-The following components are provided under the BSD 3-Clause license. See project links for details.
-The text of each license is also included at 3rd-party-licenses/LICENSE-[project].txt.
-
-    (BSD 3 License) d3 v5.16.0 (https://d3js.org)
-    (BSD 3 License) d3-shape v2.1.0 (https://github.com/d3/d3-shape)
-    (BSD 3 License) cgroupspy 0.2.1 (https://github.com/cloudsigma/cgroupspy)
-
-========================================================================
-See 3rd-party-licenses/LICENSES-ui.txt for packages used in `/airflow/www`

airflow/providers/postgres/__init__.py

@@ -29,7 +29,7 @@ from airflow import __version__ as airflow_version
 
 __all__ = ["__version__"]
 
-__version__ = "6.0.0"
+__version__ = "6.1.0"
 
 if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
     "2.9.0"

airflow/providers/postgres/dialects/__init__.py

@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.

airflow/providers/postgres/dialects/postgres.py

@@ -0,0 +1,91 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from __future__ import annotations
+
+from methodtools import lru_cache
+
+from airflow.providers.common.sql.dialects.dialect import Dialect
+
+
+class PostgresDialect(Dialect):
+    """Postgres dialect implementation."""
+
+    @property
+    def name(self) -> str:
+        return "postgresql"
+
+    @lru_cache(maxsize=None)
+    def get_primary_keys(self, table: str, schema: str | None = None) -> list[str] | None:
+        """
+        Get the table's primary key.
+
+        :param table: Name of the target table
+        :param schema: Name of the target schema, public by default
+        :return: Primary key columns list
+        """
+        if schema is None:
+            table, schema = self.extract_schema_from_table(table)
+        sql = """
+            select kcu.column_name
+            from information_schema.table_constraints tco
+                    join information_schema.key_column_usage kcu
+                        on kcu.constraint_name = tco.constraint_name
+                            and kcu.constraint_schema = tco.constraint_schema
+                            and kcu.constraint_name = tco.constraint_name
+            where tco.constraint_type = 'PRIMARY KEY'
+            and kcu.table_schema = %s
+            and kcu.table_name = %s
+        """
+        pk_columns = [
+            row[0] for row in self.get_records(sql, (self.unescape_word(schema), self.unescape_word(table)))
+        ]
+        return pk_columns or None
+
+    def generate_replace_sql(self, table, values, target_fields, **kwargs) -> str:
+        """
+        Generate the REPLACE SQL statement.
+
+        :param table: Name of the target table
+        :param values: The row to insert into the table
+        :param target_fields: The names of the columns to fill in the table
+        :param replace: Whether to replace instead of insert
+        :param replace_index: the column or list of column names to act as
+            index for the ON CONFLICT clause
+        :return: The generated INSERT or REPLACE SQL statement
+        """
+        if not target_fields:
+            raise ValueError("PostgreSQL ON CONFLICT upsert syntax requires column names")
+
+        replace_index = kwargs.get("replace_index") or self.get_primary_keys(table)
+
+        if not replace_index:
+            raise ValueError("PostgreSQL ON CONFLICT upsert syntax requires an unique index")
+
+        if isinstance(replace_index, str):
+            replace_index = [replace_index]
+
+        sql = self.generate_insert_sql(table, values, target_fields, **kwargs)
+        on_conflict_str = f" ON CONFLICT ({', '.join(map(self.escape_word, replace_index))})"
+        replace_target = [self.escape_word(f) for f in target_fields if f not in replace_index]
+
+        if replace_target:
+            replace_target_str = ", ".join(f"{col} = excluded.{col}" for col in replace_target)
+            sql += f"{on_conflict_str} DO UPDATE SET {replace_target_str}"
+        else:
+            sql += f"{on_conflict_str} DO NOTHING"
+
+        return sql

airflow/providers/postgres/get_provider_info.py

@@ -15,8 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE
-# OVERWRITTEN WHEN PREPARING PACKAGES.
+# NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE OVERWRITTEN!
 #
 # IF YOU WANT TO MODIFY THIS FILE, YOU SHOULD MODIFY THE TEMPLATE
 # `get_provider_info_TEMPLATE.py.jinja2` IN the `dev/breeze/src/airflow_breeze/templates` DIRECTORY
@@ -28,8 +27,9 @@ def get_provider_info():
         "name": "PostgreSQL",
         "description": "`PostgreSQL <https://www.postgresql.org/>`__\n",
         "state": "ready",
-        "source-date-epoch": 1734536300,
+        "source-date-epoch": 1739964148,
         "versions": [
+            "6.1.0",
             "6.0.0",
             "5.14.0",
             "5.13.1",
@@ -72,24 +72,21 @@ def get_provider_info():
             "1.0.1",
             "1.0.0",
         ],
-        "dependencies": [
-            "apache-airflow>=2.9.0",
-            "apache-airflow-providers-common-sql>=1.20.0",
-            "psycopg2-binary>=2.9.4",
-            "asyncpg>=0.30.0",
-        ],
-        "additional-extras": [{"name": "amazon", "dependencies": ["apache-airflow-providers-amazon>=2.6.0"]}],
         "integrations": [
             {
                 "integration-name": "PostgreSQL",
                 "external-doc-url": "https://www.postgresql.org/",
-                "how-to-guide": [
-                    "/docs/apache-airflow-providers-postgres/operators/postgres_operator_howto_guide.rst"
-                ],
-                "logo": "/integration-logos/postgres/Postgres.png",
+                "how-to-guide": ["/docs/apache-airflow-providers-postgres/operators.rst"],
+                "logo": "/docs/integration-logos/Postgres.png",
                 "tags": ["software"],
             }
         ],
+        "dialects": [
+            {
+                "dialect-type": "postgresql",
+                "dialect-class-name": "airflow.providers.postgres.dialects.postgres.PostgresDialect",
+            }
+        ],
         "hooks": [
             {
                 "integration-name": "PostgreSQL",
@@ -114,4 +111,14 @@ def get_provider_info():
                 "handler": "airflow.providers.postgres.assets.postgres.sanitize_uri",
             }
         ],
+        "dependencies": [
+            "apache-airflow>=2.9.0",
+            "apache-airflow-providers-common-sql>=1.20.0",
+            "psycopg2-binary>=2.9.9",
+            "asyncpg>=0.30.0",
+        ],
+        "optional-dependencies": {
+            "amazon": ["apache-airflow-providers-amazon>=2.6.0"],
+            "openlineage": ["apache-airflow-providers-openlineage"],
+        },
     }

airflow/providers/postgres/hooks/postgres.py

@@ -18,7 +18,6 @@
 from __future__ import annotations
 
 import os
-from collections.abc import Iterable
 from contextlib import closing
 from copy import deepcopy
 from typing import TYPE_CHECKING, Any, Union
@@ -31,11 +30,13 @@ from sqlalchemy.engine import URL
 
 from airflow.exceptions import AirflowException
 from airflow.providers.common.sql.hooks.sql import DbApiHook
+from airflow.providers.postgres.dialects.postgres import PostgresDialect
 
 if TYPE_CHECKING:
     from psycopg2.extensions import connection
 
     from airflow.models.connection import Connection
+    from airflow.providers.common.sql.dialects.dialect import Dialect
     from airflow.providers.openlineage.sqlparser import DatabaseInfo
 
 CursorType = Union[DictCursor, RealDictCursor, NamedTupleCursor]
@@ -123,6 +124,14 @@ class PostgresHook(DbApiHook):
             query=query,
         )
 
+    @property
+    def dialect_name(self) -> str:
+        return "postgresql"
+
+    @property
+    def dialect(self) -> Dialect:
+        return PostgresDialect(self)
+
     def _get_cursor(self, raw_cursor: str) -> CursorType:
         _cursor = raw_cursor.lower()
         cursor_types = {
@@ -286,67 +295,7 @@ class PostgresHook(DbApiHook):
         :param schema: Name of the target schema, public by default
         :return: Primary key columns list
         """
-        sql = """
-            select kcu.column_name
-            from information_schema.table_constraints tco
-                    join information_schema.key_column_usage kcu
-                        on kcu.constraint_name = tco.constraint_name
-                            and kcu.constraint_schema = tco.constraint_schema
-                            and kcu.constraint_name = tco.constraint_name
-            where tco.constraint_type = 'PRIMARY KEY'
-            and kcu.table_schema = %s
-            and kcu.table_name = %s
-        """
-        pk_columns = [row[0] for row in self.get_records(sql, (schema, table))]
-        return pk_columns or None
-
-    def _generate_insert_sql(
-        self, table: str, values: tuple[str, ...], target_fields: Iterable[str], replace: bool, **kwargs
-    ) -> str:
-        """
-        Generate the INSERT SQL statement.
-
-        The REPLACE variant is specific to the PostgreSQL syntax.
-
-        :param table: Name of the target table
-        :param values: The row to insert into the table
-        :param target_fields: The names of the columns to fill in the table
-        :param replace: Whether to replace instead of insert
-        :param replace_index: the column or list of column names to act as
-            index for the ON CONFLICT clause
-        :return: The generated INSERT or REPLACE SQL statement
-        """
-        placeholders = [
-            self.placeholder,
-        ] * len(values)
-        replace_index = kwargs.get("replace_index")
-
-        if target_fields:
-            target_fields_fragment = ", ".join(target_fields)
-            target_fields_fragment = f"({target_fields_fragment})"
-        else:
-            target_fields_fragment = ""
-
-        sql = f"INSERT INTO {table} {target_fields_fragment} VALUES ({','.join(placeholders)})"
-
-        if replace:
-            if not target_fields:
-                raise ValueError("PostgreSQL ON CONFLICT upsert syntax requires column names")
-            if not replace_index:
-                raise ValueError("PostgreSQL ON CONFLICT upsert syntax requires an unique index")
-            if isinstance(replace_index, str):
-                replace_index = [replace_index]
-
-            on_conflict_str = f" ON CONFLICT ({', '.join(replace_index)})"
-            replace_target = [f for f in target_fields if f not in replace_index]
-
-            if replace_target:
-                replace_target_str = ", ".join(f"{col} = excluded.{col}" for col in replace_target)
-                sql += f"{on_conflict_str} DO UPDATE SET {replace_target_str}"
-            else:
-                sql += f"{on_conflict_str} DO NOTHING"
-
-        return sql
+        return self.dialect.get_primary_keys(table=table, schema=schema)
 
     def get_openlineage_database_info(self, connection) -> DatabaseInfo:
         """Return Postgres/Redshift specific information for OpenLineage."""

{apache_airflow_providers_postgres-6.0.0rc2.dist-info → apache_airflow_providers_postgres-6.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: apache-airflow-providers-postgres
-Version: 6.0.0rc2
+Version: 6.1.0
 Summary: Provider package apache-airflow-providers-postgres for Apache Airflow
 Keywords: airflow-provider,postgres,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
@@ -20,15 +20,15 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: System :: Monitoring
-Requires-Dist: apache-airflow-providers-common-sql>=1.20.0rc0
-Requires-Dist: apache-airflow>=2.9.0rc0
+Requires-Dist: apache-airflow>=2.9.0
+Requires-Dist: apache-airflow-providers-common-sql>=1.20.0
+Requires-Dist: psycopg2-binary>=2.9.9
 Requires-Dist: asyncpg>=0.30.0
-Requires-Dist: psycopg2-binary>=2.9.4
-Requires-Dist: apache-airflow-providers-amazon>=2.6.0rc0 ; extra == "amazon"
+Requires-Dist: apache-airflow-providers-amazon>=2.6.0 ; extra == "amazon"
 Requires-Dist: apache-airflow-providers-openlineage ; extra == "openlineage"
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-postgres/6.0.0/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-postgres/6.0.0
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-postgres/6.1.0/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-postgres/6.1.0
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
 Project-URL: Twitter, https://x.com/ApacheAirflow
@@ -37,23 +37,6 @@ Provides-Extra: amazon
 Provides-Extra: openlineage
 
 
-.. Licensed to the Apache Software Foundation (ASF) under one
-   or more contributor license agreements.  See the NOTICE file
-   distributed with this work for additional information
-   regarding copyright ownership.  The ASF licenses this file
-   to you under the Apache License, Version 2.0 (the
-   "License"); you may not use this file except in compliance
-   with the License.  You may obtain a copy of the License at
-
-..   http://www.apache.org/licenses/LICENSE-2.0
-
-.. Unless required by applicable law or agreed to in writing,
-   software distributed under the License is distributed on an
-   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-   KIND, either express or implied.  See the License for the
-   specific language governing permissions and limitations
-   under the License.
-
  .. Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements.  See the NOTICE file
     distributed with this work for additional information
@@ -71,8 +54,7 @@ Provides-Extra: openlineage
     specific language governing permissions and limitations
     under the License.
 
- .. NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE
-    OVERWRITTEN WHEN PREPARING PACKAGES.
+ .. NOTE! THIS FILE IS AUTOMATICALLY GENERATED AND WILL BE OVERWRITTEN!
 
  .. IF YOU WANT TO MODIFY TEMPLATE FOR THIS FILE, YOU SHOULD MODIFY THE TEMPLATE
     `PROVIDER_README_TEMPLATE.rst.jinja2` IN the `dev/breeze/src/airflow_breeze/templates` DIRECTORY
@@ -80,7 +62,7 @@ Provides-Extra: openlineage
 
 Package ``apache-airflow-providers-postgres``
 
-Release: ``6.0.0.rc2``
+Release: ``6.1.0``
 
 
 `PostgreSQL <https://www.postgresql.org/>`__
@@ -93,7 +75,7 @@ This is a provider package for ``postgres`` provider. All classes for this provi
 are in ``airflow.providers.postgres`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-postgres/6.0.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-postgres/6.1.0/>`_.
 
 Installation
 ------------
@@ -112,7 +94,7 @@ PIP package                              Version required
 =======================================  ==================
 ``apache-airflow``                       ``>=2.9.0``
 ``apache-airflow-providers-common-sql``  ``>=1.20.0``
-``psycopg2-binary``                      ``>=2.9.4``
+``psycopg2-binary``                      ``>=2.9.9``
 ``asyncpg``                              ``>=0.30.0``
 =======================================  ==================
 
@@ -138,4 +120,5 @@ Dependent package
 ==============================================================================================================  ===============
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-postgres/6.0.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-postgres/6.1.0/changelog.html>`_.
+

apache_airflow_providers_postgres-6.1.0.dist-info/RECORD

@@ -0,0 +1,13 @@
+airflow/providers/postgres/LICENSE,sha256=gXPVwptPlW1TJ4HSuG5OMPg-a3h43OGMkZRR1rpwfJA,10850
+airflow/providers/postgres/__init__.py,sha256=XbN-r5LDooxkxB7EU6LVRpryzy3eVIiuuUXbMh-dmLo,1495
+airflow/providers/postgres/get_provider_info.py,sha256=sy38Sh3dEDgzROzeh1MsWjAIq_8vwrXbFGMc7Q4JQfY,4002
+airflow/providers/postgres/assets/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
+airflow/providers/postgres/assets/postgres.py,sha256=XNhOJCbOA_soaaiS73JjULMqAM_7PBryhToe8FJREA0,1522
+airflow/providers/postgres/dialects/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
+airflow/providers/postgres/dialects/postgres.py,sha256=8ygA2Jq2WBPhNOISU8YyitLmahxWnPGYNt8OaU_CBFI,3764
+airflow/providers/postgres/hooks/__init__.py,sha256=mlJxuZLkd5x-iq2SBwD3mvRQpt3YR7wjz_nceyF1IaI,787
+airflow/providers/postgres/hooks/postgres.py,sha256=icb_MSQ1BXWcE9vaa-hUPWyykpTmqQKdLsxVB-jvHBk,15238
+apache_airflow_providers_postgres-6.1.0.dist-info/entry_points.txt,sha256=dhtJi6PTWHd6BwKhmI4OtSPvQVI_p0yYWI0eba83HqY,104
+apache_airflow_providers_postgres-6.1.0.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+apache_airflow_providers_postgres-6.1.0.dist-info/METADATA,sha256=RG7hh1ZxcswwvgPSt0M_6C-t1OpIjeDSs3B_7d4iPmc,5705
+apache_airflow_providers_postgres-6.1.0.dist-info/RECORD,,

apache_airflow_providers_postgres-6.0.0rc2.dist-info/RECORD

@@ -1,11 +0,0 @@
-airflow/providers/postgres/LICENSE,sha256=FFb4jd2AXnOOf7XLP04pQW6jbdhG49TxlGY6fFpCV1Y,13609
-airflow/providers/postgres/__init__.py,sha256=Fot2q5J0MqxTT660Ulle4BC-yXNhsHyHl6fHbkmjEdM,1495
-airflow/providers/postgres/get_provider_info.py,sha256=dW-WC9XPDvGPfbhPilsb5igbOO2HGUGq0p2o0g9PPSw,3800
-airflow/providers/postgres/assets/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/postgres/assets/postgres.py,sha256=XNhOJCbOA_soaaiS73JjULMqAM_7PBryhToe8FJREA0,1522
-airflow/providers/postgres/hooks/__init__.py,sha256=mlJxuZLkd5x-iq2SBwD3mvRQpt3YR7wjz_nceyF1IaI,787
-airflow/providers/postgres/hooks/postgres.py,sha256=h7eGDkg8sYpgVwAXFC72pWNKT6oxZK6hCUGtgae5S3U,17531
-apache_airflow_providers_postgres-6.0.0rc2.dist-info/entry_points.txt,sha256=dhtJi6PTWHd6BwKhmI4OtSPvQVI_p0yYWI0eba83HqY,104
-apache_airflow_providers_postgres-6.0.0rc2.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-apache_airflow_providers_postgres-6.0.0rc2.dist-info/METADATA,sha256=cbWC9ACb65_hulXkRNcul3fScWsoHWYRhFNp7O46Tr4,6546
-apache_airflow_providers_postgres-6.0.0rc2.dist-info/RECORD,,