Skip to content

Commit feb407b

Browse files
iamralchiamralch
committed
fix(template): add blank line separators between generated query blocks
The {{- trim markers on should_skip checks were eating all preceding whitespace, causing query blocks to run together without visual separation in the generated output.
1 parent 2579c1e commit feb407b

1 file changed

Lines changed: 25 additions & 0 deletions

File tree

‎internal/sqlc/template/template.sql.tmpl‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ SET search_path TO {{.Schema}};
66

77
{{range $idx, $key := .Table.GetUniqueKeys}}{{- $query_name := printf "Get%s%s" (table_name $.Table.Name "one") (query_index $key)}}
88
{{- if not (should_skip $ $query_name)}}
9+
910
-- Get{{table_name $.Table.Name "one"}}{{query_index $key}} retrieves a single row from '{{$.Table.Name}}' by {{$key.Name}}.
1011
-- Returns the row or an error if not found.
1112
-- name: {{$query_name}} :one
@@ -37,6 +38,7 @@ WHERE
3738

3839
{{- $query_name := printf "BatchGet%s%s" (table_name $.Table.Name "many") (query_index $key)}}
3940
{{- if not (should_skip $ $query_name)}}
41+
4042
-- BatchGet{{table_name $.Table.Name "many"}}{{query_index $key}} retrieves multiple rows from '{{$.Table.Name}}' by {{$key.Name}} in a single batch operation.
4143
-- Executes the query once for each provided key value and returns individual results.
4244
-- name: {{$query_name}} :batchone
@@ -68,6 +70,7 @@ WHERE
6870

6971
{{- $query_name := printf "Update%s%s" (table_name $.Table.Name "one") (query_index $key)}}
7072
{{- if not (should_skip $ $query_name)}}
73+
7174
-- Update{{table_name $.Table.Name "one"}}{{query_index $key}} updates a row in '{{$.Table.Name}}' identified by {{$key.Name}}.
7275
-- Uses update_mask to specify which fields to update. Returns the updated row.
7376
-- name: {{$query_name}} :one
@@ -87,6 +90,7 @@ RETURNING *;
8790

8891
{{- $query_name := printf "ExecUpdate%s%s" (table_name $.Table.Name "one") (query_index $key)}}
8992
{{- if not (should_skip $ $query_name)}}
93+
9094
-- ExecUpdate{{table_name $.Table.Name "one"}}{{query_index $key}} updates a row in '{{$.Table.Name}}' identified by {{$key.Name}}.
9195
-- Uses update_mask to specify which fields to update. Returns number of affected rows.
9296
-- name: {{$query_name}} :exec
@@ -105,6 +109,7 @@ WHERE
105109

106110
{{- $query_name := printf "BatchUpdate%s%s" (table_name $.Table.Name "many") (query_index $key)}}
107111
{{- if not (should_skip $ $query_name)}}
112+
108113
-- BatchUpdate{{table_name $.Table.Name "many"}}{{query_index $key}} updates multiple rows in '{{$.Table.Name}}' by {{$key.Name}} in a single batch operation.
109114
-- Uses update_mask for each row to specify which fields to update. Returns updated rows.
110115
-- name: {{$query_name}} :batchone
@@ -124,6 +129,7 @@ RETURNING *;
124129

125130
{{- $query_name := printf "BatchExecUpdate%s%s" (table_name $.Table.Name "many") (query_index $key)}}
126131
{{- if not (should_skip $ $query_name)}}
132+
127133
-- BatchExecUpdate{{table_name $.Table.Name "many"}}{{query_index $key}} updates multiple rows in '{{$.Table.Name}}' by {{$key.Name}} in a single batch operation.
128134
-- Uses update_mask for each row to specify which fields to update. Returns number of affected rows.
129135
-- name: {{$query_name}} :batchexec
@@ -142,6 +148,7 @@ WHERE
142148

143149
{{- $query_name := printf "Delete%s%s" (table_name $.Table.Name "one") (query_index $key)}}
144150
{{- if not (should_skip $ $query_name)}}
151+
145152
-- Delete{{table_name $.Table.Name "one"}}{{query_index $key}} deletes a single row from '{{$.Table.Name}}' by {{$key.Name}}.
146153
-- Returns the deleted row or an error if not found.
147154
-- name: {{$query_name}} :one
@@ -153,6 +160,7 @@ RETURNING *;
153160

154161
{{- $query_name := printf "ExecDelete%s%s" (table_name $.Table.Name "one") (query_index $key)}}
155162
{{- if not (should_skip $ $query_name)}}
163+
156164
-- ExecDelete{{table_name $.Table.Name "one"}}{{query_index $key}} deletes a single row from '{{$.Table.Name}}' by {{$key.Name}}.
157165
-- Returns number of affected rows (0 if not found, 1 if deleted).
158166
-- name: {{$query_name}} :exec
@@ -163,6 +171,7 @@ WHERE
163171

164172
{{- $query_name := printf "BatchDelete%s%s" (table_name $.Table.Name "many") (query_index $key)}}
165173
{{- if not (should_skip $ $query_name)}}
174+
166175
-- BatchDelete{{table_name $.Table.Name "many"}}{{query_index $key}} deletes multiple rows from '{{$.Table.Name}}' by {{$key.Name}} in a single batch operation.
167176
-- Executes the delete once for each provided key value and returns deleted rows.
168177
-- name: {{$query_name}} :batchone
@@ -174,6 +183,7 @@ RETURNING *;
174183

175184
{{- $query_name := printf "BatchExecDelete%s%s" (table_name $.Table.Name "many") (query_index $key)}}
176185
{{- if not (should_skip $ $query_name)}}
186+
177187
-- BatchExecDelete{{table_name $.Table.Name "many"}}{{query_index $key}} deletes multiple rows from '{{$.Table.Name}}' by {{$key.Name}} in a single batch operation.
178188
-- Executes the delete once for each provided key value and returns number of affected rows.
179189
-- name: {{$query_name}} :batchexec
@@ -185,6 +195,7 @@ WHERE
185195
{{end}}
186196
{{- $query_name := printf "Insert%s" (table_name .Table.Name "one")}}
187197
{{- if not (should_skip . $query_name)}}
198+
188199
-- Insert{{table_name .Table.Name "one"}} inserts a new row into '{{.Table.Name}}'.
189200
-- Returns the inserted row with all fields populated.
190201
-- name: {{$query_name}} :one
@@ -202,6 +213,7 @@ RETURNING *;
202213

203214
{{- $query_name := printf "ExecInsert%s" (table_name .Table.Name "one")}}
204215
{{- if not (should_skip . $query_name)}}
216+
205217
-- ExecInsert{{table_name .Table.Name "one"}} inserts a new row into '{{.Table.Name}}'.
206218
-- Returns number of affected rows (should always be 1 on success).
207219
-- name: {{$query_name}} :exec
@@ -218,6 +230,7 @@ INSERT INTO {{.Table.Name}} (
218230

219231
{{- $query_name := printf "BatchInsert%s" (table_name .Table.Name "many")}}
220232
{{- if not (should_skip . $query_name)}}
233+
221234
-- BatchInsert{{table_name .Table.Name "many"}} inserts multiple rows into '{{.Table.Name}}' in a single batch operation.
222235
-- Executes the insert once for each provided set of values and returns inserted rows.
223236
-- name: {{$query_name}} :batchone
@@ -235,6 +248,7 @@ RETURNING *;
235248

236249
{{- $query_name := printf "BatchExecInsert%s" (table_name .Table.Name "many")}}
237250
{{- if not (should_skip . $query_name)}}
251+
238252
-- BatchExecInsert{{table_name .Table.Name "many"}} inserts multiple rows into '{{.Table.Name}}' in a single batch operation.
239253
-- Executes the insert once for each provided set of values and returns number of affected rows.
240254
-- name: {{$query_name}} :batchexec
@@ -251,6 +265,7 @@ INSERT INTO {{.Table.Name}} (
251265

252266
{{- $query_name := printf "Copy%s" (table_name .Table.Name "many")}}
253267
{{- if not (should_skip . $query_name)}}
268+
254269
-- Copy{{table_name .Table.Name "many"}} efficiently bulk inserts multiple rows into '{{.Table.Name}}' using PostgreSQL COPY protocol.
255270
-- This is the fastest way to insert large amounts of data. Does not return inserted rows.
256271
-- name: {{$query_name}} :copyfrom
@@ -267,6 +282,7 @@ INSERT INTO {{.Table.Name}} (
267282

268283
{{- $query_name := printf "List%s" (table_name .Table.Name "many")}}
269284
{{- if not (should_skip . $query_name)}}
285+
270286
-- List{{table_name .Table.Name "many"}} retrieves a paginated list of rows from '{{$.Table.Name}}'.
271287
--
272288
-- Filtering:
@@ -303,6 +319,7 @@ OFFSET
303319

304320
{{range $idx, $key := .Table.GetNonUniqueIndexes}}{{- $query_name := printf "List%s%s" (table_name $.Table.Name "many") (query_index $key)}}
305321
{{- if not (should_skip $ $query_name)}}
322+
306323
-- List{{table_name $.Table.Name "many"}}{{query_index $key}} retrieves a paginated list of rows from '{{$.Table.Name}}'{{if $key.Name}} filtered by {{$key.Name}}{{end}}.
307324
--
308325
-- Filtering:
@@ -345,6 +362,7 @@ OFFSET
345362

346363
{{- $query_name := printf "Update%s%s" (table_name $.Table.Name "many") (query_index $key)}}
347364
{{- if not (should_skip $ $query_name)}}
365+
348366
-- Update{{table_name $.Table.Name "many"}}{{query_index $key}} updates multiple rows in '{{$.Table.Name}}'{{if $key.Name}} filtered by {{$key.Name}}{{end}}.
349367
-- Uses update_mask to specify which fields to update. Returns updated rows.
350368
-- name: {{$query_name}} :many
@@ -367,6 +385,7 @@ RETURNING *;
367385

368386
{{- $query_name := printf "ExecUpdate%s%s" (table_name $.Table.Name "many") (query_index $key)}}
369387
{{- if not (should_skip $ $query_name)}}
388+
370389
-- ExecUpdate{{table_name $.Table.Name "many"}}{{query_index $key}} updates multiple rows in '{{$.Table.Name}}'{{if $key.Name}} filtered by {{$key.Name}}{{end}}.
371390
-- Uses update_mask to specify which fields to update. Returns number of affected rows.
372391
-- name: {{$query_name}} :execrows
@@ -388,6 +407,7 @@ WHERE
388407

389408
{{- $query_name := printf "BatchUpdate%s%s" (table_name $.Table.Name "many") (query_index $key)}}
390409
{{- if not (should_skip $ $query_name)}}
410+
391411
-- BatchUpdate{{table_name $.Table.Name "many"}}{{query_index $key}} updates multiple rows in '{{$.Table.Name}}'{{if $key.Name}} by {{$key.Name}}{{end}} in a single batch operation.
392412
-- Uses update_mask for each row to specify which fields to update. Returns updated rows.
393413
-- name: {{$query_name}} :batchmany
@@ -410,6 +430,7 @@ RETURNING *;
410430

411431
{{- $query_name := printf "BatchExecUpdate%s%s" (table_name $.Table.Name "many") (query_index $key)}}
412432
{{- if not (should_skip $ $query_name)}}
433+
413434
-- BatchExecUpdate{{table_name $.Table.Name "many"}}{{query_index $key}} updates multiple rows in '{{$.Table.Name}}'{{if $key.Name}} by {{$key.Name}}{{end}} in a single batch operation.
414435
-- Uses update_mask for each row to specify which fields to update. Returns number of affected rows.
415436
-- name: {{$query_name}} :batchexec
@@ -431,6 +452,7 @@ WHERE
431452

432453
{{- $query_name := printf "Delete%s%s" (table_name $.Table.Name "many") (query_index $key)}}
433454
{{- if not (should_skip $ $query_name)}}
455+
434456
-- Delete{{table_name $.Table.Name "many"}}{{query_index $key}} deletes multiple rows from '{{$.Table.Name}}'{{if $key.Name}} filtered by {{$key.Name}}{{end}}.
435457
-- Returns the deleted rows.
436458
-- name: {{$query_name}} :many
@@ -445,6 +467,7 @@ RETURNING *;
445467

446468
{{- $query_name := printf "ExecDelete%s%s" (table_name $.Table.Name "many") (query_index $key)}}
447469
{{- if not (should_skip $ $query_name)}}
470+
448471
-- ExecDelete{{table_name $.Table.Name "many"}}{{query_index $key}} deletes multiple rows from '{{$.Table.Name}}'{{if $key.Name}} filtered by {{$key.Name}}{{end}}.
449472
-- Returns number of affected rows.
450473
-- name: {{$query_name}} :execrows
@@ -458,6 +481,7 @@ WHERE
458481

459482
{{- $query_name := printf "BatchDelete%s%s" (table_name $.Table.Name "many") (query_index $key)}}
460483
{{- if not (should_skip $ $query_name)}}
484+
461485
-- BatchDelete{{table_name $.Table.Name "many"}}{{query_index $key}} deletes multiple rows from '{{$.Table.Name}}'{{if $key.Name}} by {{$key.Name}}{{end}} in a single batch operation.
462486
-- Executes the delete once for each provided key value and returns deleted rows.
463487
-- name: {{$query_name}} :batchmany
@@ -472,6 +496,7 @@ RETURNING *;
472496

473497
{{- $query_name := printf "BatchExecDelete%s%s" (table_name $.Table.Name "many") (query_index $key)}}
474498
{{- if not (should_skip $ $query_name)}}
499+
475500
-- BatchExecDelete{{table_name $.Table.Name "many"}}{{query_index $key}} deletes multiple rows from '{{$.Table.Name}}'{{if $key.Name}} by {{$key.Name}}{{end}} in a single batch operation.
476501
-- Executes the delete once for each provided key value and returns number of affected rows.
477502
-- name: {{$query_name}} :batchexec

0 commit comments

Comments
 (0)