serenajiang commented on a change in pull request #9109: [migration] metadata for dashboard filters URL: https://github.com/apache/incubator-superset/pull/9109#discussion_r377465441
########## File path: superset/migrations/versions/3325d4caccc8_dashboard_scoped_filters.py ########## @@ -0,0 +1,114 @@ +# 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. +"""empty message + +Revision ID: 3325d4caccc8 +Revises: e96dbf2cfef0 +Create Date: 2020-02-07 14:13:51.714678 + +""" + +# revision identifiers, used by Alembic. +import json +import logging + +from alembic import op +from sqlalchemy import and_, Column, ForeignKey, Integer, String, Table, Text +from sqlalchemy.ext.declarative import declarative_base +from sqlalchemy.orm import relationship + +from superset import db +from superset.utils.dashboard_filter_scopes_converter import convert_filter_scopes + +revision = "3325d4caccc8" +down_revision = "e96dbf2cfef0" + +Base = declarative_base() + + +class Slice(Base): + """Declarative class to do query in upgrade""" + + __tablename__ = "slices" + id = Column(Integer, primary_key=True) + slice_name = Column(String(250)) + params = Column(Text) + viz_type = Column(String(250)) + + +dashboard_slices = Table( + "dashboard_slices", + Base.metadata, + Column("id", Integer, primary_key=True), + Column("dashboard_id", Integer, ForeignKey("dashboards.id")), + Column("slice_id", Integer, ForeignKey("slices.id")), +) + + +class Dashboard(Base): + __tablename__ = "dashboards" + id = Column(Integer, primary_key=True) + json_metadata = Column(Text) + slices = relationship("Slice", secondary=dashboard_slices, backref="dashboards") + + +def upgrade(): + bind = op.get_bind() + session = db.Session(bind=bind) + + dashboards = session.query(Dashboard).all() + for i, dashboard in enumerate(dashboards): + print("scanning dashboard ({}/{}) >>>>".format(i + 1, len(dashboards))) + try: + json_metadata = json.loads(dashboard.json_metadata or "{}") + if "filter_scopes" in json_metadata: + continue + + filter_scopes = {} + slice_ids = [slice.id for slice in dashboard.slices] + filters = ( + session.query(Slice) + .filter(and_(Slice.id.in_(slice_ids), Slice.viz_type == "filter_box")) + .all() + ) Review comment: I don't think the query for filters is necessary, since the slices shouuuld have all the info loaded, so you could just do something like: ``` filters = [slice for slice in dashboard.slices if slice.viz_type == "filter_box"] ``` ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
