added explore database for ctas/cvas

dropbox · Jun 26, 2020 · eb93e60 · eb93e60
1 parent ece4f6d
commit eb93e60
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/superset-frontend/src/SqlLab/components/ResultSet.jsx b/superset-frontend/src/SqlLab/components/ResultSet.jsx
@@ -243,7 +243,7 @@ export default class ResultSet extends React.PureComponent {
               <ExploreCtasResultsButton
                 table={tmpTable}
                 schema={tmpSchema}
-                dbId={query.dbId}
+                dbId={this.props.database.explore_database_visualization_id}
                 database={this.props.database}
                 actions={this.props.actions}
               />

diff --git a/superset/models/core.py b/superset/models/core.py
@@ -189,6 +189,10 @@ def allows_cost_estimate(self) -> bool:
             and cost_estimate_enabled
         )
 
+    @property
+    def explore_database_visualization_id(self) -> int:
+        return self.get_extra().get("explore_database_id", self.id)
+
     @property
     def data(self) -> Dict[str, Any]:
         return {
@@ -198,6 +202,7 @@ def data(self) -> Dict[str, Any]:
             "allow_multi_schema_metadata_fetch": self.allow_multi_schema_metadata_fetch,
             "allows_subquery": self.allows_subquery,
             "allows_cost_estimate": self.allows_cost_estimate,
+            "explore_database_visualization_id": self.explore_database_visualization_id,
         }
 
     @property

diff --git a/superset/views/database/api.py b/superset/views/database/api.py
@@ -136,6 +136,7 @@ class DatabaseRestApi(DatabaseMixin, BaseSupersetModelRestApi):
         "allow_csv_upload",
         "allows_subquery",
         "allows_cost_estimate",
+        "explore_database_visualization_id",
         "backend",
         "function_names",
     ]