1 files changed, 21 insertions, 16 deletions
diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index 110a48d4..5e9a71d4 100644
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -314,16 +314,13 @@ class MediaReport_v0(ReportBase_v0):
     __tablename__ = 'core__reports_on_media'
     __mapper_args__ = {'polymorphic_identity': 'media_report'}
 
-    id = Column('id',Integer, ForeignKey('core__reports.id'),
-                                                primary_key=True)
+    id = Column(
+        'id',
+        Integer, 
+        ForeignKey('core__reports.id'),
+        primary_key=True)
     media_entry_id = Column(Integer, ForeignKey(MediaEntry.id), nullable=False)
 
-@RegisterMigration(11, MIGRATIONS)
-def create_report_tables(db):
-    ReportBase_v0.__table__.create(db.bind)
-    CommentReport_v0.__table__.create(db.bind)
-    MediaReport_v0.__table__.create(db.bind)
-    db.commit()
 
 class UserBan_v0(declarative_base()):
     __tablename__ = 'core__user_bans'
@@ -334,23 +331,31 @@ class UserBan_v0(declarative_base()):
 
 class Group_v0(declarative_base()):
     __tablename__ = 'core__groups'
-    id = Column(Integer, nullable=False, primary_key=True)
+    id = Column(Integer, nullable=False, primary_key=True, unique=True)
     group_name = Column(Unicode, nullable=False)
 
 class GroupUserAssociation_v0(declarative_base()):
     __tablename__ = 'core__group_user_associations'
 
-    group_id = Column('core__group_id', Integer, ForeignKey(User.id), primary_key=True)
-    user_id = Column('core__user_id', Integer, ForeignKey(Group.id), primary_key=True)
+    group_id = Column(
+        'core__group_id', 
+        Integer, 
+        ForeignKey(User.id), 
+        primary_key=True)
+    user_id = Column(
+        'core__user_id', 
+        Integer, 
+        ForeignKey(Group.id), 
+        primary_key=True)
 
-
-
-@RegisterMigration(12, MIGRATIONS)
-def create_banned_and_group_tables(db):
+@RegisterMigration(11, MIGRATIONS)
+def create_moderation_tables(db):
+    ReportBase_v0.__table__.create(db.bind)
+    CommentReport_v0.__table__.create(db.bind)
+    MediaReport_v0.__table__.create(db.bind)
     UserBan_v0.__table__.create(db.bind)
     Group_v0.__table__.create(db.bind)
     GroupUserAssociation_v0.__table__.create(db.bind)
     db.commit()
 
 
-