From 84ece8f836ea5fe16e45403f9dade657da25c964 Mon Sep 17 00:00:00 2001 From: Beto Dealmeida Date: Fri, 19 Jul 2024 16:16:03 -0400 Subject: [PATCH 1/2] fix: remove old constraint --- ...3d7e2eb9a4_remove__customer_location_uc.py | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 superset/migrations/versions/2024-07-19_16-11_df3d7e2eb9a4_remove__customer_location_uc.py diff --git a/superset/migrations/versions/2024-07-19_16-11_df3d7e2eb9a4_remove__customer_location_uc.py b/superset/migrations/versions/2024-07-19_16-11_df3d7e2eb9a4_remove__customer_location_uc.py new file mode 100644 index 0000000000000..9ce45aeecd5e7 --- /dev/null +++ b/superset/migrations/versions/2024-07-19_16-11_df3d7e2eb9a4_remove__customer_location_uc.py @@ -0,0 +1,55 @@ +# 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. +""" +Remove _customer_location_uc + +Revision ID: df3d7e2eb9a4 +Revises: 02f4f7811799 +Create Date: 2024-07-19 16:11:26.740368 +""" + +import logging + +from alembic import op +from migration_utils import create_unique_constraint, drop_unique_constraint + +# revision identifiers, used by Alembic. +revision = "df3d7e2eb9a4" +down_revision = "02f4f7811799" + +logger = logging.getLogger(__name__) + + +def upgrade(): + try: + drop_unique_constraint(op, "_customer_location_uc", "tables") + except Exception: # pylint: disable=broad-except + # Unfortunately the DB migration that creates this constraint has a + # try/except block, so that we can't know for sure if the constraint exists. + logger.warning( + "Error dropping constraint, This is expected for certain databases like " + "SQLite and MySQL" + ) + + +def downgrade(): + create_unique_constraint( + op, + "_customer_location_uc", + "tables", + ["database_id", "schema", "table_name"], + ) From 93d2e55cc3f78fe8a91797cd09bd29d7001b0920 Mon Sep 17 00:00:00 2001 From: Beto Dealmeida Date: Mon, 9 Dec 2024 14:27:56 -0500 Subject: [PATCH 2/2] Use `generic_find_uq_constraint_name` --- ...3d7e2eb9a4_remove__customer_location_uc.py | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/superset/migrations/versions/2024-07-19_16-11_df3d7e2eb9a4_remove__customer_location_uc.py b/superset/migrations/versions/2024-07-19_16-11_df3d7e2eb9a4_remove__customer_location_uc.py index 9ce45aeecd5e7..b9d5895d05f7e 100644 --- a/superset/migrations/versions/2024-07-19_16-11_df3d7e2eb9a4_remove__customer_location_uc.py +++ b/superset/migrations/versions/2024-07-19_16-11_df3d7e2eb9a4_remove__customer_location_uc.py @@ -18,7 +18,7 @@ Remove _customer_location_uc Revision ID: df3d7e2eb9a4 -Revises: 02f4f7811799 +Revises: 48cbb571fa3a Create Date: 2024-07-19 16:11:26.740368 """ @@ -27,23 +27,26 @@ from alembic import op from migration_utils import create_unique_constraint, drop_unique_constraint +from superset.utils.core import generic_find_uq_constraint_name + # revision identifiers, used by Alembic. revision = "df3d7e2eb9a4" -down_revision = "02f4f7811799" +down_revision = "48cbb571fa3a" logger = logging.getLogger(__name__) def upgrade(): - try: - drop_unique_constraint(op, "_customer_location_uc", "tables") - except Exception: # pylint: disable=broad-except - # Unfortunately the DB migration that creates this constraint has a - # try/except block, so that we can't know for sure if the constraint exists. - logger.warning( - "Error dropping constraint, This is expected for certain databases like " - "SQLite and MySQL" - ) + inspector = op.get_bind().inspector() + + # Unfortunately the DB migration that creates this constraint has a + # try/except block, so that we can't know for sure if the constraint exists. + if constraint_name := generic_find_uq_constraint_name( + "table", + ["database_id", "schema", "table_name"], + inspector, + ): + drop_unique_constraint(op, constraint_name, "tables") def downgrade():