Fix migrations reusing column objects

Closes: #1080 Related to: sqlalchemy/sqlalchemy#5669
gnocchixyz · Nov 4, 2020 · 5eeb3f0 · 5eeb3f0
1 parent 64ff78f
commit 5eeb3f0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/gnocchi/indexer/alembic/versions/5c4f93e5bb4_mysql_float_to_timestamp.py b/gnocchi/indexer/alembic/versions/5c4f93e5bb4_mysql_float_to_timestamp.py
@@ -55,18 +55,18 @@ def upgrade():
 
             existing_type = sa.types.DECIMAL(
                 precision=20, scale=6, asdecimal=True)
-            existing_col = sa.Column(
+            existing_col = lambda: sa.Column(
                 column_name,
                 existing_type,
                 nullable=nullable)
-            temp_col = sa.Column(
+            temp_col = lambda: sa.Column(
                 column_name + "_ts",
                 sqlalchemy_types.TimestampUTC(),
                 nullable=True)
-            op.add_column(table_name, temp_col)
-            t = sa.sql.table(table_name, existing_col, temp_col)
+            op.add_column(table_name, temp_col())
+            t = sa.sql.table(table_name, existing_col(), temp_col())
             op.execute(t.update().values(
-                **{column_name + "_ts": func.from_unixtime(existing_col)}))
+                **{column_name + "_ts": func.from_unixtime(existing_col())}))
             op.drop_column(table_name, column_name)
             op.alter_column(table_name,
                             column_name + "_ts",

diff --git a/gnocchi/indexer/alembic/versions/aba5a217ca9b_merge_created_in_creator.py b/gnocchi/indexer/alembic/versions/aba5a217ca9b_merge_created_in_creator.py
@@ -34,20 +34,24 @@
 
 def upgrade():
     for table_name in ("resource", "resource_history", "metric"):
-        creator_col = sa.Column("creator", sa.String(255))
-        created_by_user_id_col = sa.Column("created_by_user_id",
-                                           sa.String(255))
-        created_by_project_id_col = sa.Column("created_by_project_id",
-                                              sa.String(255))
-        op.add_column(table_name, creator_col)
+        creator_col = lambda: sa.Column("creator", sa.String(255))
+        created_by_user_id_col = lambda: sa.Column(
+            "created_by_user_id", sa.String(255))
+        created_by_project_id_col = lambda: sa.Column(
+            "created_by_project_id", sa.String(255))
+        op.add_column(table_name, creator_col())
         t = sa.sql.table(
-            table_name, creator_col,
-            created_by_user_id_col, created_by_project_id_col)
+            table_name,
+            creator_col(),
+            created_by_user_id_col(),
+            created_by_project_id_col(),
+        )
         op.execute(
             t.update().values(
                 creator=(
-                    created_by_user_id_col + ":" + created_by_project_id_col
-                )).where((created_by_user_id_col is not None)
-                         | (created_by_project_id_col is not None)))
+                    created_by_user_id_col() + ":" +
+                    created_by_project_id_col()
+                )).where((created_by_user_id_col() is not None)
+                         | (created_by_project_id_col() is not None)))
         op.drop_column(table_name, "created_by_user_id")
         op.drop_column(table_name, "created_by_project_id")