fix: move columns to datasource object for bootstrap data (#20203)

* move columns to datasource * address concerns
apache · May 31, 2022 · 9432c62 · 9432c62
1 parent e07ee6c
commit 9432c62
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/superset/models/sql_lab.py b/superset/models/sql_lab.py
@@ -166,6 +166,10 @@ def username(self) -> str:
     def sql_tables(self) -> List[Table]:
         return list(ParsedQuery(self.sql).tables)
 
+    @property
+    def columns(self) -> List[Table]:
+        return self.extra.get("columns", [])
+
     def raise_for_access(self) -> None:
         """
         Raise an exception if the user cannot access the resource.

diff --git a/superset/views/core.py b/superset/views/core.py
@@ -889,11 +889,10 @@ def explore(
         except (SupersetException, SQLAlchemyError):
             datasource_data = dummy_datasource_data
 
-        columns: List[Dict[str, Any]] = []
         if datasource:
             datasource_data["owners"] = datasource.owners_data
             if isinstance(datasource, Query):
-                columns = datasource.extra.get("columns", [])
+                datasource_data["columns"] = datasource.columns
 
         bootstrap_data = {
             "can_add": slice_add_perm,
@@ -908,7 +907,6 @@ def explore(
             "user": bootstrap_user_data(g.user, include_perms=True),
             "forced_height": request.args.get("height"),
             "common": common_bootstrap_payload(),
-            "columns": columns,
         }
         if slc:
             title = slc.slice_name