From 987a63514ff3c9c436084eaca8524dc577ae1a6e Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Wed, 11 Jun 2014 11:01:17 -0500
Subject: [PATCH] Explicitly set the column names to "user" and "privilege"

---
 mediagoblin/db/migrations.py | 6 ++++--
 mediagoblin/db/models.py     | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mediagoblin/db/migrations.py b/mediagoblin/db/migrations.py
index 4660ba94..94282f6d 100644
--- a/mediagoblin/db/migrations.py
+++ b/mediagoblin/db/migrations.py
@@ -741,10 +741,12 @@ def add_metadata_column(db):
 class PrivilegeUserAssociation_R1(declarative_base()):
     __tablename__ = 'rename__privileges_users'
     user = Column(
+        "user",
         Integer,
         ForeignKey(User.id),
         primary_key=True)
     privilege = Column(
+        "privilege",
         Integer,
         ForeignKey(Privilege.id),
         primary_key=True)
@@ -781,7 +783,7 @@ def fix_privilege_user_association_table(db):
         new_privilege_user_assoc.rename('core__privileges_users')
 
     else:
-        privilege_user_assoc.c.user_id.alter(name="privilege")
-        privilege_user_assoc.c.privilege_id.alter(name="user")
+        privilege_user_assoc.c.core__user_id.alter(name="privilege")
+        privilege_user_assoc.c.core__privilege_id.alter(name="user")
 
     db.commit()
diff --git a/mediagoblin/db/models.py b/mediagoblin/db/models.py
index efc98b3b..e388bd5b 100644
--- a/mediagoblin/db/models.py
+++ b/mediagoblin/db/models.py
@@ -878,10 +878,12 @@ class PrivilegeUserAssociation(Base):
     __tablename__ = 'core__privileges_users'
 
     user = Column(
+        "user",
         Integer,
         ForeignKey(User.id),
         primary_key=True)
     privilege = Column(
+        "privilege",
         Integer,
         ForeignKey(Privilege.id),
         primary_key=True)