fix: Error when downgrading add_catalog_perm_to_tables migration (apa…

…che#29906)
preset-io · Aug 9, 2024 · fb7f508 · fb7f508
1 parent b323bf0
commit fb7f508
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git a/superset/migrations/versions/2024-04-11_15-41_5f57af97bc3f_add_catalog_column.py b/superset/migrations/versions/2024-04-11_15-41_5f57af97bc3f_add_catalog_column.py
@@ -29,27 +29,17 @@
 revision = "5f57af97bc3f"
 down_revision = "d60591c5515f"
 
+tables = ["tables", "query", "saved_query", "tab_state", "table_schema"]
+
 
 def upgrade():
-    op.add_column("tables", sa.Column("catalog", sa.String(length=256), nullable=True))
-    op.add_column("query", sa.Column("catalog", sa.String(length=256), nullable=True))
-    op.add_column(
-        "saved_query",
-        sa.Column("catalog", sa.String(length=256), nullable=True),
-    )
-    op.add_column(
-        "tab_state",
-        sa.Column("catalog", sa.String(length=256), nullable=True),
-    )
-    op.add_column(
-        "table_schema",
-        sa.Column("catalog", sa.String(length=256), nullable=True),
-    )
+    for table in tables:
+        op.add_column(
+            table,
+            sa.Column("catalog", sa.String(length=256), nullable=True),
+        )
 
 
 def downgrade():
-    op.drop_column("table_schema", "catalog")
-    op.drop_column("tab_state", "catalog")
-    op.drop_column("saved_query", "catalog")
-    op.drop_column("query", "catalog")
-    op.drop_column("tables", "catalog")
+    for table in reversed(tables):
+        op.drop_column(table, "catalog")
diff --git a/superset/migrations/versions/2024-05-01_10-52_58d051681a3b_add_catalog_perm_to_tables.py b/superset/migrations/versions/2024-05-01_10-52_58d051681a3b_add_catalog_perm_to_tables.py
@@ -48,6 +48,6 @@ def upgrade():
 
 
 def downgrade():
+    downgrade_catalog_perms(engines={"postgresql"})
     op.drop_column("slices", "catalog_perm")
     op.drop_column("tables", "catalog_perm")
-    downgrade_catalog_perms(engines={"postgresql"})