Skip to content

Commit d1a86c1

Browse files
jpmckinneyjpmckinney
committed
chore: Switch to sqlfluff
1 parent ed63d27 commit d1a86c1

20 files changed

+432
-141
lines changed

‎.github/workflows/lint.yml

-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ jobs:
1919
cache-dependency-path: '**/requirements*.txt'
2020
- id: changed-files
2121
uses: tj-actions/changed-files@v45
22-
# nbqa hook runs pg_format.
23-
- run: |
24-
sudo apt update
25-
sudo apt install pgformatter
2622
- uses: pre-commit/[email protected]
2723
continue-on-error: true
2824
with:

‎.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ repos:
2828
entry: nbqa manage
2929
name: nbqa-manage
3030
alias: nbqa-manage
31-
additional_dependencies: [click, jsonschema, nbmerge, nbformat]
31+
additional_dependencies: [click, jsonschema, nbmerge, nbformat, sqlfluff]

‎README.md

-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ For larger changes, you can review and comment on a visual diff by clicking the
136136

137137
## Format SQL cells and merge components to build notebooks:
138138

139-
1. Install [pg_format](https://github.com/darold/pgFormatter).
140139
1. Install requirements:
141140

142141
```bash

‎component_check_conformance.ipynb

+7
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
"source": [
100100
"%%sql ocid_prefix_release_check <<\n",
101101
"\n",
102+
"\n",
102103
"SELECT\n",
103104
" ocid\n",
104105
"FROM\n",
@@ -140,6 +141,7 @@
140141
"source": [
141142
"%%sql ocid_prefix_record_check <<\n",
142143
"\n",
144+
"\n",
143145
"SELECT\n",
144146
" ocid\n",
145147
"FROM\n",
@@ -200,6 +202,7 @@
200202
"source": [
201203
"%%sql\n",
202204
"\n",
205+
"\n",
203206
"SELECT\n",
204207
" collection_id,\n",
205208
" release_type,\n",
@@ -275,6 +278,7 @@
275278
"source": [
276279
"%%sql\n",
277280
"\n",
281+
"\n",
278282
"WITH check_results AS (\n",
279283
" SELECT\n",
280284
" *,\n",
@@ -374,6 +378,7 @@
374378
"source": [
375379
"%%sql additional_field_examples <<\n",
376380
"\n",
381+
"\n",
377382
"WITH additional_field_releases AS (\n",
378383
" SELECT\n",
379384
" ocid AS ocid,\n",
@@ -461,6 +466,7 @@
461466
"source": [
462467
"%%sql\n",
463468
"\n",
469+
"\n",
464470
"WITH check_results AS (\n",
465471
" SELECT\n",
466472
" *,\n",
@@ -536,6 +542,7 @@
536542
"source": [
537543
"%%sql\n",
538544
"\n",
545+
"\n",
539546
"SELECT DISTINCT ON (collection_id, path, deprecated_version, explanation)\n",
540547
" collection_id,\n",
541548
" regexp_replace(trim('\"' FROM paths::text), '\\/[0-9]+', '', 'g') || '/' || (deprecated_fields ->> 'field') AS path,\n",

‎component_check_quality.ipynb

+39-19
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
"source": [
8181
"%%sql\n",
8282
"\n",
83+
"\n",
8384
"SELECT\n",
8485
" collection_id,\n",
8586
" release_type,\n",
@@ -154,28 +155,30 @@
154155
" tag,\n",
155156
" count(contract -> 'implementation') AS contract_implementation\n",
156157
" FROM\n",
157-
" contracts_summary cs\n",
158-
" LEFT JOIN release_summary USING (id)\n",
158+
" contracts_summary AS cs\n",
159+
" LEFT JOIN release_summary USING (id)\n",
159160
" GROUP BY\n",
160161
" cs.collection_id, cs.release_type, tag\n",
161162
"),\n",
163+
"\n",
162164
"sections AS (\n",
163165
" SELECT\n",
164166
" collection_id,\n",
165167
" release_type,\n",
166168
" tag,\n",
167169
" count(*) AS release_count,\n",
168-
" count(RELEASE -> 'planning') AS planning,\n",
169-
" count(RELEASE -> 'tender') AS tender,\n",
170-
" count(RELEASE -> 'awards') AS award,\n",
171-
" count(RELEASE -> 'contracts') AS contract\n",
170+
" count(release -> 'planning') AS planning,\n",
171+
" count(release -> 'tender') AS tender,\n",
172+
" count(release -> 'awards') AS award,\n",
173+
" count(release -> 'contracts') AS contract\n",
172174
" FROM\n",
173175
" release_summary\n",
174176
" GROUP BY\n",
175177
" collection_id,\n",
176178
" release_type,\n",
177179
" tag\n",
178180
")\n",
181+
"\n",
179182
"SELECT\n",
180183
" collection_id,\n",
181184
" release_type,\n",
@@ -188,8 +191,7 @@
188191
" contract_implementation\n",
189192
"FROM\n",
190193
" sections\n",
191-
" LEFT JOIN contract_implementation USING (collection_id, release_type, tag);\n",
192-
"\n"
194+
"LEFT JOIN contract_implementation USING (collection_id, release_type, tag);\n"
193195
],
194196
"execution_count": null,
195197
"outputs": []
@@ -246,15 +248,20 @@
246248
" release_type,\n",
247249
" date,\n",
248250
" count(*) AS release_count,\n",
249-
" row_number() OVER (PARTITION BY collection_id,\n",
250-
" release_type ORDER BY count(*) DESC) AS row_number\n",
251+
" row_number() OVER (\n",
252+
" PARTITION BY\n",
253+
" collection_id,\n",
254+
" release_type\n",
255+
" ORDER BY count(*) DESC\n",
256+
" ) AS row_number\n",
251257
" FROM\n",
252258
" release_summary\n",
253259
" GROUP BY\n",
254260
" collection_id,\n",
255261
" release_type,\n",
256262
" date\n",
257263
")\n",
264+
"\n",
258265
"SELECT\n",
259266
" collection_id,\n",
260267
" release_type,\n",
@@ -265,10 +272,9 @@
265272
"WHERE\n",
266273
" row_number <= 5\n",
267274
"ORDER BY\n",
268-
" collection_id,\n",
269-
" release_type,\n",
270-
" release_count DESC;\n",
271-
"\n"
275+
" collection_id ASC,\n",
276+
" release_type ASC,\n",
277+
" release_count DESC;\n"
272278
],
273279
"execution_count": null,
274280
"outputs": []
@@ -310,19 +316,19 @@
310316
"source": [
311317
"%%sql\n",
312318
"\n",
313-
"SELECT DISTINCT ON (collection_id, release_type,\n",
314-
" LANGUAGE)\n",
319+
"SELECT DISTINCT ON (\n",
320+
" collection_id, release_type,\n",
321+
" language)\n",
315322
" collection_id,\n",
316323
" release_type,\n",
317-
" LANGUAGE,\n",
324+
" language,\n",
318325
" release AS example_release\n",
319326
"FROM\n",
320327
" release_summary\n",
321328
"ORDER BY\n",
322329
" collection_id,\n",
323330
" release_type,\n",
324-
" LANGUAGE;\n",
325-
"\n"
331+
" language;\n"
326332
],
327333
"execution_count": null,
328334
"outputs": []
@@ -396,6 +402,7 @@
396402
"source": [
397403
"%%sql\n",
398404
"\n",
405+
"\n",
399406
"WITH release_counts AS (\n",
400407
" SELECT\n",
401408
" collection_id,\n",
@@ -445,6 +452,7 @@
445452
"source": [
446453
"%%sql release_count_summary <<\n",
447454
"\n",
455+
"\n",
448456
"WITH release_counts AS (\n",
449457
" SELECT\n",
450458
" collection_id,\n",
@@ -505,6 +513,7 @@
505513
"source": [
506514
"%%sql release_counts <<\n",
507515
"\n",
516+
"\n",
508517
"WITH release_counts AS (\n",
509518
" SELECT\n",
510519
" collection_id,\n",
@@ -572,6 +581,7 @@
572581
"source": [
573582
"%%sql multiple_release_examples <<\n",
574583
"\n",
584+
"\n",
575585
"WITH ranked_ocids AS (\n",
576586
" SELECT\n",
577587
" collection_id,\n",
@@ -680,6 +690,7 @@
680690
"source": [
681691
"%%sql\n",
682692
"\n",
693+
"\n",
683694
"SELECT\n",
684695
" collection_id,\n",
685696
" release_type,\n",
@@ -712,6 +723,7 @@
712723
"source": [
713724
"%%sql\n",
714725
"\n",
726+
"\n",
715727
"SELECT\n",
716728
" ocid,\n",
717729
" release_id,\n",
@@ -746,6 +758,7 @@
746758
"source": [
747759
"%%sql duplicate_release_ids <<\n",
748760
"\n",
761+
"\n",
749762
"WITH release_ids AS (\n",
750763
" SELECT\n",
751764
" collection_id AS collection_id,\n",
@@ -848,6 +861,7 @@
848861
"source": [
849862
"%%sql\n",
850863
"\n",
864+
"\n",
851865
"SELECT\n",
852866
" contracts_summary.collection_id,\n",
853867
" contracts_summary.release_type,\n",
@@ -917,6 +931,7 @@
917931
"source": [
918932
"%%sql\n",
919933
"\n",
934+
"\n",
920935
"SELECT\n",
921936
" tender_summary.collection_id,\n",
922937
" tender_summary.release_type,\n",
@@ -980,6 +995,7 @@
980995
"source": [
981996
"%%sql example_releases <<\n",
982997
"\n",
998+
"\n",
983999
"WITH examples AS (\n",
9841000
" SELECT DISTINCT ON (collection_id,\n",
9851001
" release_type)\n",
@@ -1065,6 +1081,7 @@
10651081
"source": [
10661082
"%%sql organization_identifiers <<\n",
10671083
"\n",
1084+
"\n",
10681085
"SELECT\n",
10691086
" collection_id,\n",
10701087
" release_type,\n",
@@ -1134,6 +1151,7 @@
11341151
"source": [
11351152
"%%sql\n",
11361153
"\n",
1154+
"\n",
11371155
"WITH documents AS (\n",
11381156
" SELECT\n",
11391157
" collection_id,\n",
@@ -1257,6 +1275,7 @@
12571275
"source": [
12581276
"%%sql\n",
12591277
"\n",
1278+
"\n",
12601279
"SELECT\n",
12611280
" collection_id,\n",
12621281
" release_type,\n",
@@ -1344,6 +1363,7 @@
13441363
"source": [
13451364
"%%sql\n",
13461365
"\n",
1366+
"\n",
13471367
"SELECT\n",
13481368
" collection_id,\n",
13491369
" release_type,\n",

‎component_check_structure.ipynb

+3
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
"source": [
6363
"%%sql\n",
6464
"\n",
65+
"\n",
6566
"SELECT\n",
6667
" collection_id,\n",
6768
" 'release' AS collection_type,\n",
@@ -130,6 +131,7 @@
130131
"source": [
131132
"%%sql structure_and_format_error_summary <<\n",
132133
"\n",
134+
"\n",
133135
"WITH errors AS (\n",
134136
" SELECT\n",
135137
" collection_id,\n",
@@ -247,6 +249,7 @@
247249
"source": [
248250
"%%sql structure_and_format_errors <<\n",
249251
"\n",
252+
"\n",
250253
"SELECT\n",
251254
" collection_id,\n",
252255
" 'release' AS collection_type,\n",

‎component_errors_kingfisher.ipynb

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
"source": [
7575
"%%sql\n",
7676
"\n",
77+
"\n",
7778
"SELECT\n",
7879
" collection_id,\n",
7980
" code,\n",

‎component_scope_kingfisher.ipynb

+5-2
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
"source": [
7171
"%%sql\n",
7272
"\n",
73+
"\n",
7374
"SELECT\n",
7475
" id AS collection_id,\n",
7576
" cached_releases_count AS releases_count,\n",
@@ -188,6 +189,7 @@
188189
"source": [
189190
"%%sql objects_per_stage <<\n",
190191
"\n",
192+
"\n",
191193
"SELECT\n",
192194
" CASE WHEN paths.path = 'contracts/implementation' THEN\n",
193195
" 'implementation'\n",
@@ -302,8 +304,7 @@
302304
"ORDER BY\n",
303305
" collection_id,\n",
304306
" release_type,\n",
305-
" date_type;\n",
306-
"\n"
307+
" date_type;\n"
307308
],
308309
"execution_count": null,
309310
"outputs": []
@@ -336,6 +337,7 @@
336337
"source": [
337338
"%%sql release_dates <<\n",
338339
"\n",
340+
"\n",
339341
"SELECT\n",
340342
" collection_id::text,\n",
341343
" release_type,\n",
@@ -408,6 +410,7 @@
408410
"source": [
409411
"%%sql\n",
410412
"\n",
413+
"\n",
411414
"SELECT\n",
412415
" collection_id,\n",
413416
" release_type,\n",

0 commit comments

Comments
 (0)