more test fixes

diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py
index aacfab9b423e7ae6a572e943f968c105b498aabd..c8f33531291058cce6f1f0ad506bd692817476dc 100644 (file)
--- a/lib/sqlalchemy/dialects/oracle/base.py
+++ b/lib/sqlalchemy/dialects/oracle/base.py
@@ -107,7 +107,7 @@ from sqlalchemy.sql import compiler, visitors, expression
 from sqlalchemy.sql import operators as sql_operators, functions as sql_functions
 from sqlalchemy import types as sqltypes
 
-RESERVED_WORDS = set('''SHARE RAW DROP BETWEEN FROM DESC OPTION PRIOR LONG THEN DEFAULT ALTER IS INTO MINUS INTEGER NUMBER GRANT IDENTIFIED ALL TO ORDER ON FLOAT DATE HAVING CLUSTER NOWAIT RESOURCE ANY TABLE INDEX FOR UPDATE WHERE CHECK SMALLINT WITH DELETE BY ASC REVOKE LIKE SIZE RENAME NOCOMPRESS NULL GROUP VALUES AS IN VIEW EXCLUSIVE COMPRESS SYNONYM SELECT INSERT EXISTS NOT TRIGGER ELSE CREATE INTERSECT PCTFREE DISTINCT CONNECT SET MODE OF UNIQUE VARCHAR2 VARCHAR LOCK OR CHAR DECIMAL UNION PUBLIC AND START'''.split()) 
+RESERVED_WORDS = set('''SHARE RAW DROP BETWEEN FROM DESC OPTION PRIOR LONG THEN DEFAULT ALTER IS INTO MINUS INTEGER NUMBER GRANT IDENTIFIED ALL TO ORDER ON FLOAT DATE HAVING CLUSTER NOWAIT RESOURCE ANY TABLE INDEX FOR UPDATE WHERE CHECK SMALLINT WITH DELETE BY ASC REVOKE LIKE SIZE RENAME NOCOMPRESS NULL GROUP VALUES AS IN VIEW EXCLUSIVE COMPRESS SYNONYM SELECT INSERT EXISTS NOT TRIGGER ELSE CREATE INTERSECT PCTFREE DISTINCT CONNECT SET MODE OF UNIQUE VARCHAR2 VARCHAR LOCK OR CHAR DECIMAL UNION PUBLIC AND START UID COMMENT'''.split()) 
 
 class OracleRaw(sqltypes.Binary):
     pass
@@ -164,8 +164,9 @@ class OracleTypeCompiler(compiler.GenericTypeCompiler):
         return self.visit_DATE(type_)
     
     def visit_float(self, type_):
-        return "NUMERIC(%(precision)s, %(scale)s)" % {'precision': type_.precision, 'scale' : 2}
-    
+        #return "NUMERIC(%(precision)s, %(scale)s)" % {'precision': type_.precision, 'scale' : 2}
+        return self.visit_NUMERIC(type_)
+        
     def visit_unicode(self, type_):
         return self.visit_NVARCHAR(type_)
         

diff --git a/lib/sqlalchemy/test/schema.py b/lib/sqlalchemy/test/schema.py
index 282c5a4f92a67f683b37e482eef64139038b2e48..555ffffe0627f96eb4c9ed0ef2b8fd9f2796b8cc 100644 (file)
--- a/lib/sqlalchemy/test/schema.py
+++ b/lib/sqlalchemy/test/schema.py
@@ -65,6 +65,15 @@ def Column(*args, **kw):
         kw.get('primary_key', False) and \
         testing.against('firebird', 'oracle'):
         def add_seq(tbl):
-            col._init_items(schema.Sequence(tbl.name + '_' + col.name + '_seq', optional=True))
+            col._init_items(
+                schema.Sequence(_truncate_name(testing.db.dialect, tbl.name + '_' + col.name + '_seq'), optional=True)
+            )
         col._on_table_attach(add_seq)
     return col
+
+def _truncate_name(dialect, name):
+    if len(name) > dialect.max_identifier_length:
+        return name[0:max(dialect.max_identifier_length - 6, 0)] + "_" + hex(hash(name) % 64)[2:]
+    else:
+        return name
+    
\ No newline at end of file

