apache-airflow-providers-postgres 5.14.0__tar.gz → 6.0.0__tar.gz

{apache_airflow_providers_postgres-5.14.0 → apache_airflow_providers_postgres-6.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: apache-airflow-providers-postgres
-Version: 5.14.0
+Version: 6.0.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>
@@ -21,20 +21,19 @@ 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.0
-Requires-Dist: apache-airflow>=2.8.0
+Requires-Dist: apache-airflow>=2.9.0
+Requires-Dist: asyncpg>=0.30.0
 Requires-Dist: psycopg2-binary>=2.9.4
 Requires-Dist: apache-airflow-providers-amazon>=2.6.0 ; extra == "amazon"
-Requires-Dist: apache-airflow-providers-common-sql ; extra == "common-sql"
 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/5.14.0/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-postgres/5.14.0
+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: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
-Project-URL: Twitter, https://twitter.com/ApacheAirflow
+Project-URL: Twitter, https://x.com/ApacheAirflow
 Project-URL: YouTube, https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/
 Provides-Extra: amazon
-Provides-Extra: common-sql
 Provides-Extra: openlineage
 
 
@@ -81,7 +80,7 @@ Provides-Extra: openlineage
 
 Package ``apache-airflow-providers-postgres``
 
-Release: ``5.14.0``
+Release: ``6.0.0``
 
 
 `PostgreSQL <https://www.postgresql.org/>`__
@@ -94,7 +93,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/5.14.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-postgres/6.0.0/>`_.
 
 Installation
 ------------
@@ -111,9 +110,10 @@ Requirements
 =======================================  ==================
 PIP package                              Version required
 =======================================  ==================
-``apache-airflow``                       ``>=2.8.0``
+``apache-airflow``                       ``>=2.9.0``
 ``apache-airflow-providers-common-sql``  ``>=1.20.0``
 ``psycopg2-binary``                      ``>=2.9.4``
+``asyncpg``                              ``>=0.30.0``
 =======================================  ==================
 
 Cross provider package dependencies
@@ -138,4 +138,4 @@ Dependent package
 ==============================================================================================================  ===============
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-postgres/5.14.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-postgres/6.0.0/changelog.html>`_.

{apache_airflow_providers_postgres-5.14.0 → apache_airflow_providers_postgres-6.0.0}/README.rst

@@ -42,7 +42,7 @@
 
 Package ``apache-airflow-providers-postgres``
 
-Release: ``5.14.0``
+Release: ``6.0.0``
 
 
 `PostgreSQL <https://www.postgresql.org/>`__
@@ -55,7 +55,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/5.14.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-postgres/6.0.0/>`_.
 
 Installation
 ------------
@@ -72,9 +72,10 @@ Requirements
 =======================================  ==================
 PIP package                              Version required
 =======================================  ==================
-``apache-airflow``                       ``>=2.8.0``
+``apache-airflow``                       ``>=2.9.0``
 ``apache-airflow-providers-common-sql``  ``>=1.20.0``
 ``psycopg2-binary``                      ``>=2.9.4``
+``asyncpg``                              ``>=0.30.0``
 =======================================  ==================
 
 Cross provider package dependencies
@@ -99,4 +100,4 @@ Dependent package
 ==============================================================================================================  ===============
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-postgres/5.14.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-postgres/6.0.0/changelog.html>`_.

{apache_airflow_providers_postgres-5.14.0 → apache_airflow_providers_postgres-6.0.0}/airflow/providers/postgres/__init__.py

@@ -29,11 +29,11 @@ from airflow import __version__ as airflow_version
 
 __all__ = ["__version__"]
 
-__version__ = "5.14.0"
+__version__ = "6.0.0"
 
 if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
-    "2.8.0"
+    "2.9.0"
 ):
     raise RuntimeError(
-        f"The package `apache-airflow-providers-postgres:{__version__}` needs Apache Airflow 2.8.0+"
+        f"The package `apache-airflow-providers-postgres:{__version__}` needs Apache Airflow 2.9.0+"
     )

{apache_airflow_providers_postgres-5.14.0 → apache_airflow_providers_postgres-6.0.0}/airflow/providers/postgres/get_provider_info.py

@@ -28,8 +28,9 @@ def get_provider_info():
         "name": "PostgreSQL",
         "description": "`PostgreSQL <https://www.postgresql.org/>`__\n",
         "state": "ready",
