Merge pull request #7103 from dannon/migration_fixes

Fix migration 0146 column selection on downgrade

lib/galaxy/model/migrate/versions/0145_add_workflow_step_input.py

@@ -104,7 +104,7 @@ def downgrade(migrate_engine):
         "FROM workflow_step_connection_predowngrade145 AS wsc JOIN workflow_step_input AS wsi ON wsc.input_step_input_id = wsi.id ORDER BY wsc.id"
     migrate_engine.execute(insert_step_connections_cmd)
 
-    for table in (WorkflowStepInput_table, NewWorkflowStepConnection_table):
+    for table in (NewWorkflowStepConnection_table, WorkflowStepInput_table):
         _drop(table)
 
 

lib/galaxy/model/migrate/versions/0146_workflow_paths.py

@@ -23,40 +23,26 @@ def upgrade(migrate_engine):
     print(__doc__)
     metadata.reflect()
 
-    __add_column(from_path_column, "stored_workflow", metadata)
+    _add_column(from_path_column, "stored_workflow", metadata)
 
 
 def downgrade(migrate_engine):
     metadata.bind = migrate_engine
 
-    __drop_column(from_path_column, "stored_workflow", metadata)
+    _drop_column("from_path", "stored_workflow", metadata)
 
 
-def __add_column(column, table_name, metadata, **kwds):
+def _add_column(column, table_name, metadata, **kwds):
     try:
         table = Table(table_name, metadata, autoload=True)
         column.create(table, **kwds)
     except Exception:
         log.exception("Adding column %s failed.", column)
 
 
-def __drop_column(column_name, table_name, metadata):
+def _drop_column(column_name, table_name, metadata):
     try:
         table = Table(table_name, metadata, autoload=True)
         getattr(table.c, column_name).drop()
     except Exception:
         log.exception("Dropping column %s failed.", column_name)
-
-
-def _create(table):
-    try:
-        table.create()
-    except Exception:
-        log.exception("Creating %s table failed.", table.name)
-
-
-def _drop(table):
-    try:
-        table.drop()
-    except Exception:
-        log.exception("Dropping %s table failed.", table.name)