Skip to content

Commit

Permalink
fix: [chart power query] error show when user input column with x-axis (
Browse files Browse the repository at this point in the history
  • Loading branch information
hughhhh authored and sebastianliebscher committed Apr 28, 2023
1 parent 902a71c commit 59a24dd
Showing 1 changed file with 25 additions and 1 deletion.
26 changes: 25 additions & 1 deletion superset/models/sql_lab.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
)
from sqlalchemy.engine.url import URL
from sqlalchemy.orm import backref, relationship
from sqlalchemy.sql.elements import ColumnElement, literal_column

from superset import security_manager
from superset.jinja_context import BaseTemplateProcessor, get_template_processor
Expand All @@ -52,7 +53,7 @@
)
from superset.sql_parse import CtasMethod, ParsedQuery, Table
from superset.sqllab.limiting_factor import LimitingFactor
from superset.utils.core import QueryStatus, user_label
from superset.utils.core import get_column_name, QueryStatus, user_label

if TYPE_CHECKING:
from superset.connectors.sqla.models import TableColumn
Expand Down Expand Up @@ -329,6 +330,29 @@ def get_column(self, column_name: Optional[str]) -> Optional[Dict[str, Any]]:
return col
return None

def adhoc_column_to_sqla(
self,
col: "AdhocColumn", # type: ignore
force_type_check: bool = False,
template_processor: Optional[BaseTemplateProcessor] = None,
) -> ColumnElement:
"""
Turn an adhoc column into a sqlalchemy column.
:param col: Adhoc column definition
:param template_processor: template_processor instance
:returns: The metric defined as a sqlalchemy column
:rtype: sqlalchemy.sql.column
"""
label = get_column_name(col)
expression = self._process_sql_expression(
expression=col["sqlExpression"],
database_id=self.database_id,
schema=self.schema,
template_processor=template_processor,
)
sqla_column = literal_column(expression)
return self.make_sqla_column_compatible(sqla_column, label)


class SavedQuery(Model, AuditMixinNullable, ExtraJSONMixin, ImportExportMixin):
"""ORM model for SQL query"""
Expand Down

0 comments on commit 59a24dd

Please sign in to comment.