PG didnt like 'user' for a table name

diff --git a/CHANGES b/CHANGES
index 3a6ee1abad04fa5b41694606e7c7c6fa5a8524bf..62b8a0dedc1279abafacd989714bb4b0fff72385 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -26,6 +26,8 @@ for a mutex.  this is to fix a reported case where a ConnectionFairy's
 __del__() method got called within the Queue's get() method, which 
 then returns its connection to the Queue via the the put() method, 
 causing a reentrant hang unless threading.RLock is used.
+- postgres will not place SERIAL keyword on a primary key column
+if it has a foreign key constraint
 
 0.2.3
 - overhaul to mapper compilation to be deferred.  this allows mappers

diff --git a/test/orm/inheritance.py b/test/orm/inheritance.py
index bca0ffde320affbe36c96e98680eff362651a6d7..ce9a35479ca9d6297d9ec92d52e324939382bede 100644 (file)
--- a/test/orm/inheritance.py
+++ b/test/orm/inheritance.py
@@ -419,7 +419,7 @@ class InheritTest7(testbase.AssertMixin):
     def setUpAll(self):
         global users, roles, user_roles, admins, metadata
         metadata=BoundMetaData(testbase.db)
-        users = Table('user', metadata,
+        users = Table('users', metadata,
             Column('id', Integer, primary_key=True),
             Column('email', String(128)),
             Column('password', String(16)),
@@ -431,13 +431,13 @@ class InheritTest7(testbase.AssertMixin):
         )
 
         user_roles = Table('user_role', metadata,
-            Column('user_id', Integer, ForeignKey('user.id'), primary_key=True),
+            Column('user_id', Integer, ForeignKey('users.id'), primary_key=True),
             Column('role_id', Integer, ForeignKey('role.id'), primary_key=True)
         )
 
         admins = Table('admin', metadata,
             Column('id', Integer, primary_key=True),
-            Column('user_id', Integer, ForeignKey('user.id'))
+            Column('user_id', Integer, ForeignKey('users.id'))
         )
         metadata.create_all()
     def tearDownAll(self):