revert changes to model/migrate/versions/

galaxyproject · Jul 12, 2015 · 1dab5f9 · 1dab5f9
1 parent 9805294
commit 1dab5f9
Show file tree

Hide file tree

Showing 7 changed files with 622 additions and 735 deletions.
diff --git a/lib/galaxy/model/migrate/versions/0001_initial_tables.py b/lib/galaxy/model/migrate/versions/0001_initial_tables.py
diff --git a/lib/galaxy/model/migrate/versions/0002_metadata_file_table.py b/lib/galaxy/model/migrate/versions/0002_metadata_file_table.py
@@ -1,18 +1,11 @@
-# from sqlalchemy import *
-# from migrate import *
+from sqlalchemy import *
+from migrate import *
 
 import datetime
 now = datetime.datetime.utcnow
 
 # Need our custom types, but don't import anything else from model
-from galaxy.model.custom_types import Boolean
-from galaxy.model.custom_types import Column
-from galaxy.model.custom_types import DateTime
-from galaxy.model.custom_types import ForeignKey
-from galaxy.model.custom_types import Integer
-from galaxy.model.custom_types import MetaData
-from galaxy.model.custom_types import Table
-from galaxy.model.custom_types import TEXT
+from galaxy.model.custom_types import *
 
 import logging
 log = logging.getLogger( __name__ )
@@ -21,21 +14,19 @@
 
 # New table in changeset 1568:0b022adfdc34
 MetadataFile_table = Table( "metadata_file", metadata,
-                            Column( "id", Integer, primary_key=True ),
-                            Column( "name", TEXT ),
-                            Column( "hda_id", Integer, ForeignKey( "history_dataset_association.id" ), index=True, nullable=True ),
-                            Column( "create_time", DateTime, default=now ),
-                            Column( "update_time", DateTime, index=True, default=now, onupdate=now ),
-                            Column( "deleted", Boolean, index=True, default=False ),
-                            Column( "purged", Boolean, index=True, default=False ) )
-
+    Column( "id", Integer, primary_key=True ),
+    Column( "name", TEXT ),
+    Column( "hda_id", Integer, ForeignKey( "history_dataset_association.id" ), index=True, nullable=True ),
+    Column( "create_time", DateTime, default=now ),
+    Column( "update_time", DateTime, index=True, default=now, onupdate=now ),
+    Column( "deleted", Boolean, index=True, default=False ),
+    Column( "purged", Boolean, index=True, default=False ) )
 
 def upgrade(migrate_engine):
     metadata.bind = migrate_engine
     metadata.reflect()
     MetadataFile_table.create()
 
-
 def downgrade(migrate_engine):
     metadata.bind = migrate_engine
     metadata.reflect()

diff --git a/lib/galaxy/model/migrate/versions/0003_security_and_libraries.py b/lib/galaxy/model/migrate/versions/0003_security_and_libraries.py
diff --git a/lib/galaxy/model/migrate/versions/0004_indexes_and_defaults.py b/lib/galaxy/model/migrate/versions/0004_indexes_and_defaults.py
@@ -1,14 +1,7 @@
-# from sqlalchemy import *
-# from sqlalchemy.orm import *
-# from migrate import *
-import sys
-import logging
-
-from galaxy.model.custom_types import Index
-from galaxy.model.custom_types import MetaData
-from galaxy.model.custom_types import scoped_session
-from galaxy.model.custom_types import sessionmaker
-from galaxy.model.custom_types import Table
+from sqlalchemy import *
+from sqlalchemy.orm import *
+from migrate import *
+import sys, logging
 
 log = logging.getLogger( __name__ )
 log.setLevel(logging.DEBUG)
@@ -20,20 +13,18 @@
 
 metadata = MetaData()
 
-
 def upgrade(migrate_engine):
     db_session = scoped_session( sessionmaker( bind=migrate_engine, autoflush=False, autocommit=True ) )
     metadata.bind = migrate_engine
     User_table = Table( "galaxy_user", metadata, autoload=True )
     HistoryDatasetAssociation_table = Table( "history_dataset_association", metadata, autoload=True )
-
     def boolean_false():
-        if migrate_engine.name == 'postgresql' or migrate_engine.name == 'mysql':
-            return False
-        elif migrate_engine.name == 'sqlite':
-            return 0
-        else:
-            raise Exception( 'Unable to convert data for unknown database type: %s' % migrate_engine.name)
+       if migrate_engine.name == 'postgresql' or migrate_engine.name == 'mysql':
+           return False
+       elif migrate_engine.name == 'sqlite':
+           return 0
+       else:
+           raise Exception( 'Unable to convert data for unknown database type: %s' % migrate_engine.name)
     # Load existing tables
     metadata.reflect()
     # Add 2 indexes to the galaxy_user table
@@ -66,8 +57,6 @@ def boolean_false():
         i.create()
     except Exception, e:
         log.debug( "Adding index 'ix_hda_copied_from_library_dataset_dataset_association_id' to history_dataset_association table failed: %s" % ( str( e ) ) )
-
-
 def downgrade(migrate_engine):
     metadata.bind = migrate_engine
     pass