apache-airflow-providers-common-sql 1.14.1rc1__py3-none-any.whl → 1.14.2rc1__py3-none-any.whl

airflow/providers/common/sql/__init__.py

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

airflow/providers/common/sql/get_provider_info.py

@@ -28,8 +28,9 @@ def get_provider_info():
         "name": "Common SQL",
         "description": "`Common SQL Provider <https://en.wikipedia.org/wiki/SQL>`__\n",
         "state": "ready",
-        "source-date-epoch": 1718604106,
+        "source-date-epoch": 1720422590,
         "versions": [
+            "1.14.2",
             "1.14.1",
             "1.14.0",
             "1.13.0",

airflow/providers/common/sql/hooks/sql.py

@@ -20,6 +20,7 @@ import contextlib
 import warnings
 from contextlib import closing, contextmanager
 from datetime import datetime
+from functools import cached_property
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -54,6 +55,7 @@ if TYPE_CHECKING:
     from airflow.providers.openlineage.extractors import OperatorLineage
     from airflow.providers.openlineage.sqlparser import DatabaseInfo
 
+
 T = TypeVar("T")
 SQL_PLACEHOLDERS = frozenset({"%s", "?"})
 
@@ -181,24 +183,28 @@ class DbApiHook(BaseHook):
             "replace_statement_format", "REPLACE INTO {} {} VALUES ({})"
         )
 
-    @property
+    def get_conn_id(self) -> str:
+        return getattr(self, self.conn_name_attr)
+
+    @cached_property
     def placeholder(self):
-        conn = self.get_connection(getattr(self, self.conn_name_attr))
+        conn = self.get_connection(self.get_conn_id())
         placeholder = conn.extra_dejson.get("placeholder")
         if placeholder:
             if placeholder in SQL_PLACEHOLDERS:
                 return placeholder
             self.log.warning(
-                "Placeholder defined in Connection '%s' is not listed in 'DEFAULT_SQL_PLACEHOLDERS' "
+                "Placeholder '%s' defined in Connection '%s' is not listed in 'DEFAULT_SQL_PLACEHOLDERS' "
                 "and got ignored. Falling back to the default placeholder '%s'.",
-                self.conn_name_attr,
+                placeholder,
+                self.get_conn_id(),
                 self._placeholder,
             )
         return self._placeholder
 
     def get_conn(self):
         """Return a connection object."""
-        db = self.get_connection(getattr(self, cast(str, self.conn_name_attr)))
+        db = self.get_connection(self.get_conn_id())
         return self.connector.connect(host=db.host, port=db.port, username=db.login, schema=db.schema)
 
     def get_uri(self) -> str:
@@ -207,7 +213,7 @@ class DbApiHook(BaseHook):
 
         :return: the extracted uri.
         """
-        conn = self.get_connection(getattr(self, self.conn_name_attr))
+        conn = self.get_connection(self.get_conn_id())
         conn.schema = self.__schema or conn.schema
         return conn.get_uri()
 
@@ -363,7 +369,8 @@ class DbApiHook(BaseHook):
         split_statements: bool = False,
         return_last: bool = True,
     ) -> tuple | list[tuple] | list[list[tuple] | tuple] | None:
-        """Run a command or a list of commands.
+        """
+        Run a command or a list of commands.
 
         Pass a list of SQL statements to the sql parameter to get them to
         execute sequentially.
@@ -456,7 +463,8 @@ class DbApiHook(BaseHook):
             return results
 
     def _make_common_data_structure(self, result: T | Sequence[T]) -> tuple | list[tuple]:
-        """Ensure the data returned from an SQL command is a standard tuple or list[tuple].
+        """
+        Ensure the data returned from an SQL command is a standard tuple or list[tuple].
 
         This method is intended to be overridden by subclasses of the `DbApiHook`. Its purpose is to
         transform the result of an SQL command (typically returned by cursor methods) into a common
@@ -500,12 +508,13 @@ class DbApiHook(BaseHook):
         if not self.supports_autocommit and autocommit:
             self.log.warning(
                 "%s connection doesn't support autocommit but autocommit activated.",
-                getattr(self, self.conn_name_attr),
+                self.get_conn_id(),
             )
         conn.autocommit = autocommit
 
     def get_autocommit(self, conn) -> bool:
-        """Get autocommit setting for the provided connection.
+        """
+        Get autocommit setting for the provided connection.
 
         :param conn: Connection to get autocommit setting from.
         :return: connection autocommit setting. True if ``autocommit`` is set
@@ -564,7 +573,8 @@ class DbApiHook(BaseHook):
         executemany=False,
         **kwargs,
     ):
-        """Insert a collection of tuples into a table.
+        """
+        Insert a collection of tuples into a table.
 
         Rows are inserted in chunks, each chunk (of size ``commit_every``) is
         done in a new transaction.

airflow/providers/common/sql/hooks/sql.pyi

@@ -40,6 +40,7 @@ from airflow.exceptions import (
 from airflow.hooks.base import BaseHook as BaseHook
 from airflow.providers.openlineage.extractors import OperatorLineage as OperatorLineage
 from airflow.providers.openlineage.sqlparser import DatabaseInfo as DatabaseInfo
+from functools import cached_property as cached_property
 from pandas import DataFrame as DataFrame
 from sqlalchemy.engine import URL as URL
 from typing import Any, Callable, Generator, Iterable, Mapping, Protocol, Sequence, TypeVar, overload
@@ -63,7 +64,9 @@ class DbApiHook(BaseHook):
     log_sql: Incomplete
     descriptions: Incomplete
     def __init__(self, *args, schema: str | None = None, log_sql: bool = True, **kwargs) -> None: ...
-    @property
+
+    def get_conn_id(self) -> str: ...
+    @cached_property
     def placeholder(self): ...
     def get_conn(self): ...
     def get_uri(self) -> str: ...

airflow/providers/common/sql/operators/sql.py

@@ -41,7 +41,8 @@ def _convert_to_float_if_possible(s: str) -> float | str:
 
 
 def _parse_boolean(val: str) -> str | bool:
-    """Try to parse a string into boolean.
+    """
+    Try to parse a string into boolean.
 
     Raises ValueError if the input is not a valid true- or false-like string value.
     """
