From 953698842532526afdeadaf6697b35ade84d379c Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Fri, 30 Nov 2012 10:03:53 +0100 Subject: Move db.sql.migrations to db.migrations --- mediagoblin/db/migrations.py | 189 +++++++++++++++++++++++++++++++++++ mediagoblin/db/sql/migrations.py | 189 ----------------------------------- mediagoblin/gmg_commands/dbupdate.py | 2 +- 3 files changed, 190 insertions(+), 190 deletions(-) create mode 100644 mediagoblin/db/migrations.py delete mode 100644 mediagoblin/db/sql/migrations.py diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py new file mode 100644 index 00000000..99448bfa --- /dev/null +++ b/mediagoblin/db/migrations.py @@ -0,0 +1,189 @@ +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +import datetime + +from sqlalchemy import (MetaData, Table, Column, Boolean, SmallInteger, + Integer, Unicode, UnicodeText, DateTime, + ForeignKey) +from sqlalchemy.exc import ProgrammingError +from sqlalchemy.ext.declarative import declarative_base +from migrate.changeset.constraint import UniqueConstraint + +from mediagoblin.db.sql.util import RegisterMigration +from mediagoblin.db.sql.models import MediaEntry, Collection, User + +MIGRATIONS = {} + + +@RegisterMigration(1, MIGRATIONS) +def ogg_to_webm_audio(db_conn): + metadata = MetaData(bind=db_conn.bind) + + file_keynames = Table('core__file_keynames', metadata, autoload=True, + autoload_with=db_conn.bind) + + db_conn.execute( + file_keynames.update().where(file_keynames.c.name == 'ogg'). + values(name='webm_audio') + ) + db_conn.commit() + + +@RegisterMigration(2, MIGRATIONS) +def add_wants_notification_column(db_conn): + metadata = MetaData(bind=db_conn.bind) + + users = Table('core__users', metadata, autoload=True, + autoload_with=db_conn.bind) + + col = Column('wants_comment_notification', Boolean, + default=True, nullable=True) + col.create(users, populate_defaults=True) + db_conn.commit() + + +@RegisterMigration(3, MIGRATIONS) +def add_transcoding_progress(db_conn): + metadata = MetaData(bind=db_conn.bind) + + media_entry = Table('core__media_entries', metadata, autoload=True, + autoload_with=db_conn.bind) + + col = Column('transcoding_progress', SmallInteger) + col.create(media_entry) + db_conn.commit() + + +class Collection_v0(declarative_base()): + __tablename__ = "core__collections" + + id = Column(Integer, primary_key=True) + title = Column(Unicode, nullable=False) + slug = Column(Unicode) + created = Column(DateTime, nullable=False, default=datetime.datetime.now, + index=True) + description = Column(UnicodeText) + creator = Column(Integer, ForeignKey(User.id), nullable=False) + items = Column(Integer, default=0) + +class CollectionItem_v0(declarative_base()): + __tablename__ = "core__collection_items" + + id = Column(Integer, primary_key=True) + media_entry = Column( + Integer, ForeignKey(MediaEntry.id), nullable=False, index=True) + collection = Column(Integer, ForeignKey(Collection.id), nullable=False) + note = Column(UnicodeText, nullable=True) + added = Column(DateTime, nullable=False, default=datetime.datetime.now) + position = Column(Integer) + + ## This should be activated, normally. + ## But this would change the way the next migration used to work. + ## So it's commented for now. + __table_args__ = ( + UniqueConstraint('collection', 'media_entry'), + {}) + +collectionitem_unique_constraint_done = False + +@RegisterMigration(4, MIGRATIONS) +def add_collection_tables(db_conn): + Collection_v0.__table__.create(db_conn.bind) + CollectionItem_v0.__table__.create(db_conn.bind) + + global collectionitem_unique_constraint_done + collectionitem_unique_constraint_done = True + + db_conn.commit() + + +@RegisterMigration(5, MIGRATIONS) +def add_mediaentry_collected(db_conn): + metadata = MetaData(bind=db_conn.bind) + + media_entry = Table('core__media_entries', metadata, autoload=True, + autoload_with=db_conn.bind) + + col = Column('collected', Integer, default=0) + col.create(media_entry) + db_conn.commit() + + +class ProcessingMetaData_v0(declarative_base()): + __tablename__ = 'core__processing_metadata' + + id = Column(Integer, primary_key=True) + media_entry_id = Column(Integer, ForeignKey(MediaEntry.id), nullable=False, + index=True) + callback_url = Column(Unicode) + +@RegisterMigration(6, MIGRATIONS) +def create_processing_metadata_table(db): + ProcessingMetaData_v0.__table__.create(db.bind) + db.commit() + + +# Okay, problem being: +# Migration #4 forgot to add the uniqueconstraint for the +# new tables. While creating the tables from scratch had +# the constraint enabled. +# +# So we have four situations that should end up at the same +# db layout: +# +# 1. Fresh install. +# Well, easy. Just uses the tables in models.py +# 2. Fresh install using a git version just before this migration +# The tables are all there, the unique constraint is also there. +# This migration should do nothing. +# But as we can't detect the uniqueconstraint easily, +# this migration just adds the constraint again. +# And possibly fails very loud. But ignores the failure. +# 3. old install, not using git, just releases. +# This one will get the new tables in #4 (now with constraint!) +# And this migration is just skipped silently. +# 4. old install, always on latest git. +# This one has the tables, but lacks the constraint. +# So this migration adds the constraint. +@RegisterMigration(7, MIGRATIONS) +def fix_CollectionItem_v0_constraint(db_conn): + """Add the forgotten Constraint on CollectionItem""" + + global collectionitem_unique_constraint_done + if collectionitem_unique_constraint_done: + # Reset it. Maybe the whole thing gets run again + # For a different db? + collectionitem_unique_constraint_done = False + return + + metadata = MetaData(bind=db_conn.bind) + + CollectionItem_table = Table('core__collection_items', + metadata, autoload=True, autoload_with=db_conn.bind) + + constraint = UniqueConstraint('collection', 'media_entry', + name='core__collection_items_collection_media_entry_key', + table=CollectionItem_table) + + try: + constraint.create() + except ProgrammingError: + # User probably has an install that was run since the + # collection tables were added, so we don't need to run this migration. + pass + + db_conn.commit() diff --git a/mediagoblin/db/sql/migrations.py b/mediagoblin/db/sql/migrations.py deleted file mode 100644 index 99448bfa..00000000 --- a/mediagoblin/db/sql/migrations.py +++ /dev/null @@ -1,189 +0,0 @@ -# GNU MediaGoblin -- federated, autonomous media hosting -# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . - -import datetime - -from sqlalchemy import (MetaData, Table, Column, Boolean, SmallInteger, - Integer, Unicode, UnicodeText, DateTime, - ForeignKey) -from sqlalchemy.exc import ProgrammingError -from sqlalchemy.ext.declarative import declarative_base -from migrate.changeset.constraint import UniqueConstraint - -from mediagoblin.db.sql.util import RegisterMigration -from mediagoblin.db.sql.models import MediaEntry, Collection, User - -MIGRATIONS = {} - - -@RegisterMigration(1, MIGRATIONS) -def ogg_to_webm_audio(db_conn): - metadata = MetaData(bind=db_conn.bind) - - file_keynames = Table('core__file_keynames', metadata, autoload=True, - autoload_with=db_conn.bind) - - db_conn.execute( - file_keynames.update().where(file_keynames.c.name == 'ogg'). - values(name='webm_audio') - ) - db_conn.commit() - - -@RegisterMigration(2, MIGRATIONS) -def add_wants_notification_column(db_conn): - metadata = MetaData(bind=db_conn.bind) - - users = Table('core__users', metadata, autoload=True, - autoload_with=db_conn.bind) - - col = Column('wants_comment_notification', Boolean, - default=True, nullable=True) - col.create(users, populate_defaults=True) - db_conn.commit() - - -@RegisterMigration(3, MIGRATIONS) -def add_transcoding_progress(db_conn): - metadata = MetaData(bind=db_conn.bind) - - media_entry = Table('core__media_entries', metadata, autoload=True, - autoload_with=db_conn.bind) - - col = Column('transcoding_progress', SmallInteger) - col.create(media_entry) - db_conn.commit() - - -class Collection_v0(declarative_base()): - __tablename__ = "core__collections" - - id = Column(Integer, primary_key=True) - title = Column(Unicode, nullable=False) - slug = Column(Unicode) - created = Column(DateTime, nullable=False, default=datetime.datetime.now, - index=True) - description = Column(UnicodeText) - creator = Column(Integer, ForeignKey(User.id), nullable=False) - items = Column(Integer, default=0) - -class CollectionItem_v0(declarative_base()): - __tablename__ = "core__collection_items" - - id = Column(Integer, primary_key=True) - media_entry = Column( - Integer, ForeignKey(MediaEntry.id), nullable=False, index=True) - collection = Column(Integer, ForeignKey(Collection.id), nullable=False) - note = Column(UnicodeText, nullable=True) - added = Column(DateTime, nullable=False, default=datetime.datetime.now) - position = Column(Integer) - - ## This should be activated, normally. - ## But this would change the way the next migration used to work. - ## So it's commented for now. - __table_args__ = ( - UniqueConstraint('collection', 'media_entry'), - {}) - -collectionitem_unique_constraint_done = False - -@RegisterMigration(4, MIGRATIONS) -def add_collection_tables(db_conn): - Collection_v0.__table__.create(db_conn.bind) - CollectionItem_v0.__table__.create(db_conn.bind) - - global collectionitem_unique_constraint_done - collectionitem_unique_constraint_done = True - - db_conn.commit() - - -@RegisterMigration(5, MIGRATIONS) -def add_mediaentry_collected(db_conn): - metadata = MetaData(bind=db_conn.bind) - - media_entry = Table('core__media_entries', metadata, autoload=True, - autoload_with=db_conn.bind) - - col = Column('collected', Integer, default=0) - col.create(media_entry) - db_conn.commit() - - -class ProcessingMetaData_v0(declarative_base()): - __tablename__ = 'core__processing_metadata' - - id = Column(Integer, primary_key=True) - media_entry_id = Column(Integer, ForeignKey(MediaEntry.id), nullable=False, - index=True) - callback_url = Column(Unicode) - -@RegisterMigration(6, MIGRATIONS) -def create_processing_metadata_table(db): - ProcessingMetaData_v0.__table__.create(db.bind) - db.commit() - - -# Okay, problem being: -# Migration #4 forgot to add the uniqueconstraint for the -# new tables. While creating the tables from scratch had -# the constraint enabled. -# -# So we have four situations that should end up at the same -# db layout: -# -# 1. Fresh install. -# Well, easy. Just uses the tables in models.py -# 2. Fresh install using a git version just before this migration -# The tables are all there, the unique constraint is also there. -# This migration should do nothing. -# But as we can't detect the uniqueconstraint easily, -# this migration just adds the constraint again. -# And possibly fails very loud. But ignores the failure. -# 3. old install, not using git, just releases. -# This one will get the new tables in #4 (now with constraint!) -# And this migration is just skipped silently. -# 4. old install, always on latest git. -# This one has the tables, but lacks the constraint. -# So this migration adds the constraint. -@RegisterMigration(7, MIGRATIONS) -def fix_CollectionItem_v0_constraint(db_conn): - """Add the forgotten Constraint on CollectionItem""" - - global collectionitem_unique_constraint_done - if collectionitem_unique_constraint_done: - # Reset it. Maybe the whole thing gets run again - # For a different db? - collectionitem_unique_constraint_done = False - return - - metadata = MetaData(bind=db_conn.bind) - - CollectionItem_table = Table('core__collection_items', - metadata, autoload=True, autoload_with=db_conn.bind) - - constraint = UniqueConstraint('collection', 'media_entry', - name='core__collection_items_collection_media_entry_key', - table=CollectionItem_table) - - try: - constraint.create() - except ProgrammingError: - # User probably has an install that was run since the - # collection tables were added, so we don't need to run this migration. - pass - - db_conn.commit() diff --git a/mediagoblin/gmg_commands/dbupdate.py b/mediagoblin/gmg_commands/dbupdate.py index 203179fd..2c34bb51 100644 --- a/mediagoblin/gmg_commands/dbupdate.py +++ b/mediagoblin/gmg_commands/dbupdate.py @@ -53,7 +53,7 @@ def gather_database_data(media_types, plugins): # Add main first from mediagoblin.db.sql.models import MODELS as MAIN_MODELS - from mediagoblin.db.sql.migrations import MIGRATIONS as MAIN_MIGRATIONS + from mediagoblin.db.migrations import MIGRATIONS as MAIN_MIGRATIONS managed_dbdata.append( DatabaseData( -- cgit v1.2.3