diff options
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/dialects/oracle/base.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/suite/test_reflection.py | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/lib/sqlalchemy/dialects/oracle/base.py b/lib/sqlalchemy/dialects/oracle/base.py index 7c23e9cd4..39bc5e1d3 100644 --- a/lib/sqlalchemy/dialects/oracle/base.py +++ b/lib/sqlalchemy/dialects/oracle/base.py @@ -1530,6 +1530,8 @@ class OracleDialect(default.DefaultDialect): (cons_name, cons_type, local_column, remote_table, remote_column, remote_owner) = \ row[0:2] + tuple([self.normalize_name(x) for x in row[2:6]]) + cons_name = self.normalize_name(cons_name) + if cons_type == 'R': if remote_table is None: # ticket 363 diff --git a/lib/sqlalchemy/testing/suite/test_reflection.py b/lib/sqlalchemy/testing/suite/test_reflection.py index ed6a33b6d..572cc4a0a 100644 --- a/lib/sqlalchemy/testing/suite/test_reflection.py +++ b/lib/sqlalchemy/testing/suite/test_reflection.py @@ -70,7 +70,8 @@ class ComponentReflectionTest(fixtures.TablesTest): Column('test2', sa.Float(5), nullable=False), Column('parent_user_id', sa.Integer, sa.ForeignKey('%susers.user_id' % - schema_prefix)), + schema_prefix, + name='user_id_fk')), schema=schema, test_needs_fk=True, ) @@ -444,7 +445,7 @@ class ComponentReflectionTest(fixtures.TablesTest): fkey1 = users_fkeys[0] with testing.requires.named_constraints.fail_if(): - self.assert_(fkey1['name'] is not None) + eq_(fkey1['name'], "user_id_fk") eq_(fkey1['referred_schema'], expected_schema) eq_(fkey1['referred_table'], users.name) @@ -457,7 +458,7 @@ class ComponentReflectionTest(fixtures.TablesTest): schema=schema) fkey1 = addr_fkeys[0] - with testing.requires.named_constraints.fail_if(): + with testing.requires.implicitly_named_constraints.fail_if(): self.assert_(fkey1['name'] is not None) eq_(fkey1['referred_schema'], expected_schema) |