Skip to content
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.

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

fix(sqllab): Replace stringified 'null' schema column values with NULL #18992

Merged
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# 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.
"""fix query and saved_query null schema

Revision ID: b5a422d8e252
Revises: b8d3a24d9131
Create Date: 2022-03-02 09:20:02.919490

"""

from alembic import op
from sqlalchemy import Column, Integer, String
from sqlalchemy.ext.declarative import declarative_base

from superset import db

# revision identifiers, used by Alembic.
revision = "b5a422d8e252"
down_revision = "b8d3a24d9131"

Base = declarative_base()


class Query(Base):
__tablename__ = "query"

id = Column(Integer, primary_key=True)
schema = Column(String(256))


class SavedQuery(Base):
__tablename__ = "saved_query"

id = Column(Integer, primary_key=True)
schema = Column(String(128))
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not evident why these tables use different string sizes for encoding the schema.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yikes



def upgrade():
bind = op.get_bind()
session = db.Session(bind=bind)

for model in (Query, SavedQuery):
for record in session.query(model).filter(model.schema == "null"):
record.schema = None

session.commit()

session.close()


def downgrade():
pass