Auto-format .sql files using github.com/sql-formatter-org/sql-formatter - two-fer (#186)

Author: IsaacG

exercises/practice/two-fer/.meta/example.sql

@@ -1,7 +1,6 @@
 UPDATE twofer
-SET response = 'One for ' ||
-    CASE
-        WHEN input = '' THEN 'you'
-        ELSE input
-    END ||
-    ', one for me.';
+SET
+  response = 'One for ' || CASE
+    WHEN input = '' THEN 'you'
+    ELSE input
+  END || ', one for me.';

exercises/practice/two-fer/create_fixture.sql

@@ -1,10 +1,7 @@
 DROP TABLE IF EXISTS twofer;
-CREATE TABLE "twofer" (
-    "input" TEXT,
-    "response" TEXT
-);
 
--- Note: the CSV file contain literal tab, newline, carriage returns.
+CREATE TABLE "twofer" ("input" TEXT, "response" TEXT);
 
+-- Note: the CSV file contain literal tab, newline, carriage returns.
 .mode csv
 .import ./data.csv twofer

exercises/practice/two-fer/test_reporter.sql

@@ -1,19 +1,38 @@
 UPDATE tests
-SET message = (
-    'Result for ' || tests.input
-    || ' is <' || COALESCE(actual.response, 'NULL')
-    || '> but should be <' || tests.expected || '>'
-)
-FROM (SELECT input, response FROM twofer) AS actual
-WHERE actual.input = tests.input AND tests.status = 'fail';
+SET
+  message = (
+    'Result for ' || tests.input || ' is <' || COALESCE(actual.response, 'NULL') || '> but should be <' || tests.expected || '>'
+  )
+FROM
+  (
+    SELECT
+      input,
+      response
+    FROM
+      twofer
+  ) 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/two-fer/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 ./two-fer.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 TEXT 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 TEXT NOT NULL,
+  expected TEXT NOT NULL
 );

exercises/practice/two-fer/two-fer_test.sql

@@ -1,22 +1,42 @@
 -- Setup test table and read in student solution:
 .read ./test_setup.sql
-
 -- Test cases:
-INSERT INTO tests (name, uuid,
-                    input, expected)
-    VALUES
-        ('no name given', '1cf3e15a-a3d7-4a87-aeb3-ba1b43bc8dce',
-            '', 'One for you, one for me.'),
-        ('a name given', 'b4c6dbb8-b4fb-42c2-bafd-10785abe7709',
-            'Alice', 'One for Alice, one for me.'),
-        ('another name given', '3549048d-1a6e-4653-9a79-b0bda163e8d5',
-            'Bob', 'One for Bob, one for me.');
+INSERT INTO
+  tests (name, uuid, input, expected)
+VALUES
+  (
+    'no name given',
+    '1cf3e15a-a3d7-4a87-aeb3-ba1b43bc8dce',
+    '',
+    'One for you, one for me.'
+  ),
+  (
+    'a name given',
+    'b4c6dbb8-b4fb-42c2-bafd-10785abe7709',
+    'Alice',
+    'One for Alice, one for me.'
+  ),
+  (
+    'another name given',
+    '3549048d-1a6e-4653-9a79-b0bda163e8d5',
+    'Bob',
+    'One for Bob, one for me.'
+  );
 
 -- Comparison of user input and the tests updates the status for each test:
 UPDATE tests
-SET status = 'pass'
-FROM (SELECT input, response FROM twofer) AS actual
-WHERE (actual.input, actual.response) = (tests.input, tests.expected);
+SET
+  status = 'pass'
+FROM
+  (
+    SELECT
+      input,
+      response
+    FROM
+      twofer
+  ) AS actual
+WHERE
+  (actual.input, actual.response) = (tests.input, tests.expected);
 
 -- Write results and debug info:
 .read ./test_reporter.sql