Commits

Mike Bayer committed 2de604e Merge

merge some 0.6 stuff...

  • Participants
  • Parent commits 05fed4d, 2e11ab8
  • Branches rel_0_6

Comments (0)

Files changed (2)

test/orm/test_composites.py

         )
 
         Table('values', metadata,
-            Column('id', Integer, primary_key=True),
+            Column('id', Integer, primary_key=True,
+                           test_needs_autoincrement=True),
             Column('description_id', Integer, ForeignKey('descriptions.id'),
                    nullable=False),
             Column('v1', String(20)),

test/orm/test_versioning.py

     @classmethod
     def define_tables(cls, metadata):
         Table('p', metadata,
-            Column('id', String(10), primary_key=True),
+            Column('id', String(10), primary_key=True, 
+                          test_needs_autoincrement=True),
             Column('version_id', Integer, default=1, nullable=False),
             Column('data', String(50))
         )
     @classmethod
     def define_tables(cls, metadata):
         Table('p', metadata,
-            Column('id', String(10), primary_key=True),
+            Column('id', String(10), primary_key=True, 
+                                test_needs_autoincrement=True),
             Column('version_id', String(32), nullable=False),
             Column('data', String(50))
         )
     @classmethod
     def define_tables(cls, metadata):
         Table('base', metadata,
-            Column('id', Integer, primary_key=True),
+            Column('id', Integer, primary_key=True,
+                                 test_needs_autoincrement=True),
             Column('version_id', Integer, nullable=True),
             Column('data', String(50))
         )