apache-airflow-providers-common-sql 1.28.1__tar.gz → 1.30.0rc2__tar.gz

apache_airflow_providers_common_sql-1.30.0rc2/NOTICE

@@ -0,0 +1,5 @@
+Apache Airflow
+Copyright 2016-2025 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-common-sql
-Version: 1.28.1
+Version: 1.30.0rc2
 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>
 Maintainer-email: Apache Software Foundation <dev@airflow.apache.org>
 Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
+License-Expression: Apache-2.0
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Environment :: Web Environment
@@ -14,13 +15,15 @@ Classifier: Intended Audience :: Developers
 Classifier: Intended Audience :: System Administrators
 Classifier: Framework :: Apache Airflow
 Classifier: Framework :: Apache Airflow :: Provider
-Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: System :: Monitoring
-Requires-Dist: apache-airflow>=2.10.0
+License-File: LICENSE
+License-File: NOTICE
+Requires-Dist: apache-airflow>=2.11.0rc1
+Requires-Dist: apache-airflow-providers-common-compat>=1.10.0rc1
 Requires-Dist: sqlparse>=0.5.1
 Requires-Dist: more-itertools>=9.0.0
 Requires-Dist: methodtools>=0.4.7
@@ -29,8 +32,8 @@ Requires-Dist: pandas[sql-other]>=2.1.2 ; extra == "pandas" and ( python_version
 Requires-Dist: pandas>=2.2.3 ; extra == "pandas" and ( python_version >="3.13")
 Requires-Dist: polars>=1.26.0 ; extra == "polars"
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-common-sql/1.28.1/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-common-sql/1.28.1
+Project-URL: Changelog, https://airflow.staged.apache.org/docs/apache-airflow-providers-common-sql/1.30.0/changelog.html
+Project-URL: Documentation, https://airflow.staged.apache.org/docs/apache-airflow-providers-common-sql/1.30.0
 Project-URL: Mastodon, https://fosstodon.org/@airflow
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
@@ -64,7 +67,7 @@ Provides-Extra: polars
 
 Package ``apache-airflow-providers-common-sql``
 
-Release: ``1.28.1``
+Release: ``1.30.0``
 
 
 `Common SQL Provider <https://en.wikipedia.org/wiki/SQL>`__
@@ -77,7 +80,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.28.1/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-common-sql/1.30.0/>`_.
 
 Installation
 ------------
@@ -91,14 +94,15 @@ The package supports the following python versions: 3.10,3.11,3.12,3.13
 Requirements
 ------------
 
-==================  ==================
-PIP package         Version required
-==================  ==================
-``apache-airflow``  ``>=2.10.0``
-``sqlparse``        ``>=0.5.1``
-``more-itertools``  ``>=9.0.0``
-``methodtools``     ``>=0.4.7``
-==================  ==================
+==========================================  ==================
+PIP package                                 Version required
+==========================================  ==================
+``apache-airflow``                          ``>=2.11.0``
+``apache-airflow-providers-common-compat``  ``>=1.10.0``
+``sqlparse``                                ``>=0.5.1``
+``more-itertools``                          ``>=9.0.0``
+``methodtools``                             ``>=0.4.7``
+==========================================  ==================
 
 Cross provider package dependencies
 -----------------------------------
@@ -110,14 +114,15 @@ You can install such cross-provider dependencies when installing from PyPI. For
 
 .. code-block:: bash
 
-    pip install apache-airflow-providers-common-sql[openlineage]
+    pip install apache-airflow-providers-common-sql[common.compat]
 
 
-==============================================================================================================  ===============
-Dependent package                                                                                               Extra
-==============================================================================================================  ===============
-`apache-airflow-providers-openlineage <https://airflow.apache.org/docs/apache-airflow-providers-openlineage>`_  ``openlineage``
-==============================================================================================================  ===============
+==================================================================================================================  =================
+Dependent package                                                                                                   Extra
+==================================================================================================================  =================
+`apache-airflow-providers-common-compat <https://airflow.apache.org/docs/apache-airflow-providers-common-compat>`_  ``common.compat``
+`apache-airflow-providers-openlineage <https://airflow.apache.org/docs/apache-airflow-providers-openlineage>`_      ``openlineage``
+==================================================================================================================  =================
 
 Optional dependencies
 ----------------------
@@ -131,5 +136,5 @@ Extra            Dependencies
 ===============  ================================================================================================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-common-sql/1.28.1/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-common-sql/1.30.0/changelog.html>`_.
 

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/README.rst

@@ -23,7 +23,7 @@
 
 Package ``apache-airflow-providers-common-sql``
 
-Release: ``1.28.1``
+Release: ``1.30.0``
 
 
 `Common SQL Provider <https://en.wikipedia.org/wiki/SQL>`__
@@ -36,7 +36,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.28.1/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-common-sql/1.30.0/>`_.
 
 Installation
 ------------
@@ -50,14 +50,15 @@ The package supports the following python versions: 3.10,3.11,3.12,3.13
 Requirements
 ------------
 
-==================  ==================
-PIP package         Version required
-==================  ==================
-``apache-airflow``  ``>=2.10.0``
-``sqlparse``        ``>=0.5.1``
-``more-itertools``  ``>=9.0.0``
-``methodtools``     ``>=0.4.7``
-==================  ==================
+==========================================  ==================
+PIP package                                 Version required
+==========================================  ==================
+``apache-airflow``                          ``>=2.11.0``
+``apache-airflow-providers-common-compat``  ``>=1.10.0``
+``sqlparse``                                ``>=0.5.1``
+``more-itertools``                          ``>=9.0.0``
+``methodtools``                             ``>=0.4.7``
+==========================================  ==================
 
 Cross provider package dependencies
 -----------------------------------
@@ -69,14 +70,15 @@ You can install such cross-provider dependencies when installing from PyPI. For
 
 .. code-block:: bash
 
-    pip install apache-airflow-providers-common-sql[openlineage]
+    pip install apache-airflow-providers-common-sql[common.compat]
 
 
-==============================================================================================================  ===============
-Dependent package                                                                                               Extra
-==============================================================================================================  ===============
-`apache-airflow-providers-openlineage <https://airflow.apache.org/docs/apache-airflow-providers-openlineage>`_  ``openlineage``
-==============================================================================================================  ===============
+==================================================================================================================  =================
+Dependent package                                                                                                   Extra
+==================================================================================================================  =================
+`apache-airflow-providers-common-compat <https://airflow.apache.org/docs/apache-airflow-providers-common-compat>`_  ``common.compat``
+`apache-airflow-providers-openlineage <https://airflow.apache.org/docs/apache-airflow-providers-openlineage>`_      ``openlineage``
+==================================================================================================================  =================
 
 Optional dependencies
 ----------------------
@@ -90,4 +92,4 @@ Extra            Dependencies
 ===============  ================================================================================================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-common-sql/1.28.1/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-common-sql/1.30.0/changelog.html>`_.

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/docs/changelog.rst

@@ -25,11 +25,67 @@
 Changelog
 ---------
 
-1.28.1
+1.30.0
+......
+
+.. note::
+    This release of provider is only available for Airflow 2.11+ as explained in the
+    Apache Airflow providers support policy <https://github.com/apache/airflow/blob/main/PROVIDERS.rst#minimum-supported-version-of-airflow-for-community-managed-providers>_.
+
+Misc
+~~~~
+
+* ``Move out some exceptions to TaskSDK (#54505)``
+* ``Bump minimum Airflow version in providers to Airflow 2.11.0 (#58612)``
+* ``Fix lower bound dependency to common-compat provider (#58833)``
+
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
+   * ``Updates to release process of providers (#58316)``
+   * ``Prepare release for 2025-11-27 wave of providers (#58697)``
+
+1.29.0
+......
+
+Features
+~~~~~~~~
+
+* ``Allow a list of SQL statements in GenericTransfer (#56041)``
+
+Misc
+~~~~
+
+* ``Convert all airflow distributions to be compliant with ASF requirements (#58138)``
+* ``Migrate 'common/sql' provider to 'common.compat' (#57135)``
+* ``Migrate 'common.sql' provider to 'common.compat' (#57075)``
+
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
+   * ``Delete all unnecessary LICENSE Files (#58191)``
+   * ``Enable PT006 rule to 19 files in providers (cncf,common) (#57995)``
+   * ``Fix code formatting via ruff preview (#57641)``
+   * ``Enable ruff PLW0127 rule (#57298)``
+
+1.28.2
 ......
 
+Misc
+~~~~
+
+* ``fix mypy type errors in common/sql provider for sqlalchemy 2 upgrade (#56824)``
+
+Doc-only
+~~~~~~~~
+
+* ``Remove placeholder Release Date in changelog and index files (#56056)``
+
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
+   * ``Enable PT011 rule to prvoider tests (#56495)``
+
+1.28.1
+......
 
-Release Date: ``|PypiReleaseDate|``
 
 Bug Fixes
 ~~~~~~~~~
@@ -44,8 +100,6 @@ Bug Fixes
 ......
 
 
-Release Date: ``|PypiReleaseDate|``
-
 Features
 ~~~~~~~~
 
@@ -74,8 +128,6 @@ Doc-only
    * ``Replace API server's direct Connection access workaround in BaseHook (#54083)``
    * ``Switch pre-commit to prek (#54258)``
    * ``make bundle_name not nullable (#47592)``
-
-.. Review and move the new changes to one of the sections above:
    * ``Fix Airflow 2 reference in README/index of providers (#55240)``
 
 1.27.5
@@ -347,9 +399,6 @@ Misc
 .. Below changes are excluded from the changelog. Move them to
    appropriate section above if needed. Do not delete the lines(!):
    * ``Use Python 3.9 as target version for Ruff & Black rules (#44298)``
-
-
-.. Review and move the new changes to one of the sections above:
    * ``Update path of example dags in docs (#45069)``
 
 1.20.0
@@ -586,7 +635,8 @@ Misc
 * ``feat: Switch all class, functions, methods deprecations to decorators (#36876)``
 * ``Add more-itertools as dependency of common-sql (#37359)``
 
-.. Review and move the new changes to one of the sections above:
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
    * ``Prepare docs 1st wave of Providers February 2024 (#37326)``
 
 1.10.1
@@ -643,7 +693,8 @@ Misc
 * ``Add '_make_serializable' method which other SQL operators can overrides when result from cursor is not JSON-serializable (#32319)``
 * ``Remove backcompat inheritance for DbApiHook (#35754)``
 
-.. Review and move the new changes to one of the sections above:
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
    * ``Use reproducible builds for providers (#35693)``
    * ``Fix and reapply templates for provider documentation (#35686)``
    * ``Prepare docs 1st wave of Providers November 2023 (#35537)``

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/docs/index.rst

@@ -79,7 +79,7 @@ apache-airflow-providers-common-sql package
 `Common SQL Provider <https://en.wikipedia.org/wiki/SQL>`__
 
 
-Release: 1.28.1
+Release: 1.30.0
 
 Provider package
 ----------------
@@ -97,16 +97,17 @@ For the minimum Airflow version supported, see ``Requirements`` below.
 Requirements
 ------------
 
-The minimum Apache Airflow version supported by this provider distribution is ``2.10.0``.
+The minimum Apache Airflow version supported by this provider distribution is ``2.11.0``.
 
-==================  ==================
-PIP package         Version required
-==================  ==================
-``apache-airflow``  ``>=2.10.0``
-``sqlparse``        ``>=0.5.1``
-``more-itertools``  ``>=9.0.0``
-``methodtools``     ``>=0.4.7``
-==================  ==================
+==========================================  ==================
+PIP package                                 Version required
+==========================================  ==================
+``apache-airflow``                          ``>=2.11.0``
+``apache-airflow-providers-common-compat``  ``>=1.10.0``
+``sqlparse``                                ``>=0.5.1``
+``more-itertools``                          ``>=9.0.0``
+``methodtools``                             ``>=0.4.7``
+==========================================  ==================
 
 Cross provider package dependencies
 -----------------------------------
@@ -118,14 +119,15 @@ You can install such cross-provider dependencies when installing from PyPI. For
 
 .. code-block:: bash
 
-    pip install apache-airflow-providers-common-sql[openlineage]
+    pip install apache-airflow-providers-common-sql[common.compat]
 
 
-==============================================================================================================  ===============
-Dependent package                                                                                               Extra
-==============================================================================================================  ===============
-`apache-airflow-providers-openlineage <https://airflow.apache.org/docs/apache-airflow-providers-openlineage>`_  ``openlineage``
-==============================================================================================================  ===============
+==================================================================================================================  =================
+Dependent package                                                                                                   Extra
+==================================================================================================================  =================
+`apache-airflow-providers-common-compat <https://airflow.apache.org/docs/apache-airflow-providers-common-compat>`_  ``common.compat``
+`apache-airflow-providers-openlineage <https://airflow.apache.org/docs/apache-airflow-providers-openlineage>`_      ``openlineage``
+==================================================================================================================  =================
 
 Downloading official packages
 -----------------------------
@@ -133,5 +135,5 @@ Downloading official packages
 You can download officially released packages and verify their checksums and signatures from the
 `Official Apache Download site <https://downloads.apache.org/airflow/providers/>`_
 
-* `The apache-airflow-providers-common-sql 1.28.1 sdist package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_sql-1.28.1.tar.gz>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_sql-1.28.1.tar.gz.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_sql-1.28.1.tar.gz.sha512>`__)
-* `The apache-airflow-providers-common-sql 1.28.1 wheel package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_sql-1.28.1-py3-none-any.whl>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_sql-1.28.1-py3-none-any.whl.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_sql-1.28.1-py3-none-any.whl.sha512>`__)
+* `The apache-airflow-providers-common-sql 1.30.0 sdist package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_sql-1.30.0.tar.gz>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_sql-1.30.0.tar.gz.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_sql-1.30.0.tar.gz.sha512>`__)
+* `The apache-airflow-providers-common-sql 1.30.0 wheel package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_sql-1.30.0-py3-none-any.whl>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_sql-1.30.0-py3-none-any.whl.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_common_sql-1.30.0-py3-none-any.whl.sha512>`__)

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/provider.yaml

