Skip to content

Commit 71a659c

Browse files
committed
Add a debug comment to first line of SQL
This makes it easier to see what the queries are from
1 parent 38b9451 commit 71a659c

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

tests/test_config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,13 +170,13 @@ def test_render(self):
170170
self.assertIsNone(layer.render_sql(Tile(5, 0, 0)))
171171
self.assertIsNone(layer.render_sql(Tile(7, 0, 0)))
172172

173-
self.assertEqual(layer.render_sql(Tile(4, 0, 0)), '''WITH mvtgeom AS
173+
self.assertEqual(layer.render_sql(Tile(4, 0, 0)), '''WITH mvtgeom AS -- foo/4/0/0
174174
(
175175
one
176176
)
177177
SELECT ST_AsMVT(mvtgeom.*, 'foo', 4096)
178178
FROM mvtgeom;''')
179-
self.assertEqual(layer.render_sql(Tile(6, 0, 0)), '''WITH mvtgeom AS
179+
self.assertEqual(layer.render_sql(Tile(6, 0, 0)), '''WITH mvtgeom AS -- foo/6/0/0
180180
(
181181
two
182182
)

tests/test_definition.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def test_render(self):
4545
fs.writetext("one.sql.jinja2", "SELECT 1")
4646
d = Definition("one", {"minzoom": 1, "maxzoom": 3, "extent": 1024, "buffer": 8,
4747
"file": "one.sql.jinja2"}, fs)
48-
expected = '''WITH mvtgeom AS
48+
expected = '''WITH mvtgeom AS -- one/2/0/0
4949
(
5050
SELECT 1
5151
)
@@ -57,7 +57,7 @@ def test_render(self):
5757
"{{unbuffered_bbox}}\n{{extent}}\n{{buffer}}")
5858
d = Definition("two", {"minzoom": 1, "maxzoom": 3, "extent": 1024, "buffer": 256,
5959
"file": "two.sql.jinja2"}, fs)
60-
expected = '''WITH mvtgeom AS
60+
expected = '''WITH mvtgeom AS -- two/2/0/1
6161
(
6262
SELECT 2/0/1
6363
ST_TileEnvelope(2, 0, 1, margin=>0.25)
@@ -74,7 +74,7 @@ def test_render(self):
7474
d = Definition("units", {"minzoom": 1, "maxzoom": 3, "extent": 1024, "buffer": 256,
7575
"file": "units.sql.jinja2"}, fs)
7676
# Crudely slice up the string to turn it into numbers
77-
expected = '''WITH mvtgeom AS
77+
expected = '''WITH mvtgeom AS -- units/2/0/1
7878
(
7979
10018754.17
8080
100375435118892.39
@@ -89,7 +89,7 @@ def test_render(self):
8989
d = Definition("whitespace", {"minzoom": 1, "maxzoom": 3, "extent": 1024, "buffer": 256,
9090
"file": "whitespace.sql.jinja2"}, fs)
9191
# Crudely slice up the string to turn it into numbers
92-
expected = '''WITH mvtgeom AS
92+
expected = '''WITH mvtgeom AS -- whitespace/2/0/1
9393
(
9494
foo
9595
bar

tilekiln/definition.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ def render_sql(self, tile: Tile) -> str:
5858
coordinate_area=(tile_length(tile)/self.extent)**2)
5959

6060
# TODO: Use proper escaping for self.id in SQL
61-
return ('''WITH mvtgeom AS\n(\n''' + inner + '''\n)\n''' +
62-
f'''SELECT ST_AsMVT(mvtgeom.*, '{self.id}', {self.extent})\n''' +
61+
return (f'''WITH mvtgeom AS -- {self.id}/{tile.zoom}/{tile.x}/{tile.y}\n(\n''' +
62+
inner + f'''\n)\nSELECT ST_AsMVT(mvtgeom.*, '{self.id}', {self.extent})\n''' +
6363
'''FROM mvtgeom;''')
6464

6565

0 commit comments

Comments
 (0)