heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Explicitly set the column names to "user" and "privilege"

Browse Source
This commit is contained in:
Christopher Allan Webber 2014-06-11 11:01:17 -05:00
parent c56a88b43e
commit 987a63514f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mediagoblin/db/migrations.py
View File

@ -741,10 +741,12 @@ def add_metadata_column(db):
class PrivilegeUserAssociation_R1(declarative_base()): class PrivilegeUserAssociation_R1(declarative_base()):
__tablename__ = 'rename__privileges_users' __tablename__ = 'rename__privileges_users'
user = Column( user = Column(
"user",
Integer, Integer,
ForeignKey(User.id), ForeignKey(User.id),
primary_key=True) primary_key=True)
privilege = Column( privilege = Column(
"privilege",
Integer, Integer,
ForeignKey(Privilege.id), ForeignKey(Privilege.id),
primary_key=True) primary_key=True)
@ -781,7 +783,7 @@ def fix_privilege_user_association_table(db):
new_privilege_user_assoc.rename('core__privileges_users') new_privilege_user_assoc.rename('core__privileges_users')
else: else:
privilege_user_assoc.c.user_id.alter(name="privilege") privilege_user_assoc.c.core__user_id.alter(name="privilege")
privilege_user_assoc.c.privilege_id.alter(name="user") privilege_user_assoc.c.core__privilege_id.alter(name="user")
db.commit() db.commit()

2
mediagoblin/db/models.py
View File

@ -878,10 +878,12 @@ class PrivilegeUserAssociation(Base):
__tablename__ = 'core__privileges_users' __tablename__ = 'core__privileges_users'
user = Column( user = Column(
"user",
Integer, Integer,
ForeignKey(User.id), ForeignKey(User.id),
primary_key=True) primary_key=True)
privilege = Column( privilege = Column(
"privilege",
Integer, Integer,
ForeignKey(Privilege.id), ForeignKey(Privilege.id),
primary_key=True) primary_key=True)