diff --git a/test/orm/inheritance/test_productspec.py b/test/orm/inheritance/test_productspec.py
index b2bcb85d54b570b465729508dc492a635fb29b09..4c593e2a38f69e51bce3bbbbbe1a256a847233df 100644 (file)
--- a/test/orm/inheritance/test_productspec.py
+++ b/test/orm/inheritance/test_productspec.py
@@ -2,10 +2,9 @@ from datetime import datetime
 from sqlalchemy import *
 from sqlalchemy.orm import *
 
-
 from sqlalchemy.test import testing
 from test.orm import _base
-
+from sqlalchemy.test.schema import Table, Column
 
 class InheritTest(_base.MappedTest):
     """tests some various inheritance round trips involving a particular set of polymorphic inheritance relationships"""
@@ -15,14 +14,14 @@ class InheritTest(_base.MappedTest):
         global Product, Detail, Assembly, SpecLine, Document, RasterDocument
 
         products_table = Table('products', metadata,
-           Column('product_id', Integer, primary_key=True),
+           Column('product_id', Integer, primary_key=True, test_needs_autoincrement=True),
            Column('product_type', String(128)),
            Column('name', String(128)),
            Column('mark', String(128)),
            )
 
         specification_table = Table('specification', metadata,
-            Column('spec_line_id', Integer, primary_key=True),
+            Column('spec_line_id', Integer, primary_key=True, test_needs_autoincrement=True),
             Column('master_id', Integer, ForeignKey("products.product_id"),
                 nullable=True),
             Column('slave_id', Integer, ForeignKey("products.product_id"),
@@ -31,7 +30,7 @@ class InheritTest(_base.MappedTest):
             )
 
         documents_table = Table('documents', metadata,
-            Column('document_id', Integer, primary_key=True),
+            Column('document_id', Integer, primary_key=True, test_needs_autoincrement=True),
             Column('document_type', String(128)),
             Column('product_id', Integer, ForeignKey('products.product_id')),
             Column('create_date', DateTime, default=lambda:datetime.now()),

diff --git a/test/orm/test_association.py b/test/orm/test_association.py
index ee7fb7af94ac29744abadc92298fd24693b40ecb..d537430cc6e53e64e17b835ea59b4b8a6a546841 100644 (file)
--- a/test/orm/test_association.py
+++ b/test/orm/test_association.py
@@ -1,8 +1,7 @@
 
 from sqlalchemy.test import testing
 from sqlalchemy import Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from sqlalchemy.test.schema import Table, Column
 from sqlalchemy.orm import mapper, relation, create_session
 from test.orm import _base
 from sqlalchemy.test.testing import eq_
@@ -15,14 +14,14 @@ class AssociationTest(_base.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         Table('items', metadata,
-            Column('item_id', Integer, primary_key=True),
+            Column('item_id', Integer, primary_key=True, test_needs_autoincrement=True),
             Column('name', String(40)))
         Table('item_keywords', metadata,
             Column('item_id', Integer, ForeignKey('items.item_id')),
             Column('keyword_id', Integer, ForeignKey('keywords.keyword_id')),
             Column('data', String(40)))
         Table('keywords', metadata,
-            Column('keyword_id', Integer, primary_key=True),
+            Column('keyword_id', Integer, primary_key=True, test_needs_autoincrement=True),
             Column('name', String(40)))
 
     @classmethod

diff --git a/test/orm/test_assorted_eager.py b/test/orm/test_assorted_eager.py
index 09f0075479aaca48c28207714ecf4bce408bbeab..94a98d9aead5fdac22346245b694d139b818e439 100644 (file)
--- a/test/orm/test_assorted_eager.py
+++ b/test/orm/test_assorted_eager.py
@@ -8,8 +8,7 @@ import datetime
 import sqlalchemy as sa
 from sqlalchemy.test import testing
 from sqlalchemy import Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from sqlalchemy.test.schema import Table, Column
 from sqlalchemy.orm import mapper, relation, backref, create_session
 from sqlalchemy.test.testing import eq_
 from test.orm import _base
@@ -37,27 +36,24 @@ class EagerTest(_base.MappedTest):
         cls.other_artifacts['false'] = false
 
         Table('owners', metadata ,
-              Column('id', Integer, primary_key=True, nullable=False),
+              Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('data', String(30)))
 
         Table('categories', metadata,
-              Column('id', Integer, primary_key=True, nullable=False),
+              Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('name', String(20)))
 
         Table('tests', metadata ,
-              Column('id', Integer, primary_key=True, nullable=False ),
+              Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('owner_id', Integer, ForeignKey('owners.id'),
                      nullable=False),
               Column('category_id', Integer, ForeignKey('categories.id'),
                      nullable=False))
 
         Table('options', metadata ,
-              Column('test_id', Integer, ForeignKey('tests.id'),
-                     primary_key=True, nullable=False),
-              Column('owner_id', Integer, ForeignKey('owners.id'),
-                     primary_key=True, nullable=False),
-              Column('someoption', sa.Boolean, server_default=false,
-                     nullable=False))
+              Column('test_id', Integer, ForeignKey('tests.id'), primary_key=True),
+              Column('owner_id', Integer, ForeignKey('owners.id'), primary_key=True),
+              Column('someoption', sa.Boolean, server_default=false, nullable=False))
 
     @classmethod
     def setup_classes(cls):
@@ -219,7 +215,7 @@ class EagerTest2(_base.MappedTest):
             Column('data', String(50), primary_key=True))
 
         Table('middle', metadata,
-            Column('id', Integer, primary_key = True),
+            Column('id', Integer, primary_key = True, test_needs_autoincrement=True),
             Column('data', String(50)))
 
         Table('right', metadata,
@@ -280,17 +276,15 @@ class EagerTest3(_base.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         Table('datas', metadata,
-              Column('id', Integer, primary_key=True, nullable=False),
+              Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('a', Integer, nullable=False))
 
         Table('foo', metadata,
-              Column('data_id', Integer,
-                     ForeignKey('datas.id'),
-                     nullable=False, primary_key=True),
+              Column('data_id', Integer, ForeignKey('datas.id'),primary_key=True),
               Column('bar', Integer))
 
         Table('stats', metadata,
-              Column('id', Integer, primary_key=True, nullable=False ),
+              Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('data_id', Integer, ForeignKey('datas.id')),
               Column('somedata', Integer, nullable=False ))
 
@@ -364,11 +358,11 @@ class EagerTest4(_base.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         Table('departments', metadata,
-              Column('department_id', Integer, primary_key=True),
+              Column('department_id', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('name', String(50)))
 
         Table('employees', metadata,
-              Column('person_id', Integer, primary_key=True),
+              Column('person_id', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('name', String(50)),
               Column('department_id', Integer,
                      ForeignKey('departments.department_id')))
@@ -422,17 +416,15 @@ class EagerTest5(_base.MappedTest):
               Column('x', String(30)))
 
         Table('derived', metadata,
-              Column('uid', String(30), ForeignKey('base.uid'),
-                     primary_key=True),
+              Column('uid', String(30), ForeignKey('base.uid'), primary_key=True),
               Column('y', String(30)))
 
         Table('derivedII', metadata,
-              Column('uid', String(30), ForeignKey('base.uid'),
-                     primary_key=True),
+              Column('uid', String(30), ForeignKey('base.uid'), primary_key=True),
               Column('z', String(30)))
 
         Table('comments', metadata,
-              Column('id', Integer, primary_key=True),
+              Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('uid', String(30), ForeignKey('base.uid')),
               Column('comment', String(30)))
 
@@ -505,21 +497,21 @@ class EagerTest6(_base.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         Table('design_types', metadata,
-            Column('design_type_id', Integer, primary_key=True))
+            Column('design_type_id', Integer, primary_key=True, test_needs_autoincrement=True))
 
         Table('design', metadata,
-              Column('design_id', Integer, primary_key=True),
+              Column('design_id', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('design_type_id', Integer,
                      ForeignKey('design_types.design_type_id')))
 
         Table('parts', metadata,
-              Column('part_id', Integer, primary_key=True),
+              Column('part_id', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('design_id', Integer, ForeignKey('design.design_id')),
               Column('design_type_id', Integer,
                      ForeignKey('design_types.design_type_id')))
 
         Table('inherited_part', metadata,
-              Column('ip_id', Integer, primary_key=True),
+              Column('ip_id', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('part_id', Integer, ForeignKey('parts.part_id')),
               Column('design_id', Integer, ForeignKey('design.design_id')))
 
@@ -573,32 +565,27 @@ class EagerTest7(_base.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         Table('companies', metadata,
-              Column('company_id', Integer, primary_key=True,
-                     test_needs_autoincrement=True),
+              Column('company_id', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('company_name', String(40)))
 
         Table('addresses', metadata,
-              Column('address_id', Integer, primary_key=True,
-                     test_needs_autoincrement=True),
+              Column('address_id', Integer, primary_key=True,test_needs_autoincrement=True),
               Column('company_id', Integer, ForeignKey("companies.company_id")),
               Column('address', String(40)))
 
         Table('phone_numbers', metadata,
-              Column('phone_id', Integer, primary_key=True,
-                     test_needs_autoincrement=True),
+              Column('phone_id', Integer, primary_key=True,test_needs_autoincrement=True),
               Column('address_id', Integer, ForeignKey('addresses.address_id')),
               Column('type', String(20)),
               Column('number', String(10)))
 
         Table('invoices', metadata,
-              Column('invoice_id', Integer, primary_key=True,
-                     test_needs_autoincrement=True),
+              Column('invoice_id', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('company_id', Integer, ForeignKey("companies.company_id")),
               Column('date', sa.DateTime))
 
         Table('items', metadata,
-              Column('item_id', Integer, primary_key=True,
-                     test_needs_autoincrement=True),
+              Column('item_id', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('invoice_id', Integer, ForeignKey('invoices.invoice_id')),
               Column('code', String(20)),
               Column('qty', Integer))
@@ -722,12 +709,12 @@ class EagerTest8(_base.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         Table('prj', metadata,
-              Column('id', Integer, primary_key=True),
+              Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('created', sa.DateTime ),
               Column('title', sa.Unicode(100)))
 
         Table('task', metadata,
-              Column('id', Integer, primary_key=True),
+              Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('status_id', Integer,
                      ForeignKey('task_status.id'), nullable=False),
               Column('title', sa.Unicode(100)),
@@ -736,19 +723,19 @@ class EagerTest8(_base.MappedTest):
               Column('prj_id', Integer , ForeignKey('prj.id'), nullable=False))
 
         Table('task_status', metadata,
-              Column('id', Integer, primary_key=True))
+              Column('id', Integer, primary_key=True, test_needs_autoincrement=True))
 
         Table('task_type', metadata,
-              Column('id', Integer, primary_key=True))
+              Column('id', Integer, primary_key=True, test_needs_autoincrement=True))
 
         Table('msg', metadata,
-              Column('id', Integer, primary_key=True),
+              Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('posted', sa.DateTime, index=True,),
               Column('type_id', Integer, ForeignKey('msg_type.id')),
               Column('task_id', Integer, ForeignKey('task.id')))
 
         Table('msg_type', metadata,
-              Column('id', Integer, primary_key=True),
+              Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('name', sa.Unicode(20)),
               Column('display_name', sa.Unicode(20)))
 
@@ -814,15 +801,15 @@ class EagerTest9(_base.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         Table('accounts', metadata,
-            Column('account_id', Integer, primary_key=True),
+            Column('account_id', Integer, primary_key=True, test_needs_autoincrement=True),
             Column('name', String(40)))
 
         Table('transactions', metadata,
-            Column('transaction_id', Integer, primary_key=True),
+            Column('transaction_id', Integer, primary_key=True, test_needs_autoincrement=True),
             Column('name', String(40)))
 
         Table('entries', metadata,
-            Column('entry_id', Integer, primary_key=True),
+            Column('entry_id', Integer, primary_key=True, test_needs_autoincrement=True),
             Column('name', String(40)),
             Column('account_id', Integer,
                    ForeignKey('accounts.account_id')),

diff --git a/test/orm/test_collection.py b/test/orm/test_collection.py
index dee0e2f0f121c69fa63ff265b48d0243205812e6..3d1b30bc9cb55578afbf09ba61d55ed0eba81b0c 100644 (file)
--- a/test/orm/test_collection.py
+++ b/test/orm/test_collection.py
@@ -8,8 +8,7 @@ from sqlalchemy.orm.collections import collection
 import sqlalchemy as sa
 from sqlalchemy.test import testing
 from sqlalchemy import Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from sqlalchemy.test.schema import Table, Column
 from sqlalchemy import util, exc as sa_exc
 from sqlalchemy.orm import create_session, mapper, relation, attributes
 from test.orm import _base
@@ -1413,10 +1412,10 @@ class DictHelpersTest(_base.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         Table('parents', metadata,
-              Column('id', Integer, primary_key=True),
+              Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('label', String(128)))
         Table('children', metadata,
-              Column('id', Integer, primary_key=True),
+              Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('parent_id', Integer, ForeignKey('parents.id'),
                      nullable=False),
               Column('a', String(128)),
@@ -1551,12 +1550,12 @@ class DictHelpersTest(_base.MappedTest):
 
         class Foo(BaseObject):
             __tablename__ = "foo"
-            id = Column(Integer(), primary_key=True)
+            id = Column(Integer(), primary_key=True, test_needs_autoincrement=True)
             bar_id = Column(Integer, ForeignKey('bar.id'))
             
         class Bar(BaseObject):
             __tablename__ = "bar"
-            id = Column(Integer(), primary_key=True)
+            id = Column(Integer(), primary_key=True, test_needs_autoincrement=True)
             foos = relation(Foo, collection_class=collections.column_mapped_collection(Foo.id))
             foos2 = relation(Foo, collection_class=collections.column_mapped_collection((Foo.id, Foo.bar_id)))
             
@@ -1597,10 +1596,10 @@ class CustomCollectionsTest(_base.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         Table('sometable', metadata,
-              Column('col1',Integer, primary_key=True),
+              Column('col1',Integer, primary_key=True, test_needs_autoincrement=True),
               Column('data', String(30)))
         Table('someothertable', metadata,
-              Column('col1', Integer, primary_key=True),
+              Column('col1', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('scol1', Integer,
                      ForeignKey('sometable.col1')),
               Column('data', String(20)))

diff --git a/test/orm/test_cycles.py b/test/orm/test_cycles.py
index fe77b360187e894d7a692ec8706dd84a203f9009..6fbfe7fe1823055d11095c330eb63fbdcdb585be 100644 (file)
--- a/test/orm/test_cycles.py
+++ b/test/orm/test_cycles.py
@@ -7,8 +7,7 @@ T1/T2.
 """
 from sqlalchemy.test import testing
 from sqlalchemy import Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from sqlalchemy.test.schema import Table, Column
 from sqlalchemy.orm import mapper, relation, backref, create_session
 from sqlalchemy.test.testing import eq_
 from sqlalchemy.test.assertsql import RegexSQL, ExactSQL, CompiledSQL, AllOf
@@ -138,7 +137,7 @@ class SelfReferentialNoPKTest(_base.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         Table('item', metadata,
-           Column('id', Integer, primary_key=True),
+           Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
            Column('uuid', String(32), unique=True, nullable=False),
            Column('parent_uuid', String(32), ForeignKey('item.uuid'),
                   nullable=True))
@@ -190,18 +189,16 @@ class InheritTestOne(_base.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         Table("parent", metadata,
-            Column("id", Integer, primary_key=True),
+            Column("id", Integer, primary_key=True, test_needs_autoincrement=True),
             Column("parent_data", String(50)),
             Column("type", String(10)))
 
         Table("child1", metadata,
-              Column("id", Integer, ForeignKey("parent.id"),
-                     primary_key=True),
+              Column("id", Integer, ForeignKey("parent.id"), primary_key=True),
               Column("child1_data", String(50)))
 
         Table("child2", metadata,
-            Column("id", Integer, ForeignKey("parent.id"),
-                   primary_key=True),
+            Column("id", Integer, ForeignKey("parent.id"), primary_key=True),
             Column("child1_id", Integer, ForeignKey("child1.id"),
                    nullable=False),
             Column("child2_data", String(50)))
@@ -262,7 +259,7 @@ class InheritTestTwo(_base.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         Table('a', metadata,
-            Column('id', Integer, primary_key=True),
+            Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
             Column('data', String(30)),
             Column('cid', Integer, ForeignKey('c.id')))
 
@@ -271,7 +268,7 @@ class InheritTestTwo(_base.MappedTest):
             Column('data', String(30)))
 
         Table('c', metadata,
-            Column('id', Integer, primary_key=True),
+            Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
             Column('data', String(30)),
             Column('aid', Integer,
                    ForeignKey('a.id', use_alter=True, name="foo")))
@@ -311,16 +308,16 @@ class BiDirectionalManyToOneTest(_base.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         Table('t1', metadata,
-            Column('id', Integer, primary_key=True),
+            Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
             Column('data', String(30)),
             Column('t2id', Integer, ForeignKey('t2.id')))
         Table('t2', metadata,
-            Column('id', Integer, primary_key=True),
+            Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
             Column('data', String(30)),
             Column('t1id', Integer,
                    ForeignKey('t1.id', use_alter=True, name="foo_fk")))
         Table('t3', metadata,
-            Column('id', Integer, primary_key=True),
+            Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
             Column('data', String(30)),
             Column('t1id', Integer, ForeignKey('t1.id'), nullable=False),
             Column('t2id', Integer, ForeignKey('t2.id'), nullable=False))
@@ -402,13 +399,11 @@ class BiDirectionalOneToManyTest(_base.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         Table('t1', metadata,
-              Column('c1', Integer, primary_key=True,
-                     test_needs_autoincrement=True),
+              Column('c1', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('c2', Integer, ForeignKey('t2.c1')))
 
         Table('t2', metadata,
-              Column('c1', Integer, primary_key=True,
-                     test_needs_autoincrement=True),
+              Column('c1', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('c2', Integer,
                      ForeignKey('t1.c1', use_alter=True, name='t1c1_fk')))
 
@@ -453,18 +448,18 @@ class BiDirectionalOneToManyTest2(_base.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         Table('t1', metadata,
-              Column('c1', Integer, primary_key=True),
+              Column('c1', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('c2', Integer, ForeignKey('t2.c1')),
               test_needs_autoincrement=True)
 
         Table('t2', metadata,
-              Column('c1', Integer, primary_key=True),
+              Column('c1', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('c2', Integer,
                      ForeignKey('t1.c1', use_alter=True, name='t1c1_fq')),
               test_needs_autoincrement=True)
 
         Table('t1_data', metadata,
-              Column('c1', Integer, primary_key=True),
+              Column('c1', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('t1id', Integer, ForeignKey('t1.c1')),
               Column('data', String(20)),
               test_needs_autoincrement=True)
@@ -530,15 +525,13 @@ class OneToManyManyToOneTest(_base.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         Table('ball', metadata,
-              Column('id', Integer, primary_key=True,
-                     test_needs_autoincrement=True),
+              Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('person_id', Integer,
                      ForeignKey('person.id', use_alter=True, name='fk_person_id')),
               Column('data', String(30)))
 
         Table('person', metadata,
-              Column('id', Integer, primary_key=True,
-                     test_needs_autoincrement=True),
+              Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
               Column('favorite_ball_id', Integer, ForeignKey('ball.id')),
               Column('data', String(30)))
 
@@ -841,7 +834,7 @@ class SelfReferentialPostUpdateTest2(_base.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         Table("a_table", metadata,
-              Column("id", Integer(), primary_key=True),
+              Column("id", Integer(), primary_key=True, test_needs_autoincrement=True),
               Column("fui", String(128)),
               Column("b", Integer(), ForeignKey("a_table.id")))
 

diff --git a/test/orm/test_defaults.py b/test/orm/test_defaults.py
index b063780ac72b0059e38dec2fb22712446dcf8b3c..56571037e43dd2b9807da83c65470603fb175702 100644 (file)
--- a/test/orm/test_defaults.py
+++ b/test/orm/test_defaults.py
@@ -2,8 +2,7 @@
 import sqlalchemy as sa
 from sqlalchemy.test import testing
 from sqlalchemy import Integer, String, ForeignKey
-from sqlalchemy.test.schema import Table
-from sqlalchemy.test.schema import Column
+from sqlalchemy.test.schema import Table, Column
 from sqlalchemy.orm import mapper, relation, create_session
 from test.orm import _base
 from sqlalchemy.test.testing import eq_
@@ -15,7 +14,7 @@ class TriggerDefaultsTest(_base.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         dt = Table('dt', metadata,
-                   Column('id', Integer, primary_key=True),
+                   Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
                    Column('col1', String(20)),
                    Column('col2', String(20),
                           server_default=sa.schema.FetchedValue()),
@@ -115,7 +114,7 @@ class ExcludedDefaultsTest(_base.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
         dt = Table('dt', metadata,
-                   Column('id', Integer, primary_key=True),
+                   Column('id', Integer, primary_key=True, test_needs_autoincrement=True),
                    Column('col1', String(20), default="hello"),
         )