renamed table group --> groups. there was a conflict in sql affecting…

… queries
andpol · Jan 25, 2011 · 267f140 · 267f140
1 parent fcf5837
commit 267f140
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/server/repoman/repoman/model/associations.py b/server/repoman/repoman/model/associations.py
@@ -8,13 +8,13 @@
 # many-to-many relationship
 user_group_association = Table('user_group_association', Base.metadata,
     Column('user_id', Integer, ForeignKey('user.id')),
-    Column('group_id', Integer, ForeignKey('group.id')),
+    Column('group_id', Integer, ForeignKey('groups.id')),
 )
 
 # Group permissions
 # Many-to-many relationship
 group_permission_association = Table('group_permission_association', Base.metadata,
-    Column('group_id', Integer, ForeignKey('group.id')),
+    Column('group_id', Integer, ForeignKey('groups.id')),
     Column('permission_id', Integer, ForeignKey('permission.id')),
 )
 
@@ -29,6 +29,6 @@
 # many-to-many relationship
 imageshare_group_association = Table('imageshare_group_association', Base.metadata,
     Column('imageshare_id', Integer, ForeignKey('image_share.id')),
-    Column('group_id', Integer, ForeignKey('group.id')),
+    Column('group_id', Integer, ForeignKey('groups.id')),
 )
 
diff --git a/server/repoman/repoman/model/group.py b/server/repoman/repoman/model/group.py
@@ -5,7 +5,7 @@
 from repoman.model.meta import Base
 
 class Group(Base):
-    __tablename__ = "group"
+    __tablename__ = "groups"
 
     id = Column(Integer, primary_key=True)
     created = Column(DateTime())