1. Daniel Miller
  2. sqlalchemy

Commits

Mike Bayer  committed 5c50a4e

some wide zoomark ranges...

  • Participants
  • Parent commits c1fa7bc
  • Branches default

Comments (0)

Files changed (2)

File lib/sqlalchemy/sql/compiler.py

View file
         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

File test/profiling/zoomark.py

View file
     """
     
     @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)
         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']
                                 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()
             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']