Merge branch 'master' of github.com:gem/oq-engine

gem · Jun 24, 2013 · e7f0d3f · e7f0d3f
2 parents a47985e + 9ac75d6
commit e7f0d3f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tests/db/models_manager_test.py b/tests/db/models_manager_test.py
@@ -190,15 +190,15 @@ def test_get_people_query_helper_population_time_event(self):
     def test_get_people_query_helper_buildings_no_event(self):
         field, cond, join, args = self.manager._get_people_query_helper(
             "buildings", None)
-        self.assertEqual("AVG(riski.occupancy.occupants::float)", field)
+        self.assertEqual("AVG(riski.occupancy.occupants)", field)
         self.assertEqual("1 = 1", cond)
         self.assertEqual("LEFT JOIN riski.occupancy", join)
         self.assertEqual(args, ())
 
     def test_get_people_query_helper_buildings_time_event(self):
         field, cond, join, args = self.manager._get_people_query_helper(
             "buildings", "day")
-        self.assertEqual("AVG(riski.occupancy.occupants::float)", field)
+        self.assertEqual("AVG(riski.occupancy.occupants)", field)
         self.assertEqual("riski.occupancy.period = %s", cond)
         self.assertEqual("LEFT JOIN riski.occupancy", join)
         self.assertEqual(args, ("day",))