From 119817fa2deb7dd998268150f9a42f9f063a8655 Mon Sep 17 00:00:00 2001 From: Beto Dealmeida Date: Fri, 20 Sep 2024 11:58:52 -0400 Subject: [PATCH] fix: don't reformat generated queries --- superset/models/helpers.py | 7 +--- tests/integration_tests/datasource_tests.py | 2 +- .../integration_tests/query_context_tests.py | 6 +-- tests/integration_tests/sqla_models_tests.py | 2 +- tests/unit_tests/jinja_context_test.py | 39 +++++-------------- 5 files changed, 16 insertions(+), 40 deletions(-) diff --git a/superset/models/helpers.py b/superset/models/helpers.py index 80e66f50270c8..850a6e259f1b5 100644 --- a/superset/models/helpers.py +++ b/superset/models/helpers.py @@ -63,12 +63,11 @@ ColumnNotFoundException, QueryClauseValidationException, QueryObjectValidationError, - SupersetParseError, SupersetSecurityException, ) from superset.extensions import feature_flag_manager from superset.jinja_context import BaseTemplateProcessor -from superset.sql.parse import SQLScript, SQLStatement +from superset.sql.parse import SQLScript from superset.sql_parse import ( has_table_query, insert_rls_in_predicate, @@ -870,10 +869,6 @@ def get_query_str_extended( sqlaq = self.get_sqla_query(**query_obj) sql = self.database.compile_sqla_query(sqlaq.sqla_query) sql = self._apply_cte(sql, sqlaq.cte) - try: - sql = SQLStatement(sql, engine=self.db_engine_spec.engine).format() - except SupersetParseError: - logger.warning("Unable to parse SQL to format it, passing it as-is") if mutate: sql = self.database.mutate_sql_based_on_config(sql) diff --git a/tests/integration_tests/datasource_tests.py b/tests/integration_tests/datasource_tests.py index a2f21e7fc729e..a6c316fd1e742 100644 --- a/tests/integration_tests/datasource_tests.py +++ b/tests/integration_tests/datasource_tests.py @@ -692,7 +692,7 @@ def test_get_samples_with_multiple_filters( assert "2000-01-02" in rv.json["result"]["query"] assert "2000-01-04" in rv.json["result"]["query"] assert "col3 = 1.2" in rv.json["result"]["query"] - assert "col4 IS NULL" in rv.json["result"]["query"] + assert "col4 is null" in rv.json["result"]["query"] assert "col2 = 'c'" in rv.json["result"]["query"] diff --git a/tests/integration_tests/query_context_tests.py b/tests/integration_tests/query_context_tests.py index 2fcd6d2048173..b4854abf2bbef 100644 --- a/tests/integration_tests/query_context_tests.py +++ b/tests/integration_tests/query_context_tests.py @@ -367,7 +367,7 @@ def test_query_response_type(self): sql_text = get_sql_text(payload) assert "SELECT" in sql_text - assert re.search(r'NOT [`"\[]?num[`"\]]? IS NULL', sql_text) + assert re.search(r'[`"\[]?num[`"\]]? IS NOT NULL', sql_text) assert re.search( r"""NOT \([\s\n]*[`"\[]?name[`"\]]? IS NULL[\s\n]* """ r"""OR [`"\[]?name[`"\]]? IN \('"abc"'\)[\s\n]*\)""", @@ -1161,11 +1161,11 @@ def test_time_offset_with_temporal_range_filter(app_context, physical_dataset): OFFSET 0 """ assert ( - re.search(r"WHERE\n col6 >= .*2002-01-01", sqls[0]) + re.search(r"WHERE col6 >= .*2002-01-01", sqls[0]) and re.search(r"AND col6 < .*2003-01-01", sqls[0]) ) is not None assert ( - re.search(r"WHERE\n col6 >= .*2001-10-01", sqls[1]) + re.search(r"WHERE col6 >= .*2001-10-01", sqls[1]) and re.search(r"AND col6 < .*2002-10-01", sqls[1]) ) is not None diff --git a/tests/integration_tests/sqla_models_tests.py b/tests/integration_tests/sqla_models_tests.py index 4398d75c12f92..ca08842ebea13 100644 --- a/tests/integration_tests/sqla_models_tests.py +++ b/tests/integration_tests/sqla_models_tests.py @@ -803,7 +803,7 @@ def test_none_operand_in_filter(login_as_admin, physical_dataset): { "operator": FilterOperator.NOT_EQUALS.value, "count": 0, - "sql_should_contain": "NOT COL4 IS NULL", + "sql_should_contain": "COL4 IS NOT NULL", }, ] for expected in expected_results: diff --git a/tests/unit_tests/jinja_context_test.py b/tests/unit_tests/jinja_context_test.py index 579131001884d..ced40c8119dea 100644 --- a/tests/unit_tests/jinja_context_test.py +++ b/tests/unit_tests/jinja_context_test.py @@ -470,48 +470,29 @@ def test_dataset_macro(mocker: MockerFixture) -> None: return_value=[], ) + space = " " + assert ( dataset_macro(1) - == """( -SELECT - ds AS ds, - num_boys AS num_boys, - revenue AS revenue, - expenses AS expenses, - revenue - expenses AS profit + == f"""( +SELECT ds AS ds, num_boys AS num_boys, revenue AS revenue, expenses AS expenses, revenue-expenses AS profit{space} FROM my_schema.old_dataset ) AS dataset_1""" ) assert ( dataset_macro(1, include_metrics=True) - == """( -SELECT - ds AS ds, - num_boys AS num_boys, - revenue AS revenue, - expenses AS expenses, - revenue - expenses AS profit, - COUNT(*) AS cnt -FROM my_schema.old_dataset -GROUP BY - ds, - num_boys, - revenue, - expenses, - revenue - expenses + == f"""( +SELECT ds AS ds, num_boys AS num_boys, revenue AS revenue, expenses AS expenses, revenue-expenses AS profit, COUNT(*) AS cnt{space} +FROM my_schema.old_dataset GROUP BY ds, num_boys, revenue, expenses, revenue-expenses ) AS dataset_1""" ) assert ( dataset_macro(1, include_metrics=True, columns=["ds"]) - == """( -SELECT - ds AS ds, - COUNT(*) AS cnt -FROM my_schema.old_dataset -GROUP BY - ds + == f"""( +SELECT ds AS ds, COUNT(*) AS cnt{space} +FROM my_schema.old_dataset GROUP BY ds ) AS dataset_1""" )