Skip to content

Commit

Permalink
migration for tabbed Sql Editors
Browse files Browse the repository at this point in the history
  • Loading branch information
AAfghahi committed Jan 5, 2022
1 parent e609fda commit a8b27ce
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 8 deletions.
2 changes: 0 additions & 2 deletions superset-frontend/src/SqlLab/components/App/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ import QuerySearch from '../QuerySearch';
class App extends React.PureComponent {
constructor(props) {
super(props);
console.log('this is App');
console.log(props);
this.state = {
hash: window.location.hash,
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,6 @@ class SqlEditor extends React.PureComponent {
)}
</Menu>
);

return (
<StyledToolbar className="sql-toolbar" id="js-sql-toolbar">
<div className="leftItems">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ const userOS = detectOS();
class TabbedSqlEditors extends React.PureComponent {
constructor(props) {
super(props);
console.log('this is the tabbed', props);
const sqlLabUrl = '/superset/sqllab';
this.state = {
sqlLabUrl,
Expand All @@ -94,8 +93,6 @@ class TabbedSqlEditors extends React.PureComponent {

componentDidMount() {
// migrate query editor and associated tables state to server
console.log('we here boys');
console.log(this.props);
if (isFeatureEnabled(FeatureFlag.SQLLAB_BACKEND_PERSISTENCE)) {
const localStorageTables = this.props.tables.filter(
table => table.inLocalStorage,
Expand Down Expand Up @@ -437,7 +434,6 @@ TabbedSqlEditors.propTypes = propTypes;
TabbedSqlEditors.defaultProps = defaultProps;

function mapStateToProps({ sqlLab, common, requestedQuery }) {
console.log(sqlLab);
return {
databases: sqlLab.databases,
queryEditors: sqlLab.queryEditors,
Expand Down
1 change: 0 additions & 1 deletion superset-frontend/src/SqlLab/reducers/getInitialState.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ export default function getInitialState({
functionNames: [],
schema: activeTab.schema,
queryLimit: activeTab.query_limit,
remoteId: activeTab.remoteId,
validationResult: {
id: null,
errors: [],
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
"""add_saved_query_foreign_key_to_tab_state
Revision ID: c53bae8f08dd
Revises: bb38f40aa3ff
Create Date: 2021-12-15 15:05:21.845777
"""

# revision identifiers, used by Alembic.
revision = "c53bae8f08dd"
down_revision = "bb38f40aa3ff"

import sqlalchemy as sa
from alembic import op


def upgrade():
with op.batch_alter_table("tab_state") as batch_op:
batch_op.add_column(sa.Column("saved_query_id", sa.Integer(), nullable=True))
batch_op.create_foreign_key(
"saved_query_id", "saved_query", ["saved_query_id"], ["id"]
)


def downgrade():
with op.batch_alter_table("tab_state") as batch_op:
batch_op.drop_constraint("saved_query_id", type_="foreignkey")
batch_op.drop_column("saved_query_id")

0 comments on commit a8b27ce

Please sign in to comment.