Skip to content

fix(sqlglot): adhoc expressions #35482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
betodealmeida merged 3 commits into from
Oct 3, 2025
Merged

fix(sqlglot): adhoc expressions #35482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
635baeb
fix(sqlglot): adhoc expressions
betodealmeida Oct 3, 2025
138086c
Add tests
betodealmeida Oct 3, 2025
af96940
More cases
betodealmeida Oct 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions superset/connectors/sqla/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1467,7 +1467,7 @@ def adhoc_metric_to_sqla(

if not processed:
try:
expression = self._process_sql_expression(
expression = self._process_select_expression(
expression=expression,
database_id=self.database_id,
engine=self.database.backend,
Expand Down Expand Up @@ -1502,7 +1502,7 @@ def adhoc_column_to_sqla( # pylint: disable=too-many-locals
"""
label = utils.get_column_name(col)
try:
expression = self._process_sql_expression(
expression = self._process_select_expression(
expression=col["sqlExpression"],
database_id=self.database_id,
engine=self.database.backend,
Expand Down
64 changes: 49 additions & 15 deletions superset/models/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -871,6 +871,40 @@ def _process_sql_expression( # pylint: disable=too-many-arguments
raise QueryObjectValidationError(ex.message) from ex
return expression

def _process_select_expression(
self,
expression: Optional[str],
database_id: int,
engine: str,
schema: str,
template_processor: Optional[BaseTemplateProcessor],
) -> Optional[str]:
"""
Validate and process an adhoc expression used as a column or metric.

This requires prefixing the expression with a dummy SELECT statement, so it can
be properly parsed and validated.
"""
if expression:
expression = f"SELECT {expression}"

if processed := self._process_sql_expression(
expression=expression,
database_id=database_id,
engine=engine,
schema=schema,
template_processor=template_processor,
):
prefix, expression = re.split(
r"SELECT\s+",
processed,
maxsplit=1,
flags=re.IGNORECASE,
)
return expression.strip()

return None

def _process_orderby_expression(
self,
expression: Optional[str],
Expand Down Expand Up @@ -1200,7 +1234,7 @@ def adhoc_metric_to_sqla(
expression = metric.get("sqlExpression")

if not processed:
expression = self._process_sql_expression(
expression = self._process_select_expression(
expression=metric["sqlExpression"],
database_id=self.database_id,
engine=self.database.backend,
Expand Down Expand Up @@ -1888,12 +1922,12 @@ def get_sqla_query( # pylint: disable=too-many-arguments,too-many-locals,too-ma
template_processor=template_processor,
)
else:
selected = validate_adhoc_subquery(
selected,
self.database,
self.catalog,
self.schema,
self.database.db_engine_spec.engine,
selected = self._process_select_expression(
expression=selected,
database_id=self.database_id,
engine=self.database.backend,
schema=self.schema,
template_processor=template_processor,
)
outer = literal_column(f"({selected})")
outer = self.make_sqla_column_compatible(outer, selected)
Expand All @@ -1917,12 +1951,12 @@ def get_sqla_query( # pylint: disable=too-many-arguments,too-many-locals,too-ma
_sql = quote(selected)
_column_label = selected

selected = validate_adhoc_subquery(
_sql,
self.database,
self.catalog,
self.schema,
self.database.db_engine_spec.engine,
selected = self._process_select_expression(
expression=_sql,
database_id=self.database_id,
engine=self.database.backend,
schema=self.schema,
template_processor=template_processor,
)

select_exprs.append(
Expand Down Expand Up @@ -2196,7 +2230,7 @@ def get_sqla_query( # pylint: disable=too-many-arguments,too-many-locals,too-ma
if extras:
where = extras.get("where")
if where:
where = self._process_sql_expression(
where = self._process_select_expression(
expression=where,
database_id=self.database_id,
engine=self.database.backend,
Expand All @@ -2206,7 +2240,7 @@ def get_sqla_query( # pylint: disable=too-many-arguments,too-many-locals,too-ma
where_clause_and += [self.text(where)]
having = extras.get("having")
if having:
having = self._process_sql_expression(
having = self._process_select_expression(
expression=having,
database_id=self.database_id,
engine=self.database.backend,
Expand Down
Loading
Loading