summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-08-25 19:41:43 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2012-08-25 19:41:43 +0000
commit567ea2faefe67c6ad2608855b21eb930a41c69e8 (patch)
tree6e5faa6e263b54c6385b208af5124f82d81dc7d2
parent4d40f1b71ec293af5a7ce16a66429976895a8545 (diff)
parente4ff3d2a35af1daa36f8cdbff8d72d08dfa8738e (diff)
downloadsqlalchemy-567ea2faefe67c6ad2608855b21eb930a41c69e8.tar.gz
- merge
-rw-r--r--test/dialect/test_oracle.py8
-rw-r--r--test/sql/test_returning.py4
2 files changed, 7 insertions, 5 deletions
diff --git a/test/dialect/test_oracle.py b/test/dialect/test_oracle.py
index 1fbaf96dd..0348cd137 100644
--- a/test/dialect/test_oracle.py
+++ b/test/dialect/test_oracle.py
@@ -1329,13 +1329,15 @@ class BufferedColumnTest(fixtures.TestBase, AssertsCompiledSQL):
meta.drop_all()
def test_fetch(self):
- result = binary_table.select().execute().fetchall()
+ result = binary_table.select().order_by(binary_table.c.id).\
+ execute().fetchall()
eq_(result, [(i, stream) for i in range(1, 11)])
@testing.fails_on('+zxjdbc', 'FIXME: zxjdbc should support this')
def test_fetch_single_arraysize(self):
- eng = testing_engine(options={'arraysize':1})
- result = eng.execute(binary_table.select()).fetchall()
+ eng = testing_engine(options={'arraysize': 1})
+ result = eng.execute(binary_table.select().
+ order_by(binary_table.c.id)).fetchall()
eq_(result, [(i, stream) for i in range(1, 11)])
class UnsupportedIndexReflectTest(fixtures.TestBase):
diff --git a/test/sql/test_returning.py b/test/sql/test_returning.py
index ac5c69e52..c1ee900ef 100644
--- a/test/sql/test_returning.py
+++ b/test/sql/test_returning.py
@@ -71,12 +71,12 @@ class ReturningTest(fixtures.TestBase, AssertsExecutionResults):
result = table.insert().values(goofy="someOTHERgoofy").\
returning(func.lower(table.c.goofy, type_=GoofyType)).execute()
row = result.first()
- assert row[0] == "foosomeothergoofyBAR"
+ eq_(row[0], "foosomeothergoofyBAR")
result = table.insert().values(persons=12).\
returning(table.c.persons + 18).execute()
row = result.first()
- assert row[0] == 30
+ eq_(row[0], 30)
@testing.exclude('firebird', '<', (2, 1), '2.1+ feature')
@testing.exclude('postgresql', '<', (8, 2), '8.2+ feature')