@@ -22,12 +22,15 @@ description: |
     `Common SQL Provider <https://en.wikipedia.org/wiki/SQL>`__
 
 state: ready
-source-date-epoch: 1757950161
+source-date-epoch: 1764109960
 # Note that those versions are maintained by release manager - do not update them manually
 # with the exception of case where other provider in sources has >= new provider version.
 # In such case adding >= NEW_VERSION and bumping to NEW_VERSION in a provider have
 # to be done in the same PR
 versions:
+  - 1.30.0
+  - 1.29.0
+  - 1.28.2
   - 1.28.1
   - 1.28.0
   - 1.27.5

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/pyproject.toml

@@ -25,9 +25,11 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-common-sql"
-version = "1.28.1"
+version = "1.30.0rc2"
 description = "Provider package apache-airflow-providers-common-sql for Apache Airflow"
 readme = "README.rst"
+license = "Apache-2.0"
+license-files = ['LICENSE', 'NOTICE']
 authors = [
     {name="Apache Software Foundation", email="dev@airflow.apache.org"},
 ]
@@ -43,7 +45,6 @@ classifiers = [
     "Intended Audience :: System Administrators",
     "Framework :: Apache Airflow",
     "Framework :: Apache Airflow :: Provider",
-    "License :: OSI Approved :: Apache Software License",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -57,7 +58,8 @@ requires-python = ">=3.10"
 # Make sure to run ``prek update-providers-dependencies --all-files``
 # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build``
 dependencies = [
-    "apache-airflow>=2.10.0",
+    "apache-airflow>=2.11.0rc1",
+    "apache-airflow-providers-common-compat>=1.10.0rc1",
     "sqlparse>=0.5.1",
     "more-itertools>=9.0.0",
     # The methodtools dependency is necessary since the introduction of dialects:
@@ -86,6 +88,7 @@ dev = [
     "apache-airflow",
     "apache-airflow-task-sdk",
     "apache-airflow-devel-common",
+    "apache-airflow-providers-common-compat",
     "apache-airflow-providers-openlineage",
     # Additional devel dependencies (do not remove this line and add extra development dependencies)
     "apache-airflow-providers-common-sql[pandas]",
@@ -121,8 +124,8 @@ apache-airflow-providers-common-sql = {workspace = true}
 apache-airflow-providers-standard = {workspace = true}
 
 [project.urls]
-"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-common-sql/1.28.1"
-"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-common-sql/1.28.1/changelog.html"
+"Documentation" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-common-sql/1.30.0"
+"Changelog" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-common-sql/1.30.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"

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/src/airflow/providers/common/sql/__init__.py

@@ -29,11 +29,11 @@ from airflow import __version__ as airflow_version
 
 __all__ = ["__version__"]
 
-__version__ = "1.28.1"
+__version__ = "1.30.0"
 
 if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
-    "2.10.0"
+    "2.11.0"
 ):
     raise RuntimeError(
-        f"The package `apache-airflow-providers-common-sql:{__version__}` needs Apache Airflow 2.10.0+"
+        f"The package `apache-airflow-providers-common-sql:{__version__}` needs Apache Airflow 2.11.0+"
     )

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/src/airflow/providers/common/sql/dialects/dialect.py

@@ -26,6 +26,7 @@ from airflow.utils.log.logging_mixin import LoggingMixin
 
 if TYPE_CHECKING:
     from sqlalchemy.engine import Inspector
+    from sqlalchemy.engine.interfaces import ReflectedColumn
 
 T = TypeVar("T")
 
@@ -85,16 +86,13 @@ class Dialect(LoggingMixin):
             return self.escape_word_format.format(word)
         return word
 
-    def unescape_word(self, word: str | None) -> str | None:
+    def unescape_word(self, word: str) -> str:
         """
         Remove escape characters from each part of a dotted identifier (e.g., schema.table).
 
         :param word: Escaped schema, table, or column name, potentially with multiple segments.
         :return: The word without escaped characters.
         """
-        if not word:
-            return word
-
         escape_char_start = self.escape_word_format[0]
         escape_char_end = self.escape_word_format[-1]
 
@@ -112,20 +110,19 @@ class Dialect(LoggingMixin):
 
     @lru_cache(maxsize=None)
     def get_column_names(
-        self, table: str, schema: str | None = None, predicate: Callable[[T], bool] = lambda column: True
+        self,
+        table: str,
+        schema: str | None = None,
+        predicate: Callable[[T | ReflectedColumn], bool] = lambda column: True,
     ) -> list[str] | None:
         if schema is None:
             table, schema = self.extract_schema_from_table(table)
-        column_names = list(
-            column["name"]
-            for column in filter(
-                predicate,
-                self.inspector.get_columns(
-                    table_name=self.unescape_word(table),
-                    schema=self.unescape_word(schema) if schema else None,
-                ),
-            )
-        )
+        table_name = self.unescape_word(table)
+        schema = self.unescape_word(schema) if schema else None
+        column_names = []
+        for column in self.inspector.get_columns(table_name=table_name, schema=schema):
+            if predicate(column):
+                column_names.append(column["name"])
         self.log.debug("Column names for table '%s': %s", table, column_names)
         return column_names
 

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/src/airflow/providers/common/sql/hooks/sql.py

@@ -39,9 +39,9 @@ from airflow.exceptions import (
     AirflowOptionalProviderFeatureException,
     AirflowProviderDeprecationWarning,
 )
+from airflow.providers.common.compat.sdk import BaseHook
 from airflow.providers.common.sql.dialects.dialect import Dialect
 from airflow.providers.common.sql.hooks import handlers
-from airflow.providers.common.sql.version_compat import BaseHook
 from airflow.utils.module_loading import import_string
 
 if TYPE_CHECKING:
@@ -49,14 +49,10 @@ if TYPE_CHECKING:
     from polars import DataFrame as PolarsDataFrame
     from sqlalchemy.engine import URL, Engine, Inspector
 
+    from airflow.providers.common.compat.sdk import Connection
     from airflow.providers.openlineage.extractors import OperatorLineage
     from airflow.providers.openlineage.sqlparser import DatabaseInfo
 
-    try:
-        from airflow.sdk import Connection
-    except ImportError:
-        from airflow.models.connection import Connection  # type: ignore[assignment]
-
 
 T = TypeVar("T")
 SQL_PLACEHOLDERS = frozenset({"%s", "?"})
@@ -316,7 +312,7 @@ class DbApiHook(BaseHook):
             engine_kwargs = {}
 
         try:
-            url = self.sqlalchemy_url
+            url: URL | str = self.sqlalchemy_url
         except NotImplementedError:
             url = self.get_uri()
 

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/src/airflow/providers/common/sql/hooks/sql.pyi

@@ -109,7 +109,7 @@ class DbApiHook(BaseHook):
     ) -> PandasDataFrame: ...
     def get_pandas_df_by_chunks(
         self, sql, parameters: list | tuple | Mapping[str, Any] | None = None, *, chunksize: int, **kwargs
-    ) -> Generator[PandasDataFrame, None, None]: ...
+    ) -> Generator[PandasDataFrame]: ...
     def get_records(
         self, sql: str | list[str], parameters: Iterable | Mapping[str, Any] | None = None
     ) -> Any: ...
