apache-airflow-providers-common-sql 1.19.0__py3-none-any.whl → 1.20.0__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.19.0"
+__version__ = "1.20.0"
 
 if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
     "2.8.0"

airflow/providers/common/sql/get_provider_info.py

@@ -30,6 +30,7 @@ def get_provider_info():
         "state": "ready",
         "source-date-epoch": 1730012422,
         "versions": [
+            "1.20.0",
             "1.19.0",
             "1.18.0",
             "1.17.1",
@@ -67,7 +68,7 @@ def get_provider_info():
             "1.1.0",
             "1.0.0",
         ],
-        "dependencies": ["apache-airflow>=2.8.0", "sqlparse>=0.4.2", "more-itertools>=9.0.0"],
+        "dependencies": ["apache-airflow>=2.8.0", "sqlparse>=0.5.1", "more-itertools>=9.0.0"],
         "additional-extras": [
             {
                 "name": "pandas",

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

@@ -150,6 +150,8 @@ class DbApiHook(BaseHook):
     conn_name_attr: str
     # Override to have a default connection id for a particular dbHook
     default_conn_name = "default_conn_id"
+    # Override if this db doesn't support semicolons in SQL queries
+    strip_semicolon = False
     # Override if this db supports autocommit.
     supports_autocommit = False
     # Override if this db supports executemany.
@@ -369,14 +371,18 @@ class DbApiHook(BaseHook):
         return sql.strip().rstrip(";")
 
     @staticmethod
-    def split_sql_string(sql: str) -> list[str]:
+    def split_sql_string(sql: str, strip_semicolon: bool = False) -> list[str]:
         """
         Split string into multiple SQL expressions.
 
         :param sql: SQL string potentially consisting of multiple expressions
+        :param strip_semicolon: whether to strip semicolon from SQL string
         :return: list of individual expressions
         """
-        splits = sqlparse.split(sqlparse.format(sql, strip_comments=True))
+        splits = sqlparse.split(
+            sql=sqlparse.format(sql, strip_comments=True),
+            strip_semicolon=strip_semicolon,
+        )
         return [s for s in splits if s]
 
     @property
@@ -471,7 +477,10 @@ class DbApiHook(BaseHook):
 
         if isinstance(sql, str):
             if split_statements:
-                sql_list: Iterable[str] = self.split_sql_string(sql)
+                sql_list: Iterable[str] = self.split_sql_string(
+                    sql=sql,
+                    strip_semicolon=self.strip_semicolon,
+                )
             else:
                 sql_list = [sql] if sql.strip() else []
         else:

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

@@ -54,6 +54,7 @@ class ConnectorProtocol(Protocol):
 class DbApiHook(BaseHook):
     conn_name_attr: str
     default_conn_name: str
+    strip_semicolon: bool
     supports_autocommit: bool
     supports_executemany: bool
     connector: ConnectorProtocol | None
@@ -93,7 +94,7 @@ class DbApiHook(BaseHook):
     @staticmethod
     def strip_sql_string(sql: str) -> str: ...
     @staticmethod
-    def split_sql_string(sql: str) -> list[str]: ...
+    def split_sql_string(sql: str, strip_semicolon: bool = False) -> list[str]: ...
     @property
     def last_description(self) -> Sequence[Sequence] | None: ...
     @overload

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

@@ -20,7 +20,7 @@ from __future__ import annotations
 import ast
 import re
 from functools import cached_property
-from typing import TYPE_CHECKING, Any, Callable, Iterable, Mapping, NoReturn, Sequence, SupportsAbs
+from typing import TYPE_CHECKING, Any, Callable, ClassVar, Iterable, Mapping, NoReturn, Sequence, SupportsAbs
 
 from airflow.exceptions import AirflowException, AirflowFailException
 from airflow.hooks.base import BaseHook
@@ -224,7 +224,7 @@ class SQLExecuteQueryOperator(BaseSQLOperator):
 
     template_fields: Sequence[str] = ("sql", "parameters", *BaseSQLOperator.template_fields)
     template_ext: Sequence[str] = (".sql", ".json")
-    template_fields_renderers = {"sql": "sql", "parameters": "json"}
+    template_fields_renderers: ClassVar[dict] = {"sql": "sql", "parameters": "json"}
     ui_color = "#cdaaed"
 
     def __init__(
@@ -428,7 +428,7 @@ class SQLColumnCheckOperator(BaseSQLOperator):
     """
 
     template_fields: Sequence[str] = ("table", "partition_clause", "sql", *BaseSQLOperator.template_fields)
-    template_fields_renderers = {"sql": "sql"}
+    template_fields_renderers: ClassVar[dict] = {"sql": "sql"}
 
     sql_check_template = """
         SELECT '{column}' AS col_name, '{check}' AS check_type, {column}_{check} AS check_result
@@ -657,7 +657,7 @@ class SQLTableCheckOperator(BaseSQLOperator):
 
     template_fields: Sequence[str] = ("table", "partition_clause", "sql", *BaseSQLOperator.template_fields)
 
-    template_fields_renderers = {"sql": "sql"}
+    template_fields_renderers: ClassVar[dict] = {"sql": "sql"}
 
     sql_check_template = """
     SELECT '{check_name}' AS check_name, MIN({check_name}) AS check_result
@@ -776,7 +776,7 @@ class SQLCheckOperator(BaseSQLOperator):
         ".hql",
         ".sql",
     )
-    template_fields_renderers = {"sql": "sql"}
+    template_fields_renderers: ClassVar[dict] = {"sql": "sql"}
     ui_color = "#fff7e6"
 
     def __init__(
@@ -822,7 +822,7 @@ class SQLValueCheckOperator(BaseSQLOperator):
         ".hql",
         ".sql",
     )
-    template_fields_renderers = {"sql": "sql"}
+    template_fields_renderers: ClassVar[dict] = {"sql": "sql"}
     ui_color = "#fff7e6"
 
     def __init__(
@@ -919,7 +919,7 @@ class SQLIntervalCheckOperator(BaseSQLOperator):
         ".hql",
         ".sql",
     )
-    template_fields_renderers = {"sql1": "sql", "sql2": "sql"}
+    template_fields_renderers: ClassVar[dict] = {"sql1": "sql", "sql2": "sql"}
     ui_color = "#fff7e6"
 
     ratio_formulas = {
@@ -1052,7 +1052,7 @@ class SQLThresholdCheckOperator(BaseSQLOperator):
         ".hql",
         ".sql",
     )
-    template_fields_renderers = {"sql": "sql"}
+    template_fields_renderers: ClassVar[dict] = {"sql": "sql"}
 
     def __init__(
         self,
@@ -1147,7 +1147,7 @@ class BranchSQLOperator(BaseSQLOperator, SkipMixin):
 
     template_fields: Sequence[str] = ("sql", *BaseSQLOperator.template_fields)
     template_ext: Sequence[str] = (".sql",)
-    template_fields_renderers = {"sql": "sql"}
+    template_fields_renderers: ClassVar[dict] = {"sql": "sql"}
     ui_color = "#a22034"
     ui_fgcolor = "#F7F7F7"
 

airflow/providers/common/sql/operators/sql.pyi

@@ -36,7 +36,7 @@ from airflow.models import BaseOperator as BaseOperator, SkipMixin as SkipMixin
 from airflow.providers.common.sql.hooks.sql import DbApiHook as DbApiHook
 from airflow.providers.openlineage.extractors import OperatorLineage as OperatorLineage
 from airflow.utils.context import Context as Context
-from typing import Any, Callable, Iterable, Mapping, Sequence, SupportsAbs
+from typing import Any, Callable, ClassVar, Iterable, Mapping, Sequence, SupportsAbs
 
 def parse_boolean(val: str) -> str | bool: ...
 
@@ -62,7 +62,7 @@ class SQLExecuteQueryOperator(BaseSQLOperator):
     def _raise_exception(self, exception_string: str) -> Incomplete: ...
     template_fields: Sequence[str]
     template_ext: Sequence[str]
-    template_fields_renderers: Incomplete
+    template_fields_renderers: ClassVar[dict]
     ui_color: str
     sql: Incomplete
     autocommit: Incomplete
@@ -92,7 +92,7 @@ class SQLExecuteQueryOperator(BaseSQLOperator):
 
 class SQLColumnCheckOperator(BaseSQLOperator):
     template_fields: Sequence[str]
-    template_fields_renderers: Incomplete
+    template_fields_renderers: ClassVar[dict]
     sql_check_template: str
     column_checks: Incomplete
     table: Incomplete
@@ -115,7 +115,7 @@ class SQLColumnCheckOperator(BaseSQLOperator):
 
 class SQLTableCheckOperator(BaseSQLOperator):
     template_fields: Sequence[str]
-    template_fields_renderers: Incomplete
+    template_fields_renderers: ClassVar[dict]
     sql_check_template: str
     table: Incomplete
     checks: Incomplete
@@ -136,7 +136,7 @@ class SQLTableCheckOperator(BaseSQLOperator):
 class SQLCheckOperator(BaseSQLOperator):
     template_fields: Sequence[str]
     template_ext: Sequence[str]
-    template_fields_renderers: Incomplete
+    template_fields_renderers: ClassVar[dict]
     ui_color: str
     sql: Incomplete
     parameters: Incomplete
@@ -155,7 +155,7 @@ class SQLValueCheckOperator(BaseSQLOperator):
     __mapper_args__: Incomplete
     template_fields: Sequence[str]
     template_ext: Sequence[str]
-    template_fields_renderers: Incomplete
+    template_fields_renderers: ClassVar[dict]
     ui_color: str
     sql: Incomplete
     pass_value: Incomplete
@@ -178,7 +178,7 @@ class SQLIntervalCheckOperator(BaseSQLOperator):
     __mapper_args__: Incomplete
     template_fields: Sequence[str]
     template_ext: Sequence[str]
-    template_fields_renderers: Incomplete
+    template_fields_renderers: ClassVar[dict]
     ui_color: str
     ratio_formulas: Incomplete
     ratio_formula: Incomplete
@@ -208,7 +208,7 @@ class SQLIntervalCheckOperator(BaseSQLOperator):
 class SQLThresholdCheckOperator(BaseSQLOperator):
     template_fields: Sequence[str]
     template_ext: Sequence[str]
-    template_fields_renderers: Incomplete
+    template_fields_renderers: ClassVar[dict]
     sql: Incomplete
     min_threshold: Incomplete
     max_threshold: Incomplete
@@ -228,7 +228,7 @@ class SQLThresholdCheckOperator(BaseSQLOperator):
 class BranchSQLOperator(BaseSQLOperator, SkipMixin):
     template_fields: Sequence[str]
     template_ext: Sequence[str]
-    template_fields_renderers: Incomplete
+    template_fields_renderers: ClassVar[dict]
     ui_color: str
     ui_fgcolor: str
     sql: Incomplete

{apache_airflow_providers_common_sql-1.19.0.dist-info → apache_airflow_providers_common_sql-1.20.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: apache-airflow-providers-common-sql
-Version: 1.19.0
+Version: 1.20.0
 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>
@@ -22,13 +22,13 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: System :: Monitoring
 Requires-Dist: apache-airflow>=2.8.0
 Requires-Dist: more-itertools>=9.0.0
-Requires-Dist: sqlparse>=0.4.2
+Requires-Dist: sqlparse>=0.5.1
 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.19.0/changelog.html
-Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-common-sql/1.19.0
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-common-sql/1.20.0/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-common-sql/1.20.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
@@ -80,7 +80,7 @@ Provides-Extra: pandas
 
 Package ``apache-airflow-providers-common-sql``
 
-Release: ``1.19.0``
+Release: ``1.20.0``
 
 
 `Common SQL Provider <https://en.wikipedia.org/wiki/SQL>`__
@@ -93,7 +93,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.19.0/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-common-sql/1.20.0/>`_.
 
 Installation
 ------------
@@ -111,7 +111,7 @@ Requirements
 PIP package         Version required
 ==================  ==================
 ``apache-airflow``  ``>=2.8.0``
-``sqlparse``        ``>=0.4.2``
+``sqlparse``        ``>=0.5.1``
 ``more-itertools``  ``>=9.0.0``
 ==================  ==================
 
@@ -135,4 +135,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.19.0/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-common-sql/1.20.0/changelog.html>`_.

{apache_airflow_providers_common_sql-1.19.0.dist-info → apache_airflow_providers_common_sql-1.20.0.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=Lt9f9Y4TRs8R4degfGTNMLaJ9UouMAatWgQxxe_pA5M,1498
-airflow/providers/common/sql/get_provider_info.py,sha256=UJMFz7XHr9N8c1rfr5qby71nh74L90ERZbYt57dDIBo,3387
+airflow/providers/common/sql/__init__.py,sha256=Aylh6G8o4C_uXE9dxyD0Bb4KdcsNz1VQrTsfwt9WlPA,1498
+airflow/providers/common/sql/get_provider_info.py,sha256=_sSA2HGwIdVzzerTlWq7iM_DcAVZdgR-Mg-0jGPh-hA,3409
 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=3XAyEjbCL7FD7VSMu623tGQgTjnFdKH3_GmqHzRloqA,32629
-airflow/providers/common/sql/hooks/sql.pyi,sha256=-h5-2yKgXZMmuXzClYiM1VTTdbdDHD6N3ZBC9dL1Twc,5953
+airflow/providers/common/sql/hooks/sql.py,sha256=1FwVmPnhqbhrt3SZjrmUDFMjtM0eE8Q1dWfAWysCql8,33004
+airflow/providers/common/sql/hooks/sql.pyi,sha256=OTtj9D5LE8mMHCZnN4yTStWTn8Iz5XpEsTiFpUgt10w,6010
 airflow/providers/common/sql/operators/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
-airflow/providers/common/sql/operators/sql.py,sha256=KzJR2npRO93nMPaG0kxdeRKSrX7LRCmoLD7ShT8d_nw,48055
-airflow/providers/common/sql/operators/sql.pyi,sha256=ae7xKolM49nSaAfvcH_J9HpIyVSgCj0-EC_szCFkqYc,8164
+airflow/providers/common/sql/operators/sql.py,sha256=SQ-jGNPHCw7qohR20DB0W9l3kmS6KEiFRsdQM3Kf-E8,48193
+airflow/providers/common/sql/operators/sql.pyi,sha256=xCPJN4IQffaPc4-SU1pcLkYHDF4hr1c_L2YhhMpqqqg,8206
 airflow/providers/common/sql/sensors/__init__.py,sha256=9hdXHABrVpkbpjZgUft39kOFL2xSGeG4GEua0Hmelus,785
 airflow/providers/common/sql/sensors/sql.py,sha256=UYOQficcLJlumJcZwKIBYMcnCe5PkGPiU2ZaYta858Q,5492
 airflow/providers/common/sql/sensors/sql.pyi,sha256=3agRcNF_FT3_6QnD-sZOI8pV0lBjEalOAIKRINfQ0MI,2467
-apache_airflow_providers_common_sql-1.19.0.dist-info/entry_points.txt,sha256=h8UXRp2crPuGmYVYRM5oe168qIh7g-4t2QQbVMizKjI,106
-apache_airflow_providers_common_sql-1.19.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-apache_airflow_providers_common_sql-1.19.0.dist-info/METADATA,sha256=8WwQuKYCFEUKy-r__7WOIL4mmdmYI6tM0fIAFXbq7nM,6163
-apache_airflow_providers_common_sql-1.19.0.dist-info/RECORD,,
+apache_airflow_providers_common_sql-1.20.0.dist-info/entry_points.txt,sha256=h8UXRp2crPuGmYVYRM5oe168qIh7g-4t2QQbVMizKjI,106
+apache_airflow_providers_common_sql-1.20.0.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+apache_airflow_providers_common_sql-1.20.0.dist-info/METADATA,sha256=KspNMaXBjpr0HRXHN6S36XzSxJo7gBKe9e0LWr4l93I,6163
+apache_airflow_providers_common_sql-1.20.0.dist-info/RECORD,,

{apache_airflow_providers_common_sql-1.19.0.dist-info → apache_airflow_providers_common_sql-1.20.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: flit 3.9.0
+Generator: flit 3.10.1
 Root-Is-Purelib: true
 Tag: py3-none-any