Auto-format .sql files using github.com/sql-formatter-org/sql-formatter - pascals-triangle (#165)

[no important files changed]

Author: IsaacG

exercises/practice/pascals-triangle/.meta/example.sql

@@ -1,23 +1,48 @@
 UPDATE "pascals-triangle"
-SET result = (
-  WITH RECURSIVE counter(k) AS (
-    SELECT 1 UNION ALL
-    SELECT k + 1 FROM counter WHERE k < input
-  )
-
-  SELECT group_concat(
-    (
-      WITH RECURSIVE nums(idx, s) AS (
-        SELECT 1, 1 UNION ALL
-        SELECT idx + 1, s * k / idx - s FROM nums WHERE idx < k
+SET
+  result = (
+    WITH RECURSIVE
+      counter (k) AS (
+        SELECT
+          1
+        UNION ALL
+        SELECT
+          k + 1
+        FROM
+          counter
+        WHERE
+          k < input
       )
-
-      SELECT group_concat(s, ' ') FROM nums
-    ),
-    char(10)  -- newline
-  ) FROM counter
-);
+    SELECT
+      group_concat(
+        (
+          WITH RECURSIVE
+            nums (idx, s) AS (
+              SELECT
+                1,
+                1
+              UNION ALL
+              SELECT
+                idx + 1,
+                s * k / idx - s
+              FROM
+                nums
+              WHERE
+                idx < k
+            )
+          SELECT
+            group_concat(s, ' ')
+          FROM
+            nums
+        ),
+        char(10) -- newline
+      )
+    FROM
+      counter
+  );
 
 UPDATE "pascals-triangle"
-SET result = ''
-WHERE input = 0;
+SET
+  result = ''
+WHERE
+  input = 0;

exercises/practice/pascals-triangle/create_fixture.sql

@@ -1,8 +1,6 @@
 DROP TABLE IF EXISTS "pascals-triangle";
-CREATE TABLE "pascals-triangle" (
-    "input" INT,
-    "result" TEXT
-);
+
+CREATE TABLE "pascals-triangle" ("input" INT, "result" TEXT);
 
 .mode csv
 .import ./data.csv pascals-triangle

exercises/practice/pascals-triangle/pascals-triangle_test.sql

@@ -1,33 +1,71 @@
 -- Setup test table and read in student solution:
 .read ./test_setup.sql
-
 -- Test cases:
-INSERT INTO tests (name, uuid,
-                    input, expected)
-    VALUES
-        ('zero rows', '9920ce55-9629-46d5-85d6-4201f4a4234d', 0, ''),
-        ('single row', '70d643ce-a46d-4e93-af58-12d88dd01f21', 1, '1'),
-        ('two rows', 'a6e5a2a2-fc9a-4b47-9f4f-ed9ad9fbe4bd', 2, '1
-1 1'),
-        ('three rows', '97206a99-79ba-4b04-b1c5-3c0fa1e16925', 3, '1
+INSERT INTO
+  tests (name, uuid, input, expected)
+VALUES
+  (
+    'zero rows',
+    '9920ce55-9629-46d5-85d6-4201f4a4234d',
+    0,
+    ''
+  ),
+  (
+    'single row',
+    '70d643ce-a46d-4e93-af58-12d88dd01f21',
+    1,
+    '1'
+  ),
+  (
+    'two rows',
+    'a6e5a2a2-fc9a-4b47-9f4f-ed9ad9fbe4bd',
+    2,
+    '1
+1 1'
+  ),
+  (
+    'three rows',
+    '97206a99-79ba-4b04-b1c5-3c0fa1e16925',
+    3,
+    '1
 1 1
-1 2 1'),
-        ('four rows', '565a0431-c797-417c-a2c8-2935e01ce306', 4, '1
+1 2 1'
+  ),
+  (
+    'four rows',
+    '565a0431-c797-417c-a2c8-2935e01ce306',
+    4,
+    '1
 1 1
 1 2 1
-1 3 3 1'),
-        ('five rows', '06f9ea50-9f51-4eb2-b9a9-c00975686c27', 5, '1
+1 3 3 1'
+  ),
+  (
+    'five rows',
+    '06f9ea50-9f51-4eb2-b9a9-c00975686c27',
+    5,
+    '1
 1 1
 1 2 1
 1 3 3 1
-1 4 6 4 1'),
-        ('six rows', 'c3912965-ddb4-46a9-848e-3363e6b00b13', 6, '1
+1 4 6 4 1'
+  ),
+  (
+    'six rows',
+    'c3912965-ddb4-46a9-848e-3363e6b00b13',
+    6,
+    '1
 1 1
 1 2 1
 1 3 3 1
 1 4 6 4 1
-1 5 10 10 5 1'),
-        ('ten rows', '6cb26c66-7b57-4161-962c-81ec8c99f16b', 10, '1
+1 5 10 10 5 1'
+  ),
+  (
+    'ten rows',
+    '6cb26c66-7b57-4161-962c-81ec8c99f16b',
+    10,
+    '1
 1 1
 1 2 1
 1 3 3 1
@@ -36,13 +74,23 @@ INSERT INTO tests (name, uuid,
 1 6 15 20 15 6 1
 1 7 21 35 35 21 7 1
 1 8 28 56 70 56 28 8 1
-1 9 36 84 126 126 84 36 9 1');
+1 9 36 84 126 126 84 36 9 1'
+  );
 
 -- Comparison of user input and the tests updates the status for each test:
 UPDATE tests
-SET status = 'pass'
-FROM (SELECT input, result FROM "pascals-triangle") AS actual
-WHERE (actual.input, actual.result) = (tests.input, tests.expected);
+SET
+  status = 'pass'
+FROM
+  (
+    SELECT
+      input,
+      result
+    FROM
+      "pascals-triangle"
+  ) AS actual
+WHERE
+  (actual.input, actual.result) = (tests.input, tests.expected);
 
 -- Write results and debug info:
 .read ./test_reporter.sql

exercises/practice/pascals-triangle/test_reporter.sql

@@ -1,20 +1,39 @@
 -- Update message for failed tests to give helpful information:
 UPDATE tests
-SET message = (
-    'Result for ' || tests.input
-    || ' is:' || char(10) || COALESCE(actual.result, 'NULL')
-    || char(10) || 'but should be:' || char(10) || tests.expected
-)
-FROM (SELECT input, result FROM "pascals-triangle") AS actual
-WHERE actual.input = tests.input AND tests.status = 'fail';
+SET
+  message = (
+    'Result for ' || tests.input || ' is:' || char(10) || COALESCE(actual.result, 'NULL') || char(10) || 'but should be:' || char(10) || tests.expected
+  )
+FROM
+  (
+    SELECT
+      input,
+      result
+    FROM
+      "pascals-triangle"
+  ) AS actual
+WHERE
+  actual.input = tests.input
+  AND tests.status = 'fail';
 
 -- Save results to ./output.json (needed by the online test-runner)
 .mode json
 .once './output.json'
-SELECT name, status, message, output, test_code, task_id
-FROM tests;
+SELECT
+  name,
+  status,
+  message,
+  output,
+  test_code,
+  task_id
+FROM
+  tests;
 
 -- Display test results in readable form for the student:
 .mode table
-SELECT name, status, message
-FROM tests;
+SELECT
+  name,
+  status,
+  message
+FROM
+  tests;

exercises/practice/pascals-triangle/test_setup.sql

@@ -1,25 +1,24 @@
 -- Create database:
 .read ./create_fixture.sql
-
 -- Read user student solution and save any output as markdown in user_output.md:
 .mode markdown
 .output user_output.md
 .read ./pascals-triangle.sql
 .output
-
 -- Create a clean testing environment:
 DROP TABLE IF EXISTS tests;
+
 CREATE TABLE IF NOT EXISTS tests (
-    -- uuid and name (description) are taken from the test.toml file
-    uuid TEXT PRIMARY KEY,
-    name TEXT NOT NULL,
-    -- The following section is needed by the online test-runner
-    status TEXT DEFAULT 'fail',
-    message TEXT,
-    output TEXT,
-    test_code TEXT,
-    task_id INTEGER DEFAULT NULL,
-    -- Here are columns for the actual tests
-    input INT NOT NULL,
-    expected TEXT NOT NULL
+  -- uuid and name (description) are taken from the test.toml file
+  uuid TEXT PRIMARY KEY,
+  name TEXT NOT NULL,
+  -- The following section is needed by the online test-runner
+  status TEXT DEFAULT 'fail',
+  message TEXT,
+  output TEXT,
+  test_code TEXT,
+  task_id INTEGER DEFAULT NULL,
+  -- Here are columns for the actual tests
+  input INT NOT NULL,
+  expected TEXT NOT NULL
 );