You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@superset.apache.org by mi...@apache.org on 2023/08/07 19:29:51 UTC
[superset] branch 3.0 updated (8335afaa52 -> abead484e1)
This is an automated email from the ASF dual-hosted git repository.
michaelsmolina pushed a change to branch 3.0
in repository https://gitbox.apache.org/repos/asf/superset.git
discard 8335afaa52 fix: Migration to fix out of sync schema_perm in charts and datasets (#24884)
new abead484e1 fix: Migration to fix out of sync schema_perm in charts and datasets (#24884)
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (8335afaa52)
\
N -- N -- N refs/heads/3.0 (abead484e1)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../2023-08-02_15-23_0769ef90fddd_fix_schema_perm_for_datasets.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[superset] 01/01: fix: Migration to fix out of sync schema_perm in charts and datasets (#24884)
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelsmolina pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/superset.git
commit abead484e1c70f45121b071fc04f4b0cd3385ba6
Author: Jack Fragassi <jf...@gmail.com>
AuthorDate: Mon Aug 7 09:34:47 2023 -0700
fix: Migration to fix out of sync schema_perm in charts and datasets (#24884)
(cherry picked from commit 07992c11e73acbf4debf55555b8cdc8a96e50d0e)
---
...23_0769ef90fddd_fix_schema_perm_for_datasets.py | 108 +++++++++++++++++++++
...ef90fddd_fix_schema_perm_for_datasets__tests.py | 56 +++++++++++
2 files changed, 164 insertions(+)
diff --git a/superset/migrations/versions/2023-08-02_15-23_0769ef90fddd_fix_schema_perm_for_datasets.py b/superset/migrations/versions/2023-08-02_15-23_0769ef90fddd_fix_schema_perm_for_datasets.py
new file mode 100644
index 0000000000..afe969c3af
--- /dev/null
+++ b/superset/migrations/versions/2023-08-02_15-23_0769ef90fddd_fix_schema_perm_for_datasets.py
@@ -0,0 +1,108 @@
+# 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 schema perm for datasets
+
+Revision ID: 0769ef90fddd
+Revises: bf646a0c1501
+Create Date: 2023-08-02 15:23:58.242396
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = "0769ef90fddd"
+down_revision = "bf646a0c1501"
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects.sqlite.base import SQLiteDialect
+from sqlalchemy.ext.declarative import declarative_base
+
+from superset import db
+
+Base = declarative_base()
+
+
+class SqlaTable(Base):
+ __tablename__ = "tables"
+
+ id = sa.Column(sa.Integer, primary_key=True)
+ schema = sa.Column(sa.String(255))
+ schema_perm = sa.Column(sa.String(1000))
+ database_id = sa.Column(sa.Integer, sa.ForeignKey("dbs.id"))
+
+
+class Slice(Base):
+ __tablename__ = "slices"
+
+ id = sa.Column(sa.Integer, primary_key=True)
+ schema_perm = sa.Column(sa.String(1000))
+ datasource_id = sa.Column(sa.Integer)
+
+
+class Database(Base):
+ __tablename__ = "dbs"
+
+ id = sa.Column(sa.Integer, primary_key=True)
+ database_name = sa.Column(sa.String(250))
+
+
+def fix_datasets_schema_perm(session):
+ for result in (
+ session.query(SqlaTable, Database.database_name)
+ .join(Database)
+ .filter(SqlaTable.schema.isnot(None))
+ .filter(
+ SqlaTable.schema_perm
+ != sa.func.concat("[", Database.database_name, "].[", SqlaTable.schema, "]")
+ )
+ ):
+ result.SqlaTable.schema_perm = (
+ f"[{result.database_name}].[{result.SqlaTable.schema}]"
+ )
+
+
+def fix_charts_schema_perm(session):
+ for result in (
+ session.query(Slice, SqlaTable, Database.database_name)
+ .join(SqlaTable, Slice.datasource_id == SqlaTable.id)
+ .join(Database, SqlaTable.database_id == Database.id)
+ .filter(SqlaTable.schema.isnot(None))
+ .filter(
+ Slice.schema_perm
+ != sa.func.concat("[", Database.database_name, "].[", SqlaTable.schema, "]")
+ )
+ ):
+ result.Slice.schema_perm = (
+ f"[{result.database_name}].[{result.SqlaTable.schema}]"
+ )
+
+
+def upgrade():
+ bind = op.get_bind()
+ session = db.Session(bind=bind)
+ if isinstance(bind.dialect, SQLiteDialect):
+ return # sqlite doesn't have a concat function
+
+ fix_datasets_schema_perm(session)
+ fix_charts_schema_perm(session)
+
+ session.commit()
+ session.close()
+
+
+def downgrade():
+ pass
diff --git a/tests/integration_tests/migrations/0769ef90fddd_fix_schema_perm_for_datasets__tests.py b/tests/integration_tests/migrations/0769ef90fddd_fix_schema_perm_for_datasets__tests.py
new file mode 100644
index 0000000000..1b74a7f048
--- /dev/null
+++ b/tests/integration_tests/migrations/0769ef90fddd_fix_schema_perm_for_datasets__tests.py
@@ -0,0 +1,56 @@
+# 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.
+from importlib import import_module
+
+import pytest
+
+from superset import db
+from superset.connectors.sqla.models import SqlaTable
+from superset.models.slice import Slice
+from superset.utils.core import backend, get_example_default_schema
+from tests.integration_tests.fixtures.birth_names_dashboard import (
+ load_birth_names_dashboard_with_slices,
+ load_birth_names_data,
+)
+
+migration_module = import_module(
+ "superset.migrations.versions."
+ "2023-08-02_15-23_0769ef90fddd_fix_schema_perm_for_datasets"
+)
+
+fix_datasets_schema_perm = migration_module.fix_datasets_schema_perm
+fix_charts_schema_perm = migration_module.fix_charts_schema_perm
+
+
+@pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
+def test_fix_schema_perm():
+ if backend() == "sqlite":
+ return
+
+ dataset = db.session.query(SqlaTable).filter_by(table_name="birth_names").one()
+ chart = db.session.query(Slice).filter_by(slice_name="Girls").one()
+ dataset.schema_perm = "wrong"
+ chart.schema_perm = "wrong"
+ db.session.commit()
+
+ fix_datasets_schema_perm(db.session)
+ db.session.commit()
+ assert dataset.schema_perm == f"[examples].[{get_example_default_schema()}]"
+
+ fix_charts_schema_perm(db.session)
+ db.session.commit()
+ assert chart.schema_perm == f"[examples].[{get_example_default_schema()}]"