Common SQLCheckOperators Various Functionality Update

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

@@ -34,7 +34,13 @@ def parse_boolean(val: str) -> Union[str, bool]:
     raise ValueError(f"{val!r} is not a boolean-like string value")
 
 
-def _get_failed_tests(checks):
+def _get_failed_checks(checks, col=None):
+    if col:
+        return [
+            f"Column: {col}\nCheck: {check},\nCheck Values: {check_values}\n"
+            for check, check_values in checks.items()
+            if not check_values["success"]
+        ]
     return [
         f"\tCheck: {check},\n\tCheck Values: {check_values}\n"
         for check, check_values in checks.items()
@@ -73,6 +79,7 @@ class SQLColumnCheckOperator(BaseSQLOperator):
             }
         }
 
+    :param batch: a SQL statement that is added to a WHERE clause to create batches
     :param conn_id: the connection ID used to connect to the database
     :param database: name of database which overwrite the defined one in connection
 
@@ -94,6 +101,7 @@ def __init__(
         *,
         table: str,
         column_mapping: Dict[str, Dict[str, Any]],
+        batch: Optional[str] = None,
         conn_id: Optional[str] = None,
         database: Optional[str] = None,
         **kwargs,
@@ -105,6 +113,7 @@ def __init__(
 
         self.table = table
         self.column_mapping = column_mapping
+        self.batch = batch
         # OpenLineage needs a valid SQL query with the input/output table(s) to parse
         self.sql = f"SELECT * FROM {self.table};"
 
@@ -114,8 +123,8 @@ def execute(self, context=None):
         for column in self.column_mapping:
             checks = [*self.column_mapping[column]]
             checks_sql = ",".join([self.column_checks[check].replace("column", column) for check in checks])
-
-            self.sql = f"SELECT {checks_sql} FROM {self.table};"
+            batch_statement = f"WHERE {self.batch}" if self.batch else ""
+            self.sql = f"SELECT {checks_sql} FROM {self.table} {batch_statement};"
             records = hook.get_first(self.sql)
 
             if not records:
@@ -131,10 +140,10 @@ def execute(self, context=None):
                     self.column_mapping[column][checks[idx]], result, tolerance
                 )
 
-            failed_tests.extend(_get_failed_tests(self.column_mapping[column]))
+            failed_tests.extend(_get_failed_checks(self.column_mapping[column], column))
         if failed_tests:
             raise AirflowException(
-                f"Test failed.\nQuery:\n{self.sql}\nResults:\n{records!s}\n"
+                f"Test failed.\nResults:\n{records!s}\n"
                 "The following tests have failed:"
                 f"\n{''.join(failed_tests)}"
             )
@@ -249,6 +258,7 @@ class SQLTableCheckOperator(BaseSQLOperator):
             "column_sum_check": {"check_statement": "col_a + col_b < col_c"},
         }
 
+    :param batch: a SQL statement that is added to a WHERE clause to create batches
     :param conn_id: the connection ID used to connect to the database
     :param database: name of database which overwrite the defined one in connection
 
