some wide zoomark ranges...

diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index 14011706939d2532d07b901f619b72e50d35f7b7..dd6f0ddddeb819c4cf2038fb78e69a1fea16023c 100644 (file)
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -465,13 +465,13 @@ class DefaultCompiler(engine.Compiled):
         if asfrom:
             stack_entry['is_selected_from'] = stack_entry['is_subquery'] = True
             column_clause_args = {}
-        elif self.stack and self.stack[-1].get('select'):
+        elif self.stack and 'select' in self.stack[-1]:
             stack_entry['is_subquery'] = True
             column_clause_args = {}
         else:
             column_clause_args = {'typemap':self.typemap, 'column_labels':self.column_labels}
             
-        if self.stack and self.stack[-1].get('from'):
+        if self.stack and 'from' in self.stack[-1]:
             existingfroms = self.stack[-1]['from']
         else:
             existingfroms = None

diff --git a/test/profiling/zoomark.py b/test/profiling/zoomark.py
index 4f1a4d2820e42511096f51671c6aac33c1a3ee72..8503ddc1fc4402610068af6c1eea9917b0a7fb40 100644 (file)
--- a/test/profiling/zoomark.py
+++ b/test/profiling/zoomark.py
@@ -21,7 +21,7 @@ class ZooMarkTest(testing.AssertMixin):
     """
     
     @testing.supported('postgres')
-    @profiling.profiled('create', call_range=(1610, 2000), always=True)        
+    @profiling.profiled('create', call_range=(1500, 1880), always=True)        
     def test_1_create_tables(self):
         global metadata
         metadata = MetaData(testbase.db)
@@ -50,7 +50,7 @@ class ZooMarkTest(testing.AssertMixin):
         metadata.create_all()
         
     @testing.supported('postgres')
-    @profiling.profiled('populate', call_range=(2970, 4400), always=True)
+    @profiling.profiled('populate', call_range=(2800, 3700), always=True)
     def test_1a_populate(self):
         Zoo = metadata.tables['Zoo']
         Animal = metadata.tables['Animal']
@@ -118,7 +118,7 @@ class ZooMarkTest(testing.AssertMixin):
                                 MotherID=bai_yun)
     
     @testing.supported('postgres')
-    @profiling.profiled('insert', call_range=(160, 250), always=True)
+    @profiling.profiled('insert', call_range=(150, 220), always=True)
     def test_2_insert(self):
         Animal = metadata.tables['Animal']
         i = Animal.insert()
@@ -274,7 +274,7 @@ class ZooMarkTest(testing.AssertMixin):
             assert SDZ['Founded'] == datetime.date(1935, 9, 13)
     
     @testing.supported('postgres')
-    @profiling.profiled('multiview', call_range=(2400, 2600), always=True)
+    @profiling.profiled('multiview', call_range=(2300, 2500), always=True)
     def test_7_multiview(self):
         Zoo = metadata.tables['Zoo']
         Animal = metadata.tables['Animal']