@@ -143,7 +143,7 @@ class DbApiHook(BaseHook):
         chunksize: int,
         df_type: Literal["pandas"] = "pandas",
         **kwargs,
-    ) -> Generator[PandasDataFrame, None, None]: ...
+    ) -> Generator[PandasDataFrame]: ...
     @overload
     def get_df_by_chunks(
         self,
@@ -153,7 +153,7 @@ class DbApiHook(BaseHook):
         chunksize: int,
         df_type: Literal["polars"],
         **kwargs,
-    ) -> Generator[PolarsDataFrame, None, None]: ...
+    ) -> Generator[PolarsDataFrame]: ...
     @staticmethod
     def strip_sql_string(sql: str) -> str: ...
     @staticmethod

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/src/airflow/providers/common/sql/operators/generic_transfer.py

@@ -22,18 +22,14 @@ from functools import cached_property
 from typing import TYPE_CHECKING, Any
 
 from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import BaseHook, BaseOperator
 from airflow.providers.common.sql.hooks.sql import DbApiHook
 from airflow.providers.common.sql.triggers.sql import SQLExecuteQueryTrigger
-from airflow.providers.common.sql.version_compat import BaseHook, BaseOperator
 
 if TYPE_CHECKING:
     import jinja2
 
-    try:
-        from airflow.sdk.definitions.context import Context
-    except ImportError:
-        # TODO: Remove once provider drops support for Airflow 2
-        from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class GenericTransfer(BaseOperator):
@@ -79,7 +75,7 @@ class GenericTransfer(BaseOperator):
     def __init__(
         self,
         *,
-        sql: str,
+        sql: str | list[str],
         destination_table: str,
         source_conn_id: str,
         source_hook_params: dict | None = None,
@@ -160,13 +156,19 @@ class GenericTransfer(BaseOperator):
                 method_name=self.execute_complete.__name__,
             )
         else:
