mirror of
https://github.com/apache/superset.git
synced 2026-07-18 12:45:44 +00:00
fix(sqllab): guard empty mutated single-block queries, share block prep across paths
The empty-statement guard added for split engines never covered the run_multiple_statements_as_one branch: with MUTATE_AFTER_SPLIT=True the per-statement mutator outputs were joined into a single block with no check that any executable SQL remained, so an empty/comment-only mutator result bypassed the clean INVALID_SQL_ERROR and reached execution as an empty block. (An earlier review reply claimed this was fixed, but the commit never landed.) Per review feedback, the whole run_multiple_statements_as_one × MUTATE_AFTER_SPLIT matrix now lives in one shared helper, build_statement_blocks() in superset/sql/execution/executor.py, used by both the sync (sql_lab.py) and async (celery_task.py) paths, so the two can't drift again. The new guard validates the joined block via SQLScript and raises the same INVALID_SQL_ERROR as the split-engine branch; if the mutator emits engine-specific SQL our parser can't handle, validation is skipped and the database stays the authority on validity. Regression tests cover the previously-unguarded matrix cell in both the sync and async suites. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -443,6 +443,30 @@ def test_prepare_statement_blocks_raises_when_mutator_strips_all_statements(
|
||||
_prepare_statement_blocks(sql, mock_database.db_engine_spec, mock_database)
|
||||
|
||||
|
||||
def test_prepare_statement_blocks_raises_when_mutator_strips_single_block(
|
||||
app_context: None, mock_database: MagicMock, mocker: MockerFixture
|
||||
) -> None:
|
||||
"""
|
||||
The empty-statement guard must also cover engines that run all statements
|
||||
as one block: with `MUTATE_AFTER_SPLIT=True` the per-statement mutator
|
||||
outputs are joined into a single block, and a comment-only/empty result
|
||||
must raise a clean error instead of reaching execution as an empty block.
|
||||
"""
|
||||
from superset.sql.execution.celery_task import _prepare_statement_blocks
|
||||
|
||||
mocker.patch.dict(current_app.config, {"MUTATE_AFTER_SPLIT": True})
|
||||
mock_database.db_engine_spec.run_multiple_statements_as_one = True
|
||||
mocker.patch.object(
|
||||
mock_database,
|
||||
"mutate_sql_based_on_config",
|
||||
side_effect=lambda sql, **kw: "-- just a comment",
|
||||
)
|
||||
sql = "SELECT * FROM users; SELECT * FROM orders;"
|
||||
|
||||
with pytest.raises(SupersetErrorException):
|
||||
_prepare_statement_blocks(sql, mock_database.db_engine_spec, mock_database)
|
||||
|
||||
|
||||
# =============================================================================
|
||||
# Result Finalization Tests
|
||||
# =============================================================================
|
||||
|
||||
Reference in New Issue
Block a user