details: http://www.bx.psu.edu/hg/galaxy/rev/c819c7c0c1a6 changeset: 2540:c819c7c0c1a6 user: rc date: Thu Aug 06 10:34:01 2009 -0400 description: Cleaned up unwanted code 2 file(s) affected in this change: lib/galaxy/model/mapping.py lib/galaxy/model/migrate/versions/0012_user_address.py diffs (72 lines): diff -r 24ccfa887fcd -r c819c7c0c1a6 lib/galaxy/model/mapping.py --- a/lib/galaxy/model/mapping.py Thu Aug 06 09:52:59 2009 -0400 +++ b/lib/galaxy/model/mapping.py Thu Aug 06 10:34:01 2009 -0400 @@ -598,13 +598,6 @@ Column( "state", TrimmedString( 255 ), index=True ), Column( "deleted", Boolean, index=True, default=False ) ) -RequestState_table = Table('request_state', metadata, - Column( "id", Integer, primary_key=True), - Column( "create_time", DateTime, default=now ), - Column( "update_time", DateTime, default=now, onupdate=now ), - Column( "name", TrimmedString( 255 ), nullable=False ), - Column( "desc", TEXT )) - Sample.table = Table('sample', metadata, Column( "id", Integer, primary_key=True), Column( "create_time", DateTime, default=now ), diff -r 24ccfa887fcd -r c819c7c0c1a6 lib/galaxy/model/migrate/versions/0012_user_address.py --- a/lib/galaxy/model/migrate/versions/0012_user_address.py Thu Aug 06 09:52:59 2009 -0400 +++ b/lib/galaxy/model/migrate/versions/0012_user_address.py Thu Aug 06 10:34:01 2009 -0400 @@ -40,13 +40,6 @@ Column( "deleted", Boolean, index=True, default=False ), Column( "purged", Boolean, index=True, default=False ) ) -#RequestState_table = Table('request_state', metadata, -# Column( "id", Integer, primary_key=True), -# Column( "create_time", DateTime, default=now ), -# Column( "update_time", DateTime, default=now, onupdate=now ), -# Column( "name", TrimmedString( 255 ), nullable=False ), -# Column( "desc", TEXT )) - def upgrade(): # Load existing tables metadata.reflect() @@ -56,10 +49,6 @@ UserAddress_table.create() except Exception, e: log.debug( "Creating user_address table failed: %s" % str( e ) ) -# try: -# RequestState_table.create() -# except Exception, e: -# log.debug( "Creating request_state table failed: %s" % str( e ) ) # Add 1 column to the request_type table try: @@ -92,25 +81,7 @@ assert col is Request_table.c.state except Exception, e: log.debug( "Adding column 'state' to request table failed: %s" % ( str( e ) ) ) -# -# # new column which points to the current state in the request_state table -# try: -# col = Column( "request_state_id", Integer, index=True ) -# col.create( Request_table ) -# assert col is Request_table.c.request_state_id -# except Exception, e: -# log.debug( "Adding column 'request_state_id' to request table failed: %s" % ( str( e ) ) ) -# # Add 1 foreign key constraint to the form_definition_current table -# if RequestState_table and Request_table: -# try: -# cons = ForeignKeyConstraint( [Request_table.c.request_state_id], -# [RequestState_table.c.id], -# name='request_request_state_id_fk' ) -# # Create the constraint -# cons.create() -# except Exception, e: -# log.debug( "Adding foreign key constraint 'request_request_state_id_fk' to table 'request' failed: %s" % ( str( e ) ) ) - + def downgrade(): pass