@@ -257,14 +267,17 @@ class SQLTableCheckOperator(BaseSQLOperator):
         :ref:`howto/operator:SQLTableCheckOperator`
     """
 
-    sql_check_template = "CASE WHEN check_statement THEN 1 ELSE 0 END AS check_name"
-    sql_min_template = "MIN(check_name)"
+    sql_check_template = """
+        SELECT '_check_name' AS check_name, MIN(_check_name) AS check_result
+        FROM(SELECT CASE WHEN check_statement THEN 1 ELSE 0 END AS _check_name FROM table) AS check_table
+    """
 
     def __init__(
         self,
         *,
         table: str,
         checks: Dict[str, Dict[str, Any]],
+        batch: Optional[str] = None,
         conn_id: Optional[str] = None,
         database: Optional[str] = None,
         **kwargs,
@@ -273,38 +286,36 @@ def __init__(
 
         self.table = table
         self.checks = checks
+        self.batch = batch
         # OpenLineage needs a valid SQL query with the input/output table(s) to parse
         self.sql = f"SELECT * FROM {self.table};"
 
     def execute(self, context=None):
         hook = self.get_db_hook()
-
-        check_names = [*self.checks]
-        check_mins_sql = ",".join(
-            self.sql_min_template.replace("check_name", check_name) for check_name in check_names
-        )
-        checks_sql = ",".join(
+        checks_sql = " UNION ALL ".join(
             [
-                self.sql_check_template.replace("check_statement", value["check_statement"]).replace(
-                    "check_name", check_name
-                )
+                self.sql_check_template.replace("check_statement", value["check_statement"])
+                .replace("_check_name", check_name)
+                .replace("table", self.table)
                 for check_name, value in self.checks.items()
             ]
         )
+        batch_statement = f"WHERE {self.batch}" if self.batch else ""
+        self.sql = f"SELECT check_name, check_result FROM ({checks_sql}) {batch_statement};"
+        records = hook.get_pandas_df(self.sql)
 
-        self.sql = f"SELECT {check_mins_sql} FROM (SELECT {checks_sql} FROM {self.table});"
-        records = hook.get_first(self.sql)
-
-        if not records:
+        if records.empty:
             raise AirflowException(f"The following query returned zero rows: {self.sql}")
 
-        self.log.info("Record: %s", records)
+        records.columns = records.columns.str.lower()
+        self.log.info("Record:\n%s", records)
 
-        for check in self.checks.keys():
-            for result in records:
-                self.checks[check]["success"] = parse_boolean(str(result))
+        for row in records.iterrows():
+            check = row[1].get("check_name")
+            result = row[1].get("check_result")
+            self.checks[check]["success"] = parse_boolean(str(result))
 
-        failed_tests = _get_failed_tests(self.checks)
+        failed_tests = _get_failed_checks(self.checks)
         if failed_tests:
             raise AirflowException(
                 f"Test failed.\nQuery:\n{self.sql}\nResults:\n{records!s}\n"

tests/providers/common/sql/operators/test_sql.py

@@ -16,6 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
+import pandas as pd
 import pytest
 
 from airflow.exceptions import AirflowException
@@ -26,6 +27,9 @@ class MockHook:
     def get_first(self):
         return
 
+    def get_pandas_df(self):
+        return
+
 
 def _get_mock_db_hook():
     return MockHook()
@@ -95,20 +99,32 @@ class TestTableCheckOperator:
         "column_sum_check": {"check_statement": "col_a + col_b < col_c"},
     }
 
-    def _construct_operator(self, monkeypatch, checks, return_vals):
-        def get_first_return(*arg):
-            return return_vals
+    def _construct_operator(self, monkeypatch, checks, return_df):
+        def get_pandas_df_return(*arg):
+            return return_df
 
         operator = SQLTableCheckOperator(task_id="test_task", table="test_table", checks=checks)
         monkeypatch.setattr(operator, "get_db_hook", _get_mock_db_hook)
-        monkeypatch.setattr(MockHook, "get_first", get_first_return)
+        monkeypatch.setattr(MockHook, "get_pandas_df", get_pandas_df_return)
         return operator
 
     def test_pass_all_checks_check(self, monkeypatch):
-        operator = self._construct_operator(monkeypatch, self.checks, ('1', 'y', 'true'))
+        df = pd.DataFrame(
+            data={
+                "test_name": ["row_count_check", "column_sum_check"],
+                "test_result": [
+                    "1",
+                    "y",
+                ],
+            }
+        )
+        operator = self._construct_operator(monkeypatch, self.checks, df)
         operator.execute()
 
     def test_fail_all_checks_check(self, monkeypatch):
-        operator = self._construct_operator(monkeypatch, self.checks, ('0', 'n', 'false'))
+        df = pd.DataFrame(
+            data={"test_name": ["row_count_check", "column_sum_check"], "test_result": ["0", "n"]}
+        )
+        operator = self._construct_operator(monkeypatch, self.checks, df)
         with pytest.raises(AirflowException):
             operator.execute()