diff --git a/providers/common/sql/src/airflow/providers/common/sql/operators/sql.py b/providers/common/sql/src/airflow/providers/common/sql/operators/sql.py index 3ae4a429e276d..326edbf100c98 100644 --- a/providers/common/sql/src/airflow/providers/common/sql/operators/sql.py +++ b/providers/common/sql/src/airflow/providers/common/sql/operators/sql.py @@ -26,7 +26,8 @@ from airflow.exceptions import AirflowException, AirflowFailException from airflow.hooks.base import BaseHook from airflow.models import BaseOperator, SkipMixin -from airflow.providers.common.sql.hooks.sql import DbApiHook, fetch_all_handler, return_single_query_results +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.utils.helpers import merge_dicts if TYPE_CHECKING: diff --git a/providers/common/sql/tests/unit/common/sql/hooks/test_dbapi.py b/providers/common/sql/tests/unit/common/sql/hooks/test_dbapi.py index bad83041f5b8a..ac7d02084e265 100644 --- a/providers/common/sql/tests/unit/common/sql/hooks/test_dbapi.py +++ b/providers/common/sql/tests/unit/common/sql/hooks/test_dbapi.py @@ -29,7 +29,8 @@ from airflow.hooks.base import BaseHook from airflow.models import Connection from airflow.providers.common.sql.dialects.dialect import Dialect -from airflow.providers.common.sql.hooks.sql import DbApiHook, fetch_all_handler, fetch_one_handler +from airflow.providers.common.sql.hooks.handlers import fetch_all_handler, fetch_one_handler +from airflow.providers.common.sql.hooks.sql import DbApiHook class DbApiHookInProvider(DbApiHook): diff --git a/providers/common/sql/tests/unit/common/sql/hooks/test_sql.py b/providers/common/sql/tests/unit/common/sql/hooks/test_sql.py index 21f0120b61af6..ec7a97e8d8fdd 100644 --- a/providers/common/sql/tests/unit/common/sql/hooks/test_sql.py +++ b/providers/common/sql/tests/unit/common/sql/hooks/test_sql.py @@ -29,7 +29,8 @@ from airflow.exceptions import AirflowProviderDeprecationWarning from airflow.models import Connection from airflow.providers.common.sql.dialects.dialect import Dialect -from airflow.providers.common.sql.hooks.sql import DbApiHook, fetch_all_handler, resolve_dialects +from airflow.providers.common.sql.hooks.handlers import fetch_all_handler +from airflow.providers.common.sql.hooks.sql import DbApiHook, resolve_dialects from airflow.utils.session import provide_session from tests_common.test_utils.common_sql import mock_db_hook diff --git a/providers/common/sql/tests/unit/common/sql/operators/test_sql.py b/providers/common/sql/tests/unit/common/sql/operators/test_sql.py index 0953808e54f37..d5294f1b78fd9 100644 --- a/providers/common/sql/tests/unit/common/sql/operators/test_sql.py +++ b/providers/common/sql/tests/unit/common/sql/operators/test_sql.py @@ -27,7 +27,7 @@ from airflow import DAG from airflow.exceptions import AirflowException, AirflowProviderDeprecationWarning from airflow.models import Connection, DagRun, TaskInstance as TI, XCom -from airflow.providers.common.sql.hooks.sql import fetch_all_handler +from airflow.providers.common.sql.hooks.handlers import fetch_all_handler from airflow.providers.common.sql.operators.sql import ( BaseSQLOperator, BranchSQLOperator, diff --git a/providers/common/sql/tests/unit/common/sql/operators/test_sql_execute.py b/providers/common/sql/tests/unit/common/sql/operators/test_sql_execute.py index 606139f34f839..9c5ab36859b01 100644 --- a/providers/common/sql/tests/unit/common/sql/operators/test_sql_execute.py +++ b/providers/common/sql/tests/unit/common/sql/operators/test_sql_execute.py @@ -31,7 +31,8 @@ SchemaDatasetFacetFields, SQLJobFacet, ) -from airflow.providers.common.sql.hooks.sql import DbApiHook, fetch_all_handler +from airflow.providers.common.sql.hooks.handlers import fetch_all_handler +from airflow.providers.common.sql.hooks.sql import DbApiHook from airflow.providers.common.sql.operators.sql import SQLExecuteQueryOperator from airflow.providers.openlineage.extractors.base import OperatorLineage diff --git a/providers/databricks/src/airflow/providers/databricks/sensors/databricks_partition.py b/providers/databricks/src/airflow/providers/databricks/sensors/databricks_partition.py index df9f8cf3fe1d1..215aaf07022e5 100644 --- a/providers/databricks/src/airflow/providers/databricks/sensors/databricks_partition.py +++ b/providers/databricks/src/airflow/providers/databricks/sensors/databricks_partition.py @@ -28,7 +28,7 @@ from databricks.sql.utils import ParamEscaper from airflow.exceptions import AirflowException -from airflow.providers.common.sql.hooks.sql import fetch_all_handler +from airflow.providers.common.sql.hooks.handlers import fetch_all_handler from airflow.providers.databricks.hooks.databricks_sql import DatabricksSqlHook from airflow.sensors.base import BaseSensorOperator diff --git a/providers/databricks/src/airflow/providers/databricks/sensors/databricks_sql.py b/providers/databricks/src/airflow/providers/databricks/sensors/databricks_sql.py index 0d0d1871b270f..b941ae22c93c9 100644 --- a/providers/databricks/src/airflow/providers/databricks/sensors/databricks_sql.py +++ b/providers/databricks/src/airflow/providers/databricks/sensors/databricks_sql.py @@ -25,7 +25,7 @@ from typing import TYPE_CHECKING, Any, Callable from airflow.exceptions import AirflowException -from airflow.providers.common.sql.hooks.sql import fetch_all_handler +from airflow.providers.common.sql.hooks.handlers import fetch_all_handler from airflow.providers.databricks.hooks.databricks_sql import DatabricksSqlHook from airflow.sensors.base import BaseSensorOperator diff --git a/providers/databricks/tests/unit/databricks/hooks/test_databricks_sql.py b/providers/databricks/tests/unit/databricks/hooks/test_databricks_sql.py index 2beaa7b90fb23..34284213810d2 100644 --- a/providers/databricks/tests/unit/databricks/hooks/test_databricks_sql.py +++ b/providers/databricks/tests/unit/databricks/hooks/test_databricks_sql.py @@ -29,7 +29,7 @@ from airflow.exceptions import AirflowException from airflow.models import Connection -from airflow.providers.common.sql.hooks.sql import fetch_all_handler +from airflow.providers.common.sql.hooks.handlers import fetch_all_handler from airflow.providers.databricks.hooks.databricks_sql import DatabricksSqlHook, create_timeout_thread from airflow.utils.session import provide_session diff --git a/providers/databricks/tests/unit/databricks/operators/test_databricks_sql.py b/providers/databricks/tests/unit/databricks/operators/test_databricks_sql.py index b144cdf7af295..f6ba8b378c458 100644 --- a/providers/databricks/tests/unit/databricks/operators/test_databricks_sql.py +++ b/providers/databricks/tests/unit/databricks/operators/test_databricks_sql.py @@ -25,7 +25,7 @@ import pytest from databricks.sql.types import Row -from airflow.providers.common.sql.hooks.sql import fetch_all_handler +from airflow.providers.common.sql.hooks.handlers import fetch_all_handler from airflow.providers.databricks.operators.databricks_sql import DatabricksSqlOperator DATE = "2017-04-20" diff --git a/providers/databricks/tests/unit/databricks/sensors/test_databricks_partition.py b/providers/databricks/tests/unit/databricks/sensors/test_databricks_partition.py index 15e8adb1f3e55..39f9cee2702d1 100644 --- a/providers/databricks/tests/unit/databricks/sensors/test_databricks_partition.py +++ b/providers/databricks/tests/unit/databricks/sensors/test_databricks_partition.py @@ -25,7 +25,7 @@ from airflow.exceptions import AirflowException from airflow.models import DAG -from airflow.providers.common.sql.hooks.sql import fetch_all_handler +from airflow.providers.common.sql.hooks.handlers import fetch_all_handler from airflow.providers.databricks.sensors.databricks_partition import DatabricksPartitionSensor from airflow.utils import timezone diff --git a/providers/exasol/tests/unit/exasol/hooks/test_sql.py b/providers/exasol/tests/unit/exasol/hooks/test_sql.py index 4e57ebe4b6168..88ead8d196d56 100644 --- a/providers/exasol/tests/unit/exasol/hooks/test_sql.py +++ b/providers/exasol/tests/unit/exasol/hooks/test_sql.py @@ -25,7 +25,7 @@ import pytest from airflow.models import Connection -from airflow.providers.common.sql.hooks.sql import fetch_all_handler +from airflow.providers.common.sql.hooks.handlers import fetch_all_handler from airflow.providers.exasol.hooks.exasol import ExasolHook from airflow.utils.session import provide_session diff --git a/providers/snowflake/tests/unit/snowflake/hooks/test_sql.py b/providers/snowflake/tests/unit/snowflake/hooks/test_sql.py index b2143a1e1f0a9..a928c9e288ec2 100644 --- a/providers/snowflake/tests/unit/snowflake/hooks/test_sql.py +++ b/providers/snowflake/tests/unit/snowflake/hooks/test_sql.py @@ -23,7 +23,7 @@ import pytest from snowflake.connector import DictCursor -from airflow.providers.common.sql.hooks.sql import fetch_all_handler +from airflow.providers.common.sql.hooks.handlers import fetch_all_handler from airflow.providers.snowflake.hooks.snowflake import SnowflakeHook TASK_ID = "sql-operator" diff --git a/providers/snowflake/tests/unit/snowflake/operators/test_snowflake_sql.py b/providers/snowflake/tests/unit/snowflake/operators/test_snowflake_sql.py index 1a5f250a1cb95..9f3c92ab376b9 100644 --- a/providers/snowflake/tests/unit/snowflake/operators/test_snowflake_sql.py +++ b/providers/snowflake/tests/unit/snowflake/operators/test_snowflake_sql.py @@ -30,7 +30,7 @@ InputField, SQLJobFacet, ) -from airflow.providers.common.sql.hooks.sql import fetch_all_handler +from airflow.providers.common.sql.hooks.handlers import fetch_all_handler from airflow.providers.common.sql.operators.sql import SQLExecuteQueryOperator from airflow.providers.snowflake.hooks.snowflake import SnowflakeHook diff --git a/providers/teradata/src/airflow/providers/teradata/triggers/teradata_compute_cluster.py b/providers/teradata/src/airflow/providers/teradata/triggers/teradata_compute_cluster.py index a1a500f50ad20..df9e44b79b595 100644 --- a/providers/teradata/src/airflow/providers/teradata/triggers/teradata_compute_cluster.py +++ b/providers/teradata/src/airflow/providers/teradata/triggers/teradata_compute_cluster.py @@ -21,7 +21,7 @@ from typing import Any from airflow.exceptions import AirflowException -from airflow.providers.common.sql.hooks.sql import fetch_one_handler +from airflow.providers.common.sql.hooks.handlers import fetch_one_handler from airflow.providers.teradata.hooks.teradata import TeradataHook from airflow.providers.teradata.utils.constants import Constants from airflow.triggers.base import BaseTrigger, TriggerEvent diff --git a/providers/teradata/tests/unit/teradata/operators/test_teradata.py b/providers/teradata/tests/unit/teradata/operators/test_teradata.py index 0c614b42b262d..6091cd3630f17 100644 --- a/providers/teradata/tests/unit/teradata/operators/test_teradata.py +++ b/providers/teradata/tests/unit/teradata/operators/test_teradata.py @@ -21,7 +21,7 @@ from unittest.mock import MagicMock, Mock from airflow.exceptions import AirflowException -from airflow.providers.common.sql.hooks.sql import fetch_all_handler +from airflow.providers.common.sql.hooks.handlers import fetch_all_handler from airflow.providers.teradata.hooks.teradata import TeradataHook from airflow.providers.teradata.operators.teradata import TeradataOperator, TeradataStoredProcedureOperator diff --git a/providers/teradata/tests/unit/teradata/triggers/test_teradata_compute_cluster.py b/providers/teradata/tests/unit/teradata/triggers/test_teradata_compute_cluster.py index e272d468e41ce..ef6e2f1ab191f 100644 --- a/providers/teradata/tests/unit/teradata/triggers/test_teradata_compute_cluster.py +++ b/providers/teradata/tests/unit/teradata/triggers/test_teradata_compute_cluster.py @@ -21,7 +21,7 @@ import pytest -from airflow.providers.common.sql.hooks.sql import fetch_one_handler +from airflow.providers.common.sql.hooks.handlers import fetch_one_handler from airflow.providers.teradata.hooks.teradata import TeradataHook from airflow.providers.teradata.triggers.teradata_compute_cluster import TeradataComputeClusterSyncTrigger from airflow.providers.teradata.utils.constants import Constants diff --git a/providers/vertica/src/airflow/providers/vertica/hooks/vertica.py b/providers/vertica/src/airflow/providers/vertica/hooks/vertica.py index 0cb8929f56589..7a59bbbd02e40 100644 --- a/providers/vertica/src/airflow/providers/vertica/hooks/vertica.py +++ b/providers/vertica/src/airflow/providers/vertica/hooks/vertica.py @@ -22,7 +22,8 @@ from vertica_python import connect -from airflow.providers.common.sql.hooks.sql import DbApiHook, fetch_all_handler +from airflow.providers.common.sql.hooks.handlers import fetch_all_handler +from airflow.providers.common.sql.hooks.sql import DbApiHook def vertica_fetch_all_handler(cursor) -> list[tuple] | None: diff --git a/providers/ydb/tests/integration/ydb/operators/test_ydb.py b/providers/ydb/tests/integration/ydb/operators/test_ydb.py index b293ad1354b78..84cef2fad8a36 100644 --- a/providers/ydb/tests/integration/ydb/operators/test_ydb.py +++ b/providers/ydb/tests/integration/ydb/operators/test_ydb.py @@ -24,7 +24,7 @@ from airflow.models.connection import Connection from airflow.models.dag import DAG -from airflow.providers.common.sql.hooks.sql import fetch_all_handler +from airflow.providers.common.sql.hooks.handlers import fetch_all_handler from airflow.providers.ydb.operators.ydb import YDBExecuteQueryOperator from airflow.utils import timezone diff --git a/providers/ydb/tests/unit/ydb/operators/test_ydb.py b/providers/ydb/tests/unit/ydb/operators/test_ydb.py index b5e014eca2158..d66861317c7c5 100644 --- a/providers/ydb/tests/unit/ydb/operators/test_ydb.py +++ b/providers/ydb/tests/unit/ydb/operators/test_ydb.py @@ -24,7 +24,7 @@ from airflow.models import Connection from airflow.models.dag import DAG -from airflow.providers.common.sql.hooks.sql import fetch_all_handler, fetch_one_handler +from airflow.providers.common.sql.hooks.handlers import fetch_all_handler, fetch_one_handler from airflow.providers.ydb.operators.ydb import YDBExecuteQueryOperator