-        "source-date-epoch": 1731570750,
+        "source-date-epoch": 1734536300,
         "versions": [
+            "6.0.0",
             "5.14.0",
             "5.13.1",
             "5.13.0",
@@ -72,9 +73,10 @@ def get_provider_info():
             "1.0.0",
         ],
         "dependencies": [
-            "apache-airflow>=2.8.0",
+            "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": [
@@ -88,12 +90,6 @@ def get_provider_info():
                 "tags": ["software"],
             }
         ],
-        "operators": [
-            {
-                "integration-name": "PostgreSQL",
-                "python-modules": ["airflow.providers.postgres.operators.postgres"],
-            }
-        ],
         "hooks": [
             {
                 "integration-name": "PostgreSQL",

{apache_airflow_providers_postgres-5.14.0 → apache_airflow_providers_postgres-6.0.0}/airflow/providers/postgres/hooks/postgres.py

@@ -18,19 +18,18 @@
 from __future__ import annotations
 
 import os
-import warnings
+from collections.abc import Iterable
 from contextlib import closing
 from copy import deepcopy
-from typing import TYPE_CHECKING, Any, Iterable, Union
+from typing import TYPE_CHECKING, Any, Union
 
 import psycopg2
 import psycopg2.extensions
 import psycopg2.extras
-from deprecated import deprecated
 from psycopg2.extras import DictCursor, NamedTupleCursor, RealDictCursor
 from sqlalchemy.engine import URL
 
-from airflow.exceptions import AirflowProviderDeprecationWarning
+from airflow.exceptions import AirflowException
 from airflow.providers.common.sql.hooks.sql import DbApiHook
 
 if TYPE_CHECKING:
@@ -87,49 +86,33 @@ class PostgresHook(DbApiHook):
     hook_name = "Postgres"
     supports_autocommit = True
     supports_executemany = True
+    ignored_extra_options = {
+        "iam",
+        "redshift",
+        "redshift-serverless",
+        "cursor",
+        "cluster-identifier",
+        "workgroup-name",
+        "aws_conn_id",
+        "sqlalchemy_scheme",
+        "sqlalchemy_query",
+    }
 
     def __init__(
         self, *args, options: str | None = None, enable_log_db_messages: bool = False, **kwargs
     ) -> None:
-        if "schema" in kwargs:
-            warnings.warn(
-                'The "schema" arg has been renamed to "database" as it contained the database name.'
-                'Please use "database" to set the database name.',
-                AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
-            kwargs["database"] = kwargs["schema"]
         super().__init__(*args, **kwargs)
         self.conn: connection = None
         self.database: str | None = kwargs.pop("database", None)
         self.options = options
         self.enable_log_db_messages = enable_log_db_messages
 
-    @property
-    @deprecated(
-        reason=(
-            'The "schema" variable has been renamed to "database" as it contained the database name.'
-            'Please use "database" to get the database name.'
-        ),
-        category=AirflowProviderDeprecationWarning,
-    )
-    def schema(self):
-        return self.database
-
-    @schema.setter
-    @deprecated(
-        reason=(
-            'The "schema" variable has been renamed to "database" as it contained the database name.'
-            'Please use "database" to set the database name.'
-        ),
-        category=AirflowProviderDeprecationWarning,
-    )
-    def schema(self, value):
-        self.database = value
-
     @property
     def sqlalchemy_url(self) -> URL:
-        conn = self.get_connection(self.get_conn_id())
+        conn = self.connection
+        query = conn.extra_dejson.get("sqlalchemy_query", {})
+        if not isinstance(query, dict):
+            raise AirflowException("The parameter 'sqlalchemy_query' must be of type dict!")
         return URL.create(
             drivername="postgresql",
             username=conn.login,
@@ -137,6 +120,7 @@ class PostgresHook(DbApiHook):
             host=conn.host,
             port=conn.port,
             database=self.database or conn.schema,
+            query=query,
         )
 
     def _get_cursor(self, raw_cursor: str) -> CursorType:
@@ -175,15 +159,7 @@ class PostgresHook(DbApiHook):
             conn_args["options"] = self.options
 
         for arg_name, arg_val in conn.extra_dejson.items():
-            if arg_name not in [
-                "iam",
-                "redshift",
-                "redshift-serverless",
-                "cursor",
-                "cluster-identifier",
-                "workgroup-name",
-                "aws_conn_id",
-            ]:
+            if arg_name not in self.ignored_extra_options:
                 conn_args[arg_name] = arg_val
 
         self.conn = psycopg2.connect(**conn_args)

{apache_airflow_providers_postgres-5.14.0 → apache_airflow_providers_postgres-6.0.0}/pyproject.toml

@@ -27,7 +27,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-postgres"
-version = "5.14.0"
+version = "6.0.0"
 description = "Provider package apache-airflow-providers-postgres for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -55,17 +55,18 @@ classifiers = [
 requires-python = "~=3.9"
 dependencies = [
     "apache-airflow-providers-common-sql>=1.20.0",
-    "apache-airflow>=2.8.0",
+    "apache-airflow>=2.9.0",
+    "asyncpg>=0.30.0",
     "psycopg2-binary>=2.9.4",
 ]
 
 [project.urls]
-"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-postgres/5.14.0"
-"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-postgres/5.14.0/changelog.html"
+"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-postgres/6.0.0"
+"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-postgres/6.0.0/changelog.html"
 "Bug Tracker" = "https://github.com/apache/airflow/issues"
 "Source Code" = "https://github.com/apache/airflow"
 "Slack Chat" = "https://s.apache.org/airflow-slack"
-"Twitter" = "https://twitter.com/ApacheAirflow"
+"Twitter" = "https://x.com/ApacheAirflow"
 "YouTube" = "https://www.youtube.com/channel/UCSXwxpWZQ7XZ1WL3wqevChA/"
 
 [project.entry-points."apache_airflow_provider"]
@@ -74,9 +75,6 @@ provider_info = "airflow.providers.postgres.get_provider_info:get_provider_info"
 "amazon" = [
     "apache-airflow-providers-amazon>=2.6.0",
 ]
-"common.sql" = [
-    "apache-airflow-providers-common-sql",
-]
 "openlineage" = [
     "apache-airflow-providers-openlineage",
 ]

apache_airflow_providers_postgres-5.14.0/airflow/providers/postgres/operators/__init__.py

@@ -1,17 +0,0 @@
-#
-# 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.

apache_airflow_providers_postgres-5.14.0/airflow/providers/postgres/operators/postgres.py

@@ -1,87 +0,0 @@
-#
-# 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
-
-import warnings
-from typing import ClassVar, Mapping
-
-from deprecated import deprecated
-
-from airflow.exceptions import AirflowProviderDeprecationWarning
-from airflow.providers.common.sql.operators.sql import SQLExecuteQueryOperator
-
-
-@deprecated(
-    reason=(
-        "Please use `airflow.providers.common.sql.operators.sql.SQLExecuteQueryOperator`."
-        "Also, you can provide `hook_params={'schema': <database>}`."
-    ),
-    category=AirflowProviderDeprecationWarning,
-)
-class PostgresOperator(SQLExecuteQueryOperator):
-    """
-    Executes sql code in a specific Postgres database.
-
-    This class is deprecated.
-
-    Please use :class:`airflow.providers.common.sql.operators.sql.SQLExecuteQueryOperator`.
-
-    :param sql: the SQL code to be executed as a single string, or
-        a list of str (sql statements), or a reference to a template file.
-        Template references are recognized by str ending in '.sql'
-    :param postgres_conn_id: The :ref:`postgres conn id <howto/connection:postgres>`
-        reference to a specific postgres database.
-    :param autocommit: if True, each command is automatically committed.
-        (default value: False)
-    :param parameters: (optional) the parameters to render the SQL query with.
-    :param database: name of database which overwrite defined one in connection
-    :param runtime_parameters: a mapping of runtime params added to the final sql being executed.
-        For example, you could set the schema via `{"search_path": "CUSTOM_SCHEMA"}`.
-        Deprecated - use `hook_params={'options': '-c <connection_options>'}` instead.
-    """
-
-    template_fields_renderers: ClassVar[dict] = {
-        **SQLExecuteQueryOperator.template_fields_renderers,
-        "sql": "postgresql",
-    }
-    ui_color = "#ededed"
-
-    def __init__(
-        self,
-        *,
-        postgres_conn_id: str = "postgres_default",
-        database: str | None = None,
-        runtime_parameters: Mapping | None = None,
-        **kwargs,
-    ) -> None:
-        if database is not None:
-            hook_params = kwargs.pop("hook_params", {})
-            kwargs["hook_params"] = {"database": database, **hook_params}
-
-        if runtime_parameters:
-            warnings.warn(
-                """`runtime_parameters` is deprecated.
-                Please use `hook_params={'options': '-c <connection_options>}`.""",
-                AirflowProviderDeprecationWarning,
-                stacklevel=2,
-            )
-            hook_params = kwargs.pop("hook_params", {})
-            options = " ".join(f"-c {param}={val}" for param, val in runtime_parameters.items())
-            kwargs["hook_params"] = {"options": options, **hook_params}
-
-        super().__init__(conn_id=postgres_conn_id, **kwargs)