2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/d8d4683308d9/ Changeset: d8d4683308d9 User: dannon Date: 2013-06-13 21:29:57 Summary: Refactor logic in migration 0032, fix sqlite duplicate index. Affected #: 1 file diff -r b509d742abb83380ed03e9c01780ab9a8ed184bc -r d8d4683308d9c7e391982787fdee07bebe07e892 lib/galaxy/model/migrate/versions/0032_stored_workflow_slug_column.py --- a/lib/galaxy/model/migrate/versions/0032_stored_workflow_slug_column.py +++ b/lib/galaxy/model/migrate/versions/0032_stored_workflow_slug_column.py @@ -19,22 +19,16 @@ StoredWorkflow_table = Table( "stored_workflow", metadata, autoload=True ) - if migrate_engine.name not in ['mysql', 'sqlite']: - # Create slug column. - c = Column( "slug", TEXT, index=True ) - c.create( StoredWorkflow_table, index_name='ix_stored_workflow_slug' ) - else: - # Create slug column. - c = Column( "slug", TEXT ) - c.create( StoredWorkflow_table ) - i = Index( "ix_page_slug", StoredWorkflow_table.c.slug, mysql_length = 200) - i.create() + # Create slug column. + c = Column( "slug", TEXT ) + c.create( StoredWorkflow_table ) + assert c is StoredWorkflow_table.c.slug # Create slug index. if migrate_engine.name != 'sqlite': try: - i = Index( "ix_stored_workflow_slug", StoredWorkflow_table.c.slug ) + i = Index( "ix_stored_workflow_slug", StoredWorkflow_table.c.slug, mysql_length = 200 ) i.create() except: # Mysql doesn't have a named index, but alter should work https://bitbucket.org/galaxy/galaxy-central/commits/aea50b1c8d91/ Changeset: aea50b1c8d91 Branch: stable User: dannon Date: 2013-06-13 21:29:57 Summary: Refactor logic in migration 0032, fix sqlite duplicate index. Affected #: 1 file diff -r f7671ce77430d38e74015f05dfe6ca79e422efe8 -r aea50b1c8d9178de429e58805ca6c12e7f0465ee lib/galaxy/model/migrate/versions/0032_stored_workflow_slug_column.py --- a/lib/galaxy/model/migrate/versions/0032_stored_workflow_slug_column.py +++ b/lib/galaxy/model/migrate/versions/0032_stored_workflow_slug_column.py @@ -19,22 +19,16 @@ StoredWorkflow_table = Table( "stored_workflow", metadata, autoload=True ) - if migrate_engine.name not in ['mysql', 'sqlite']: - # Create slug column. - c = Column( "slug", TEXT, index=True ) - c.create( StoredWorkflow_table, index_name='ix_stored_workflow_slug' ) - else: - # Create slug column. - c = Column( "slug", TEXT ) - c.create( StoredWorkflow_table ) - i = Index( "ix_page_slug", StoredWorkflow_table.c.slug, mysql_length = 200) - i.create() + # Create slug column. + c = Column( "slug", TEXT ) + c.create( StoredWorkflow_table ) + assert c is StoredWorkflow_table.c.slug # Create slug index. if migrate_engine.name != 'sqlite': try: - i = Index( "ix_stored_workflow_slug", StoredWorkflow_table.c.slug ) + i = Index( "ix_stored_workflow_slug", StoredWorkflow_table.c.slug, mysql_length = 200 ) i.create() except: # Mysql doesn't have a named index, but alter should work Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.