Skip to content

Commit 6cc2197

Browse files
author
Andy C
committed
[test/aports reformat] Format SQL with prettier plugin
1 parent 0992ce0 commit 6cc2197

File tree

3 files changed

+78
-63
lines changed

3 files changed

+78
-63
lines changed

devtools/format.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,4 +146,18 @@ test-asdl-format() {
146146
diff -u $file $tmp
147147
}
148148

149+
install-npm() {
150+
# ridiculous number of deps
151+
sudo apt-get install npm
152+
}
153+
154+
install-sql-cst-plugin() {
155+
# from https://github.com/nene/prettier-plugin-sql-cst/
156+
npm install --save-dev prettier prettier-plugin-sql-cst
157+
}
158+
159+
all-sql() {
160+
npx prettier --plugin prettier-plugin-sql-cst --parser sqlite --write */*.sql
161+
}
162+
149163
task-five "$@"

test/aports-diff.sql

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,39 @@
22
ATTACH DATABASE 'baseline/tables.db' AS baseline;
33
ATTACH DATABASE 'osh-as-sh/tables.db' AS osh_as_sh;
44

5-
.mode columns
5+
-- .mode columns
66
-- select * from packages;
77

8-
create table diff as
9-
select
10-
b.pkg,
11-
cast(b.status as integer) as status1,
12-
"baseline" as baseline,
13-
"baseline/" || b.pkg_HREF as baseline_HREF,
14-
o.status as status2,
15-
"osh-as-sh" as osh_as_sh,
16-
"osh-as-sh/" || o.pkg_HREF as osh_as_sh_HREF,
17-
"diff" as diff,
18-
printf("error/%s.txt", b.pkg) as diff_HREF,
19-
"error" as error_grep,
20-
printf("error/%s.txt", b.pkg) as error_grep_HREF
21-
from baseline.packages b
22-
join osh_as_sh.packages o on b.pkg = o.pkg
23-
where b.status != o.status
24-
order by b.pkg;
8+
CREATE TABLE diff AS
9+
SELECT
10+
b.pkg,
11+
CAST(b.status AS INTEGER) AS status1,
12+
"baseline" AS baseline,
13+
"baseline/" || b.pkg_HREF AS baseline_HREF,
14+
o.status AS status2,
15+
"osh-as-sh" AS osh_as_sh,
16+
"osh-as-sh/" || o.pkg_HREF AS osh_as_sh_HREF,
17+
"diff" AS diff,
18+
printf("error/%s.txt", b.pkg) AS diff_HREF,
19+
"error" AS error_grep,
20+
printf("error/%s.txt", b.pkg) AS error_grep_HREF
21+
FROM
22+
baseline.packages AS b
23+
JOIN osh_as_sh.packages AS o ON b.pkg = o.pkg
24+
WHERE b.status != o.status
25+
ORDER BY b.pkg;
2526

2627
-- Copied from above
2728
CREATE TABLE diff_schema AS
28-
SELECT
29+
SELECT
2930
name AS column_name,
30-
CASE
31-
WHEN UPPER(type) = "INTEGER" THEN "integer"
32-
WHEN UPPER(type) = "REAL" THEN "float"
33-
WHEN UPPER(type) = "TEXT" THEN "string"
34-
ELSE LOWER(type)
31+
CASE
32+
WHEN UPPER(type) = "INTEGER" THEN "integer"
33+
WHEN UPPER(type) = "REAL" THEN "float"
34+
WHEN UPPER(type) = "TEXT" THEN "string"
35+
ELSE LOWER(type)
3536
END AS type
36-
FROM PRAGMA_TABLE_INFO("diff");
37+
FROM PRAGMA_TABLE_INFO("diff");
3738

3839
-- Detach databases
3940
DETACH DATABASE baseline;

test/aports-tasks.sql

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
11
-- select * from tasks limit 5;
22

33
-- annoying: you have to cast(x as real) for pragma_info to have type info
4-
create table packages as
5-
select status,
6-
elapsed_secs,
7-
cast( user_secs / elapsed_secs as real) as user_elapsed_ratio,
8-
cast( user_secs / sys_secs as real) as user_sys_ratio,
9-
cast(max_rss_KiB * 1024 / 1e6 as real) as max_rss_MB,
10-
pkg,
11-
pkg_HREF
12-
from tasks;
4+
CREATE TABLE packages AS
5+
SELECT
6+
status,
7+
elapsed_secs,
8+
CAST(user_secs / elapsed_secs AS REAL) AS user_elapsed_ratio,
9+
CAST(user_secs / sys_secs AS REAL) AS user_sys_ratio,
10+
CAST(max_rss_KiB * 1024 / 1e6 AS REAL) AS max_rss_MB,
11+
pkg,
12+
pkg_HREF
13+
FROM tasks;
1314

1415
-- sqlite table schema -> foo.schema.tsv
1516
CREATE TABLE packages_schema AS
16-
SELECT
17+
SELECT
1718
name AS column_name,
18-
CASE
19-
WHEN UPPER(type) = "INTEGER" THEN "integer"
20-
WHEN UPPER(type) = "REAL" THEN "float"
21-
WHEN UPPER(type) = "TEXT" THEN "string"
22-
ELSE LOWER(type)
19+
CASE
20+
WHEN UPPER(type) = "INTEGER" THEN "integer"
21+
WHEN UPPER(type) = "REAL" THEN "float"
22+
WHEN UPPER(type) = "TEXT" THEN "string"
23+
ELSE LOWER(type)
2324
END AS type
24-
FROM PRAGMA_TABLE_INFO("packages");
25+
FROM PRAGMA_TABLE_INFO("packages");
2526

2627
-- select * from packages_schema;
2728

28-
alter table packages_schema add column precision;
29+
ALTER TABLE packages_schema ADD COLUMN precision;
2930

30-
update packages_schema SET precision = 1 where column_name = "elapsed_secs";
31-
update packages_schema SET precision = 1 where column_name = "user_elapsed_ratio";
32-
update packages_schema SET precision = 1 where column_name = "user_sys_ratio";
33-
update packages_schema SET precision = 1 where column_name = "max_rss_MB";
31+
UPDATE packages_schema SET precision = 1 WHERE column_name = "elapsed_secs";
32+
UPDATE packages_schema
33+
SET precision = 1
34+
WHERE column_name = "user_elapsed_ratio";
35+
UPDATE packages_schema SET precision = 1 WHERE column_name = "user_sys_ratio";
36+
UPDATE packages_schema SET precision = 1 WHERE column_name = "max_rss_MB";
3437

3538
-- Compute stats
3639

3740
CREATE TABLE metrics (
38-
id integer primary key check (id = 1), -- ensure only one row
41+
id INTEGER PRIMARY KEY CHECK (id = 1), -- ensure only one row
3942
elapsed_minutes REAL NOT NULL,
40-
num_failures integer NOT NULL,
41-
num_tasks integer NOT NULL
43+
num_failures INTEGER NOT NULL,
44+
num_tasks INTEGER NOT NULL
4245
);
4346

44-
# dummy row
45-
insert into metrics values (1, -1.0, -1, -1);
47+
-- dummy row
48+
INSERT INTO metrics VALUES (1, -1.0, -1, -1);
4649

47-
update metrics
48-
set elapsed_minutes =
49-
(select ( max(end_time)-min(start_time) ) / 60 from tasks)
50-
where id = 1;
50+
UPDATE metrics
51+
SET elapsed_minutes = (SELECT (max(end_time) - min(start_time)) / 60 FROM tasks)
52+
WHERE id = 1;
5153

52-
update metrics
53-
set num_failures =
54-
(select count(*) from tasks where status != 0)
55-
where id = 1;
54+
UPDATE metrics
55+
SET num_failures = (SELECT count(*) FROM tasks WHERE status != 0)
56+
WHERE id = 1;
5657

57-
update metrics
58-
set num_tasks =
59-
(select count(*) from tasks)
60-
where id = 1;
58+
UPDATE metrics
59+
SET num_tasks = (SELECT count(*) FROM tasks)
60+
WHERE id = 1;

0 commit comments

Comments
 (0)