@@ -177,7 +178,10 @@ class BaseSQLOperator(BaseOperator):
             )
 
         if self.database:
-            hook.schema = self.database
+            if hook.conn_type == "postgres":
+                hook.database = self.database
+            else:
+                hook.schema = self.database
 
         return hook
 

airflow/providers/common/sql/sensors/sql.py

@@ -28,7 +28,8 @@ if TYPE_CHECKING:
 
 
 class SqlSensor(BaseSensorOperator):
-    """Run a SQL statement repeatedly until a criteria is met.
+    """
+    Run a SQL statement repeatedly until a criteria is met.
 
     This will keep trying until success or failure criteria are met, or if the
     first cell is not either ``0``, ``'0'``, ``''``, or ``None``. Optional

{apache_airflow_providers_common_sql-1.14.1rc1.dist-info → apache_airflow_providers_common_sql-1.14.2rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apache-airflow-providers-common-sql
-Version: 1.14.1rc1
+Version: 1.14.2rc1
 Summary: Provider package apache-airflow-providers-common-sql for Apache Airflow
 Keywords: airflow-provider,common.sql,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
@@ -28,8 +28,8 @@ Requires-Dist: apache-airflow-providers-openlineage ; extra == "openlineage"
 Requires-Dist: pandas>=2.1.2,<2.2 ; extra == "pandas" and (python_version>="3.9")
 Requires-Dist: pandas>=1.5.3,<2.2 ; extra == "pandas" and (python_version<"3.9")
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-common-sql/1.14.1/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-common-sql/1.14.1
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-common-sql/1.14.2/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-common-sql/1.14.2
 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
@@ -81,7 +81,7 @@ Provides-Extra: pandas
 
 Package ``apache-airflow-providers-common-sql``
 
-Release: ``1.14.1.rc1``
+Release: ``1.14.2.rc1``
 
 
 `Common SQL Provider <https://en.wikipedia.org/wiki/SQL>`__
@@ -94,7 +94,7 @@ This is a provider package for ``common.sql`` provider. All classes for this pro
 are in ``airflow.providers.common.sql`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-common-sql/1.14.1/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-common-sql/1.14.2/>`_.
 
 Installation
 ------------
@@ -136,4 +136,4 @@ Dependent package
 ==============================================================================================================  ===============
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-common-sql/1.14.1/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-common-sql/1.14.2/changelog.html>`_.

{apache_airflow_providers_common_sql-1.14.1rc1.dist-info → apache_airflow_providers_common_sql-1.14.2rc1.dist-info}/RECORD

@@ -1,19 +1,19 @@
 airflow/providers/common/sql/LICENSE,sha256=FFb4jd2AXnOOf7XLP04pQW6jbdhG49TxlGY6fFpCV1Y,13609
 airflow/providers/common/sql/README_API.md,sha256=CxhaS8EedZ4dcbLUPC4-GLCMaY3OH96oHxXttUGU06E,5932
-airflow/providers/common/sql/__init__.py,sha256=CMYvtIjm5T1Wume9HWp78x_8lkdnFyVV8D2u1-YEUNU,1498
-airflow/providers/common/sql/get_provider_info.py,sha256=E4I1cYYFPKh2p7W6Et9TE2aFNZ9kW1EePepI7dN0Qlk,3233
+airflow/providers/common/sql/__init__.py,sha256=_e9jiJfneIarxjGWFuYzbtLFQUoaqUUEfQ0tRZNr3Mc,1498
+airflow/providers/common/sql/get_provider_info.py,sha256=25Djfn7WkF5fNCpnIfjUmqxanaoxOQCGpS6Dw80Z4Uc,3255
 airflow/providers/common/sql/doc/adr/0001-record-architecture-decisions.md,sha256=TfANqrzoFto9PMOMza3MitIkXHGLx2kY_BhhF-N0_ow,1675
 airflow/providers/common/sql/doc/adr/0002-return-common-data-structure-from-dbapihook-derived-hooks.md,sha256=ze5w9IVS-HkUwdZvPW8_JaJaVwel7-N6XdEVN4pTuCE,8457
 airflow/providers/common/sql/hooks/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/common/sql/hooks/sql.py,sha256=x-jW6oSmCWU5RS3Ev9Hnau7M884KEUdaoXIKAlXHWKQ,29603
-airflow/providers/common/sql/hooks/sql.pyi,sha256=iwsV-yalhYz5aBdPqaNl1x0YYYqjP75N18moKXbVYQU,5570
+airflow/providers/common/sql/hooks/sql.py,sha256=Ax3Q1mUsTgIVUWglb6jrXGVONmwL1WJkSLsXRfa6Tqg,29728
+airflow/providers/common/sql/hooks/sql.pyi,sha256=5cERPx3bJVspqP_jDuhg0p4DUhge5W5q_HcJEStfztA,5673
 airflow/providers/common/sql/operators/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/common/sql/operators/sql.py,sha256=qbbwWBgDAKOgSYEVZWzIo3OB3CmJYD2Dx99H6PjYTGM,48435
+airflow/providers/common/sql/operators/sql.py,sha256=hX42WOWOLcVIORP8TIUTUVoA8g_nF4sucX4Cl2BMXVk,48553
 airflow/providers/common/sql/operators/sql.pyi,sha256=WrzYlWtRT8SGswxPsXMv8oqobrooOlEWeGOjtMnNEBI,8589
 airflow/providers/common/sql/sensors/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/common/sql/sensors/sql.py,sha256=yy8prgci9YPM8rgK8RCjtYxvInb-DxiZaFCucMnTJUg,5969
+airflow/providers/common/sql/sensors/sql.py,sha256=Yz_O4w5zA4HUZSH1f4aR2ry5P1fcTdyRnqIWZ69ggEs,5974
 airflow/providers/common/sql/sensors/sql.pyi,sha256=hDt9OeV5SHpz4s8yHhohrEUzNuKBgT4IHOU5b9rQnKo,2706
-apache_airflow_providers_common_sql-1.14.1rc1.dist-info/entry_points.txt,sha256=h8UXRp2crPuGmYVYRM5oe168qIh7g-4t2QQbVMizKjI,106
-apache_airflow_providers_common_sql-1.14.1rc1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-apache_airflow_providers_common_sql-1.14.1rc1.dist-info/METADATA,sha256=50X7wRrSUWtLztTeTJ75Hw-R5lLJaQw4LesguR5jk44,6227
-apache_airflow_providers_common_sql-1.14.1rc1.dist-info/RECORD,,
+apache_airflow_providers_common_sql-1.14.2rc1.dist-info/entry_points.txt,sha256=h8UXRp2crPuGmYVYRM5oe168qIh7g-4t2QQbVMizKjI,106
+apache_airflow_providers_common_sql-1.14.2rc1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+apache_airflow_providers_common_sql-1.14.2rc1.dist-info/METADATA,sha256=F55SR9cp9IDYheZD7Ea9noWxsB0qajZ2nxURa11HNaM,6227
+apache_airflow_providers_common_sql-1.14.2rc1.dist-info/RECORD,,