Auto-format .sql files using github.com/sql-formatter-org/sql-formatter - eliuds-eggs (#149)

[no important files changed]

Author: IsaacG

exercises/practice/eliuds-eggs/.meta/example.sql

@@ -1,14 +1,39 @@
 UPDATE "eliuds-eggs"
-SET result = 0;
+SET
+  result = 0;
 
 UPDATE "eliuds-eggs"
-SET result = counter FROM
-    (WITH RECURSIVE powers_of_two(x) AS (
-                SELECT 1
-                UNION ALL
-                SELECT x*2 FROM powers_of_two WHERE x<=(SELECT MAX(number) FROM "eliuds-eggs")
-                )
-    SELECT  number, sum(number / (x / 2) % 2) as counter FROM powers_of_two, "eliuds-eggs"
-    WHERE x <= 2*number
-    GROUP BY number) AS calculation
-WHERE calculation.number = "eliuds-eggs".number;
+SET
+  result = counter
+FROM
+  (
+    WITH RECURSIVE
+      powers_of_two (x) AS (
+        SELECT
+          1
+        UNION ALL
+        SELECT
+          x * 2
+        FROM
+          powers_of_two
+        WHERE
+          x <= (
+            SELECT
+              MAX(number)
+            FROM
+              "eliuds-eggs"
+          )
+      )
+    SELECT
+      number,
+      sum(number / (x / 2) % 2) as counter
+    FROM
+      powers_of_two,
+      "eliuds-eggs"
+    WHERE
+      x <= 2 * number
+    GROUP BY
+      number
+  ) AS calculation
+WHERE
+  calculation.number = "eliuds-eggs".number;

exercises/practice/eliuds-eggs/create_fixture.sql

@@ -1,10 +1,7 @@
 DROP TABLE IF EXISTS "eliuds-eggs";
-CREATE TABLE "eliuds-eggs" (
-    "number" INT,
-    "result" INT
-);
 
--- Note: the CSV file may contain literal tab, newline, carriage returns.
+CREATE TABLE "eliuds-eggs" ("number" INT, "result" INT);
 
+-- Note: the CSV file may contain literal tab, newline, carriage returns.
 .mode csv
 .import ./data.csv eliuds-eggs

exercises/practice/eliuds-eggs/eliuds-eggs_test.sql

@@ -1,26 +1,49 @@
 -- Setup test table and read in student solution:
 .read ./test_setup.sql
-
 -- Test cases:
 -- Note: the strings below _may_ contain literal tab, newline, or carriage returns.
-
-INSERT INTO tests (name, uuid,
-                    number, expected)
-    VALUES
-        ('0 eggs', '559e789d-07d1-4422-9004-3b699f83bca3',
-            0, 0),
-        ('1 egg', '97223282-f71e-490c-92f0-b3ec9e275aba',
-            16, 1),
-        ('4 eggs', '1f8fd18f-26e9-4144-9a0e-57cdfc4f4ff5',
-            89, 4),
-        ('13 eggs', '0c18be92-a498-4ef2-bcbb-28ac4b06cb81',
-            2000000000, 13);
+INSERT INTO
+  tests (name, uuid, number, expected)
+VALUES
+  (
+    '0 eggs',
+    '559e789d-07d1-4422-9004-3b699f83bca3',
+    0,
+    0
+  ),
+  (
+    '1 egg',
+    '97223282-f71e-490c-92f0-b3ec9e275aba',
+    16,
+    1
+  ),
+  (
+    '4 eggs',
+    '1f8fd18f-26e9-4144-9a0e-57cdfc4f4ff5',
+    89,
+    4
+  ),
+  (
+    '13 eggs',
+    '0c18be92-a498-4ef2-bcbb-28ac4b06cb81',
+    2000000000,
+    13
+  );
 
 -- Comparison of user input and the tests updates the status for each test:
 UPDATE tests
-SET status = 'pass'
-FROM (SELECT number, result FROM "eliuds-eggs") AS actual
-WHERE (actual.number, actual.result) = (tests.number, tests.expected);
+SET
+  status = 'pass'
+FROM
+  (
+    SELECT
+      number,
+      result
+    FROM
+      "eliuds-eggs"
+  ) AS actual
+WHERE
+  (actual.number, actual.result) = (tests.number, tests.expected);
 
 -- Write results and debug info:
 .read ./test_reporter.sql

exercises/practice/eliuds-eggs/test_reporter.sql

@@ -1,20 +1,39 @@
 -- Update message for failed tests to give helpful information:
 UPDATE tests
-SET message = (
-    'Result for ' || tests.number
-    || ' is <' || COALESCE(actual.result, 'NULL')
-    || '> but should be <' || tests.expected || '>'
-)
-FROM (SELECT number, result FROM "eliuds-eggs") AS actual
-WHERE actual.number = tests.number AND tests.status = 'fail';
+SET
+  message = (
+    'Result for ' || tests.number || ' is <' || COALESCE(actual.result, 'NULL') || '> but should be <' || tests.expected || '>'
+  )
+FROM
+  (
+    SELECT
+      number,
+      result
+    FROM
+      "eliuds-eggs"
+  ) AS actual
+WHERE
+  actual.number = tests.number
+  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/eliuds-eggs/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 ./eliuds-eggs.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
-    number 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
+  number INT NOT NULL,
+  expected TEXT NOT NULL
 );