From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 2 Apr 2008 02:42:29 +0000 (+0000)
Subject: continue attempting to get proper count for pybot on 2.5, ensure order_by for oracle... 
X-Git-Tag: rel_0_4_5~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c08c6c2185833954f82b046dd4de15a55aaebfe4;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

continue attempting to get proper count for pybot on 2.5, ensure order_by for oracle query
---

diff --git a/test/dialect/oracle.py b/test/dialect/oracle.py
index fda6f3549f..4e9960012b 100644
--- a/test/dialect/oracle.py
+++ b/test/dialect/oracle.py
@@ -126,7 +126,7 @@ AND mytable.myid = myothertable.otherid(+)",
         self.assert_compile(query.select(), "SELECT mytable.myid, mytable.name, mytable.description, myothertable.otherid, myothertable.othername, thirdtable.userid, thirdtable.otherstuff FROM mytable, myothertable, thirdtable WHERE mytable.myid = myothertable.otherid AND thirdtable.userid = myothertable.otherid", dialect=oracle.dialect(use_ansi=False))
 
         query = table1.join(table2, table1.c.myid==table2.c.otherid).outerjoin(table3, table3.c.userid==table2.c.otherid)
-        self.assert_compile(query.select().limit(10).offset(5), "SELECT myid, name, description, otherid, othername, userid, \
+        self.assert_compile(query.select().order_by(table1.oid_column).limit(10).offset(5), "SELECT myid, name, description, otherid, othername, userid, \
 otherstuff FROM (SELECT mytable.myid AS myid, mytable.name AS name, \
 mytable.description AS description, myothertable.otherid AS otherid, \
 myothertable.othername AS othername, thirdtable.userid AS userid, \
diff --git a/test/profiling/compiler.py b/test/profiling/compiler.py
index 0ce0e7792c..23e199962f 100644
--- a/test/profiling/compiler.py
+++ b/test/profiling/compiler.py
@@ -24,7 +24,7 @@ class CompileTest(TestBase, AssertsExecutionResults):
         t1.update().compile()
 
     # TODO: this is alittle high
-    @profiling.function_call_count(125, versions={'2.3': 180, '2.4':140})
+    @profiling.function_call_count(130, versions={'2.3': 180, '2.4':140})
     def test_select(self):
         s = select([t1], t1.c.c2==t2.c.c1)
         s.compile()