Merge branch 'release/v6.70'

rowers/tasks.py

@@ -178,7 +178,7 @@ def getagegrouprecord(age,sex='male',weightcategory='hwt',
 
 def polygon_to_path(polygon,debug=True):
     pid = polygon[0]
-    query = 'SELECT "rowers_geopoint"."id", "rowers_geopoint"."latitude", "rowers_geopoint"."longitude" FROM "rowers_geopoint" WHERE "rowers_geopoint"."polygon_id" = {pid} ORDER BY "rowers_geopoint"."order_in_poly" ASC'.format(
+    query = "SELECT id, latitude, longitude FROM rowers_geopoint WHERE polygon_id = {pid} ORDER BY order_in_poly ASC".format(
         pid=pid
         )
     if debug:
@@ -255,7 +255,7 @@ def handle_check_race_course(self,
         engine = create_engine(database_url, echo=False)
         
     # get polygons
-    query = 'SELECT "rowers_geopolygon"."id" FROM "rowers_geopolygon" WHERE "rowers_geopolygon"."course_id" = {courseid} ORDER BY "rowers_geopolygon"."order_in_course" ASC'.format(
+    query = "SELECT id FROM rowers_geopolygon WHERE course_id = {courseid} ORDER BY order_in_course ASC".format(
         courseid=courseid
         )
 
@@ -288,7 +288,7 @@ def handle_check_race_course(self,
     coursemeters = coursemeters-coursemetersfirst
 
     if coursecompleted:
-        query = 'UPDATE "rowers_virtualraceresult" SET "coursecompleted" = 1, "duration" = "{duration}", "distance" = {distance}, "workoutid" = {workoutid} WHERE "id"="{recordid}"'.format(
+        query = 'UPDATE rowers_virtualraceresult SET coursecompleted = 1, duration = "{duration}", distance = {distance}, workoutid = {workoutid} WHERE id={recordid}'.format(
             recordid=recordid,
             duration=totaltime_sec_to_string(coursetimeseconds),
             distance=int(coursemeters),
@@ -296,7 +296,7 @@ def handle_check_race_course(self,
             )
 
         if mode == 'coursetest':
-            query = 'UPDATE "rowers_coursetestresult" SET "coursecompleted" = 1, "duration" = "{duration}", "distance" = {distance}, "workoutid" = {workoutid} WHERE "id"="{recordid}"'.format(
+            query = 'UPDATE rowers_coursetestresult SET coursecompleted = 1, duration = "{duration}", distance = {distance}, workoutid = {workoutid} WHERE id={recordid}'.format(
                 recordid=recordid,
                 duration=totaltime_sec_to_string(coursetimeseconds),
                 distance=int(coursemeters),