From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 18 Jul 2014 18:27:59 +0000 (-0400)
Subject: - Fixed bug in oracle dialect test suite where in one test,
X-Git-Tag: rel_1_0_0b1~304
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0eb53b2e7936d2b0a17077a922ce1d97f102e38a;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- Fixed bug in oracle dialect test suite where in one test,
'username' was assumed to be in the database URL, even though
this might not be the case.  Fixes #3128
---

diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst
index 08ab3caee1..cfb5cb691c 100644
--- a/doc/build/changelog/changelog_09.rst
+++ b/doc/build/changelog/changelog_09.rst
@@ -14,6 +14,15 @@
     :version: 0.9.7
     :released:
 
+    .. change::
+        :tags: bug, oracle, tests
+        :tickets: 3128
+        :versions: 1.0.0
+
+        Fixed bug in oracle dialect test suite where in one test,
+        'username' was assumed to be in the database URL, even though
+        this might not be the case.
+
     .. change::
         :tags: bug, orm, eagerloading
         :tickets: 3131
diff --git a/test/dialect/test_oracle.py b/test/dialect/test_oracle.py
index 758ae089db..f7c49c3d3d 100644
--- a/test/dialect/test_oracle.py
+++ b/test/dialect/test_oracle.py
@@ -1695,14 +1695,15 @@ class RoundTripIndexTest(fixtures.TestBase):
                     obj.columns]), getattr(obj, 'unique', None)
 
         # find what the primary k constraint name should be
-        primaryconsname = testing.db.execute(
-           text("""SELECT constraint_name
+        primaryconsname = testing.db.scalar(
+            text(
+                """SELECT constraint_name
                FROM all_constraints
                WHERE table_name = :table_name
                AND owner = :owner
                AND constraint_type = 'P' """),
-           table_name=table.name.upper(),
-           owner=testing.db.url.username.upper()).fetchall()[0][0]
+            table_name=table.name.upper(),
+            owner=testing.db.dialect.default_schema_name.upper())
 
         reflectedtable = inspect.tables[table.name]