+            if isinstance(self.sql, str):
+                self.sql = [self.sql]
+
             self.log.info("Extracting data from %s", self.source_conn_id)
-            self.log.info("Executing: \n %s", self.sql)
+            for sql in self.sql:
+                self.log.info("Executing: \n %s", sql)
 
-            results = self.source_hook.get_records(self.sql)
+                results = self.source_hook.get_records(sql)
 
-            self.log.info("Inserting rows into %s", self.destination_conn_id)
-            self.destination_hook.insert_rows(table=self.destination_table, rows=results, **self.insert_args)
+                self.log.info("Inserting rows into %s", self.destination_conn_id)
+                self.destination_hook.insert_rows(
+                    table=self.destination_table, rows=results, **self.insert_args
+                )
 
     def execute_complete(
         self,

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/src/airflow/providers/common/sql/operators/generic_transfer.pyi

@@ -57,7 +57,7 @@ class GenericTransfer(BaseOperator):
     def __init__(
         self,
         *,
-        sql: str,
+        sql: str | list[str],
         destination_table: str,
         source_conn_id: str,
         source_hook_params: dict | None = None,

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/src/airflow/providers/common/sql/operators/sql.py

@@ -24,18 +24,23 @@ from functools import cached_property
 from typing import TYPE_CHECKING, Any, ClassVar, NoReturn, SupportsAbs
 
 from airflow import XComArg
-from airflow.exceptions import AirflowException, AirflowFailException, AirflowSkipException
+from airflow.exceptions import AirflowException
 from airflow.models import SkipMixin
+from airflow.providers.common.compat.sdk import (
+    AirflowFailException,
+    AirflowSkipException,
+    BaseHook,
+    BaseOperator,
+)
 from airflow.providers.common.sql.hooks.handlers import fetch_all_handler, return_single_query_results
 from airflow.providers.common.sql.hooks.sql import DbApiHook
-from airflow.providers.common.sql.version_compat import BaseHook, BaseOperator
 from airflow.utils.helpers import merge_dicts
 
 if TYPE_CHECKING:
     import jinja2
 
+    from airflow.providers.common.compat.sdk import Context
     from airflow.providers.openlineage.extractors import OperatorLineage
-    from airflow.utils.context import Context
 
 
 def _convert_to_float_if_possible(s: str) -> float | str:

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/src/airflow/providers/common/sql/sensors/sql.py

@@ -21,11 +21,11 @@ from operator import itemgetter
 from typing import TYPE_CHECKING, Any
 
 from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import BaseHook, BaseSensorOperator
 from airflow.providers.common.sql.hooks.sql import DbApiHook
-from airflow.providers.common.sql.version_compat import BaseHook, BaseSensorOperator
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class SqlSensor(BaseSensorOperator):

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/src/airflow/providers/common/sql/sensors/sql.pyi

@@ -37,13 +37,7 @@ from typing import Any
 
 from _typeshed import Incomplete as Incomplete
 
-from airflow.providers.common.sql.version_compat import AIRFLOW_V_3_0_PLUS
-
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk import BaseSensorOperator
-else:
-    from airflow.sensors.base import BaseSensorOperator  # type: ignore[no-redef]
-
+from airflow.providers.common.compat.sdk import BaseSensorOperator
 from airflow.utils.context import Context as Context
 
 class SqlSensor(BaseSensorOperator):

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/src/airflow/providers/common/sql/triggers/sql.py

@@ -20,8 +20,8 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import BaseHook
 from airflow.providers.common.sql.hooks.sql import DbApiHook
-from airflow.providers.common.sql.version_compat import BaseHook
 from airflow.triggers.base import BaseTrigger, TriggerEvent
 
 if TYPE_CHECKING:

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/src/airflow/providers/common/sql/version_compat.py

@@ -35,21 +35,7 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
 AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
 AIRFLOW_V_3_1_PLUS: bool = get_base_airflow_version_tuple() >= (3, 1, 0)
 
-if AIRFLOW_V_3_1_PLUS:
-    from airflow.sdk import BaseHook
-else:
-    from airflow.hooks.base import BaseHook  # type: ignore[attr-defined,no-redef]
-
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk import BaseOperator, BaseSensorOperator
-else:
-    from airflow.models import BaseOperator
-    from airflow.sensors.base import BaseSensorOperator  # type: ignore[no-redef]
-
 __all__ = [
     "AIRFLOW_V_3_0_PLUS",
     "AIRFLOW_V_3_1_PLUS",
-    "BaseHook",
-    "BaseOperator",
-    "BaseSensorOperator",
 ]

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/tests/unit/common/sql/dialects/test_dialect.py

@@ -57,7 +57,6 @@ class TestDialect:
     def test_unescape_word_with_different_format(self):
         self.test_db_hook.escape_word_format = "[{}]"
         dialect = Dialect(self.test_db_hook)
-        assert not dialect.unescape_word(None)
         assert dialect.unescape_word("table") == "table"
         assert dialect.unescape_word("t@ble") == "t@ble"
         assert dialect.unescape_word("table_name") == "table_name"

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/tests/unit/common/sql/hooks/test_dbapi.py

@@ -19,17 +19,16 @@ from __future__ import annotations
 
 import json
 import logging
-import logging.config
 from unittest import mock
 
 import pytest
 from pyodbc import Cursor
 
 from airflow.models import Connection
+from airflow.providers.common.compat.sdk import BaseHook
 from airflow.providers.common.sql.dialects.dialect import Dialect
 from airflow.providers.common.sql.hooks.handlers import fetch_all_handler, fetch_one_handler
 from airflow.providers.common.sql.hooks.sql import DbApiHook
-from airflow.providers.common.sql.version_compat import BaseHook
 
 
 class DbApiHookInProvider(DbApiHook):
@@ -577,9 +576,8 @@ class TestDbApiHook:
         assert result == [obj, obj]
 
     def test_run_no_queries(self):
-        with pytest.raises(ValueError) as err:
+        with pytest.raises(ValueError, match="List of SQL statements is empty"):
             self.db_hook.run(sql=[])
-        assert err.value.args[0] == "List of SQL statements is empty"
 
     def test_run_and_log_db_messages(self):
         statement = "SQL"

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/tests/unit/common/sql/hooks/test_sql.py

@@ -20,7 +20,6 @@ from __future__ import annotations
 
 import inspect
 import logging
-import logging.config
 from unittest.mock import MagicMock
 
 import pandas as pd
@@ -70,8 +69,16 @@ index = 0
 
 @pytest.mark.db_test
 @pytest.mark.parametrize(
-    "return_last, split_statements, sql, cursor_calls,"
-    "cursor_descriptions, cursor_results, hook_descriptions, hook_results, ",
+    (
+        "return_last",
+        "split_statements",
+        "sql",
+        "cursor_calls",
+        "cursor_descriptions",
+        "cursor_results",
+        "hook_descriptions",
+        "hook_results",
+    ),
     [
         pytest.param(
             True,
@@ -239,9 +246,8 @@ class TestDbApiHook:
     )
     def test_no_query(self, empty_statement):
         dbapi_hook = mock_db_hook(DbApiHook)
-        with pytest.raises(ValueError) as err:
+        with pytest.raises(ValueError, match="List of SQL statements is empty"):
             dbapi_hook.run(sql=empty_statement)
-        assert err.value.args[0] == "List of SQL statements is empty"
 
     @pytest.mark.db_test
     def test_placeholder_config_from_extra(self):
@@ -311,7 +317,7 @@ class TestDbApiHook:
 
     @pytest.mark.db_test
     @pytest.mark.parametrize(
-        "df_type, expected_type",
+        ("df_type", "expected_type"),
         [
             ("test_default_df_type", pd.DataFrame),
             ("pandas", pd.DataFrame),

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/tests/unit/common/sql/hooks/test_sqlparse.py

@@ -22,7 +22,7 @@ from airflow.providers.common.sql.hooks.sql import DbApiHook
 
 
 @pytest.mark.parametrize(
-    "line,parsed_statements",
+    ("line", "parsed_statements"),
     [
         ("SELECT * FROM table", ["SELECT * FROM table"]),
         ("SELECT * FROM table;", ["SELECT * FROM table;"]),

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/tests/unit/common/sql/operators/test_generic_transfer.py

@@ -289,6 +289,38 @@ class TestGenericTransfer:
             **{"rows": [[1, 2], [11, 12], [3, 4], [13, 14], [3, 4], [13, 14]], "table": "NEW_HR.EMPLOYEES"},
         }
 
+    def test_non_paginated_read_for_multiple_sql_statements(self):
+        with mock.patch(f"{BASEHOOK_PATCH_PATH}.get_connection", side_effect=self.get_connection):
+            with mock.patch(f"{BASEHOOK_PATCH_PATH}.get_hook", side_effect=self.get_hook):
+                operator = GenericTransfer(
+                    task_id="transfer_table",
+                    source_conn_id="my_source_conn_id",
+                    destination_conn_id="my_destination_conn_id",
+                    sql=["SELECT * FROM HR.EMPLOYEES", "SELECT * FROM HR.PEOPLE"],
+                    destination_table="NEW_HR.EMPLOYEES",
+                    insert_args=INSERT_ARGS,
+                    execution_timeout=timedelta(hours=1),
+                )
+
+                operator.execute(context=mock_context(task=operator))
+
+            assert self.mocked_source_hook.get_records.call_count == 2
+            assert [call.args[0] for call in self.mocked_source_hook.get_records.call_args_list] == [
+                "SELECT * FROM HR.EMPLOYEES",
+                "SELECT * FROM HR.PEOPLE",
+            ]
+            assert self.mocked_destination_hook.insert_rows.call_count == 2
+            assert self.mocked_destination_hook.insert_rows.call_args_list[0].kwargs == {
+                **INSERT_ARGS,
+                "rows": [[1, 2], [11, 12], [3, 4], [13, 14], [3, 4], [13, 14]],
+                "table": "NEW_HR.EMPLOYEES",
+            }
+            assert self.mocked_destination_hook.insert_rows.call_args_list[1].kwargs == {
+                **INSERT_ARGS,
+                "rows": [[1, 2], [11, 12], [3, 4], [13, 14], [3, 4], [13, 14]],
+                "table": "NEW_HR.EMPLOYEES",
+            }
+
     def test_paginated_read(self):
         """
         This unit test is based on the example described in the medium article:

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/tests/unit/common/sql/operators/test_sql.py

@@ -362,7 +362,7 @@ class TestColumnCheckOperator:
             ("X", "min", -1),
             ("X", "max", 20),
         ]
-        operator = operator = self._construct_operator(monkeypatch, self.valid_column_mapping, records)
+        operator = self._construct_operator(monkeypatch, self.valid_column_mapping, records)
         with pytest.raises(AirflowException):
             operator.execute(context=MagicMock())
 
@@ -522,7 +522,7 @@ class TestTableCheckOperator:
         return operator
 
     @pytest.mark.parametrize(
-        ["conn_id"],
+        "conn_id",
         [
             pytest.param("postgres_default", marks=[pytest.mark.backend("postgres")]),
             pytest.param("mysql_default", marks=[pytest.mark.backend("mysql")]),
@@ -559,7 +559,7 @@ class TestTableCheckOperator:
             hook.run(["DROP TABLE employees"])
 
     @pytest.mark.parametrize(
-        ["conn_id"],
+        "conn_id",
         [
             pytest.param("postgres_default", marks=[pytest.mark.backend("postgres")]),
             pytest.param("mysql_default", marks=[pytest.mark.backend("mysql")]),

{apache_airflow_providers_common_sql-1.28.1 → apache_airflow_providers_common_sql-1.30.0rc2}/tests/unit/common/sql/operators/test_sql_execute.py

@@ -51,7 +51,7 @@ class Row2(NamedTuple):
 
 
 @pytest.mark.parametrize(
-    "sql, return_last, split_statement, hook_results, hook_descriptions, expected_results",
+    ("sql", "return_last", "split_statement", "hook_results", "hook_descriptions", "expected_results"),
     [
         pytest.param(
             "select * from dummy",
@@ -166,7 +166,7 @@ def test_exec_success(sql, return_last, split_statement, hook_results, hook_desc
 
 
 @pytest.mark.parametrize(
-    "sql, return_last, split_statement, hook_results, hook_descriptions, expected_results",
+    ("sql", "return_last", "split_statement", "hook_results", "hook_descriptions", "expected_results"),
     [
         pytest.param(
             "select * from dummy",
@@ -288,7 +288,7 @@ def test_exec_success_with_process_output(
 
 
 @pytest.mark.parametrize(
-    "connection_port, default_port, expected_port",
+    ("connection_port", "default_port", "expected_port"),
     [(None, 4321, 4321), (1234, None, 1234), (1234, 4321, 1234)],
 )
 def test_execute_openlineage_events(connection_port, default_port, expected_port):