bdd: replace remaining SELECT steps with SQL templates

Author: lonvia

tests/bdd/flex/delete-callbacks.feature

@@ -27,11 +27,16 @@ Feature: Test for delete callbacks
 
         Given the input file '008-ch.osc.gz'
 
+        Given the SQL statement grouped_counts
+            """
+            SELECT osm_type, count(*), sum(extra) FROM change GROUP BY osm_type
+            """
+
     Scenario: Delete callbacks are called
         When running osm2pgsql flex with parameters
             | --slim | -a |
 
-        Then SELECT osm_type, count(*), sum(extra) FROM change GROUP BY osm_type
+        Then statement grouped_counts returns exactly
             | osm_type | count | sum |
             | N        | 16773 | 16779 |
             | W        | 4     | 9 |
@@ -40,11 +45,11 @@ Feature: Test for delete callbacks
         When running osm2pgsql flex with parameters
             | --slim | -a |
 
-        Then SELECT osm_type, count(*), sum(osm_id) FROM change GROUP BY osm_type
+        Then statement grouped_counts returns exactly
             | osm_type | count | sum |
-            | N        | 16773 | 37856781001834 |
-            | W        | 4     | 350933407 |
-            | R        | 1     | 2871571 |
+            | N        | 16773 | 16779 |
+            | W        | 4     | 9 |
+            | R        | 1     | 3 |
 
     Scenario: No object payload is available
         Given the lua style
@@ -72,7 +77,7 @@ Feature: Test for delete callbacks
             """
         When running osm2pgsql flex with parameters
             | --slim | -a |
-        Then SELECT osm_type, count(*), sum(extra) FROM change GROUP BY osm_type
+        Then statement grouped_counts returns exactly
             | osm_type | count | sum |
             | N        | 16773 | 16773 |
             | W        | 4     | 4 |
@@ -105,7 +110,7 @@ Feature: Test for delete callbacks
             """
         When running osm2pgsql flex with parameters
             | --slim | -a |
-        Then SELECT osm_type, count(*), sum(extra) FROM change GROUP BY osm_type
+        Then statement grouped_counts returns exactly
             | osm_type | count | sum |
             | N        | 16773 | 16773|
             | W        | 4     | 4|

tests/bdd/regression/multipolygon.feature

@@ -3,6 +3,16 @@ Feature: Import and update of multipolygon areas
     Background:
         Given the input file 'test_multipolygon.osm'
 
+        Given the SQL statement grouped_polygons
+            """
+            SELECT osm_id,
+                   count(*) as count,
+                   round(sum(ST_Area(way))) as area,
+                   round(sum(way_area::numeric)) as way_area
+            FROM planet_osm_polygon
+            GROUP BY osm_id
+            """
+
     Scenario Outline: Import and update slim
         Given <lua> lua tagtransform
         When running osm2pgsql pgsql with parameters
@@ -35,15 +45,15 @@ Feature: Import and update of multipolygon areas
             | osm_id | landuse     | name       | ST_NumInteriorRing(way) |
             | -3     | residential | Name_rel11 | 2                       |
 
-        Then SELECT osm_id, round(sum(ST_Area(way))), round(sum(way_area::numeric)) FROM planet_osm_polygon GROUP BY osm_id
+        Then statement grouped_polygons returns
             | osm_id | area  | way_area |
             | -13    | 17581 | 17581    |
             | -7     | 16169 | 16169    |
             | -29    | 68494 | 68494    |
             | -39    | 10377 | 10378    |
             | -40    | 12397 | 12397    |
 
-        Then SELECT osm_id, count(*) FROM planet_osm_polygon GROUP BY osm_id
+        Then statement grouped_polygons returns
             | osm_id | count |
             | -25    | 1     |
             | 113    | 1     |
@@ -63,7 +73,15 @@ Feature: Import and update of multipolygon areas
             | osm_id | "natural" |
             | -33    | water     |
 
-        Then SELECT osm_id, CASE WHEN '<param1>' = '-G' THEN min(ST_NumGeometries(way)) ELSE count(*) END FROM planet_osm_polygon GROUP BY osm_id
+        Given the SQL statement geometries_polygon
+            """
+            SELECT osm_id,
+                   CASE WHEN '<param1>' = '-G' THEN min(ST_NumGeometries(way))
+                   ELSE count(*) END as count
+            FROM planet_osm_polygon
+            GROUP BY osm_id
+            """
+        Then statement geometries_polygon returns
            | osm_id | count |
            | -13    | 2     |
            | -7     | 2     |
@@ -99,15 +117,15 @@ Feature: Import and update of multipolygon areas
             | osm_id | landuse     | name       | ST_NumInteriorRing(way) |
             | -3     | residential | Name_rel11 | 2                       |
 
-        Then SELECT osm_id, round(sum(ST_Area(way))), round(sum(way_area::numeric)) FROM planet_osm_polygon GROUP BY osm_id
+        Then statement grouped_polygons returns
             | osm_id | area  | way_area |
             | -13    | 17581 | 17581    |
             | -7     | 16169 | 16169    |
             | -29    | 29155 | 29155    |
             | -39    | 10377 | 10378    |
             | -40    | 12397 | 12397    |
 
-        Then SELECT osm_id, count(*) FROM planet_osm_polygon GROUP BY osm_id
+        Then statement grouped_polygons returns
             | osm_id | count |
             | 113    | 1     |
             | 118    | 1     |

tests/bdd/steps/steps_db.py

@@ -98,9 +98,12 @@ def db_define_sql_statement(context, sql):
 
 @then("statement (?P<stmt>.+) returns(?P<exact> exactly)?")
 def db_check_sql_statement(context, stmt, exact):
+    assert stmt in context.sql_statements
+    rows = sql.SQL(', '.join(h.rsplit('@')[0] for h in context.table.headings))
+
     with context.db.cursor() as cur:
-        assert stmt in context.sql_statements
-        cur.execute(context.sql_statements[stmt])
+        cur.execute(sql.SQL("SELECT {} FROM ({}) _sql_statement")
+                       .format(rows, sql.SQL(context.sql_statements[stmt])))
 
         actuals = list(DBRow(r, context.table.headings, context.geometry_factory) for r in cur)