From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 16 Jul 2014 14:52:35 +0000 (-0400)
Subject: - need Integer here as #1765 is in 0.9
X-Git-Tag: rel_0_8_7~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f024ce3b2940cb5af8a4573d769952a4111d8c2e;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- need Integer here as #1765 is in 0.9
---

diff --git a/test/orm/test_subquery_relations.py b/test/orm/test_subquery_relations.py
index 4116591b28..076c2b35e1 100644
--- a/test/orm/test_subquery_relations.py
+++ b/test/orm/test_subquery_relations.py
@@ -1148,12 +1148,12 @@ class SubRelationFromJoinedSubclassMultiLevelTest(_Polymorphic):
             Column('person_id', Integer,
                 primary_key=True,
                 test_needs_autoincrement=True),
-            Column('company_id', ForeignKey('companies.company_id')),
+            Column('company_id', Integer, ForeignKey('companies.company_id')),
             Column('name', String(50)),
             Column('type', String(30)))
 
         Table('engineers', metadata,
-            Column('engineer_id', ForeignKey('people.person_id'),
+            Column('engineer_id', Integer, ForeignKey('people.person_id'),
                             primary_key=True),
             Column('primary_language', String(50)))
 
@@ -1162,8 +1162,8 @@ class SubRelationFromJoinedSubclassMultiLevelTest(_Polymorphic):
                  Integer, primary_key=True,
                  test_needs_autoincrement=True),
             Column('name', String(50)),
-            Column('engineer_id', ForeignKey('engineers.engineer_id')),
-            Column('machine_type_id',
+            Column('engineer_id', Integer, ForeignKey('engineers.engineer_id')),
+            Column('machine_type_id', Integer,
                             ForeignKey('machine_type.machine_type_id')))
 
         Table('machine_type', metadata,