Commits

Mike Bayer  committed 98c59b7

some buildbot fixes

  • Participants
  • Parent commits ba3ef01

Comments (0)

Files changed (3)

File test/ext/serializer.py

 
         ualias = aliased(User)
         q = Session.query(User, ualias).join((ualias, User.id < ualias.id)).filter(User.id<9).order_by(User.id, ualias.id)
+        eq_(list(q.all()), [(u7, u8), (u7, u9), (u7, u10), (u8, u9), (u8, u10)])
 
         q2 = serializer.loads(serializer.dumps(q), users.metadata, Session)
         

File test/orm/eager_relations.py

         closed_mapper = mapper(Order, closedorders, non_primary=True)
         
         mapper(User, users, properties = dict(
-            addresses = relation(Address, lazy=False),
+            addresses = relation(Address, lazy=False, order_by=addresses.c.id),
             open_orders = relation(
                 open_mapper,
                 primaryjoin=sa.and_(openorders.c.isopen == 1,
                                  users.c.id==openorders.c.user_id),
-                lazy=False),
+                lazy=False, order_by=openorders.c.id),
             closed_orders = relation(
                 closed_mapper,
                 primaryjoin=sa.and_(closedorders.c.isopen == 0,
                                  users.c.id==closedorders.c.user_id),
-                lazy=False)))
+                lazy=False, order_by=closedorders.c.id)))
 
-        q = create_session().query(User)
+        q = create_session().query(User).order_by(User.id)
 
         def go():
             assert [

File test/profiling/zoomark.py

     def test_profile_2_insert(self):
         self.test_baseline_2_insert()
 
-    @profiling.function_call_count(3618, {'2.4': 2347})
+    @profiling.function_call_count(3834, {'2.4': 2347})
     def test_profile_3_properties(self):
         self.test_baseline_3_properties()