longer now includes null values (#371)

nshiab · Mar 27, 2024 · fdd64fc · fdd64fc
1 parent c2fef1b
commit fdd64fc
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 10 deletions.
diff --git a/src/class/SimpleDB.ts b/src/class/SimpleDB.ts
@@ -746,11 +746,12 @@ export default class SimpleDB {
     ) {
         await queryDB(
             this,
-            `CREATE OR REPLACE TABLE ${table} AS SELECT * FROM (UNPIVOT ${table}
-        ON ${columns.map((d) => `"${d}"`).join(", ")}
-        INTO
-            NAME ${columnsTo}
-            VALUE ${valuesTo})`,
+            `CREATE OR REPLACE TABLE ${table} AS SELECT * FROM (
+                FROM "${table}" UNPIVOT INCLUDE NULLS (
+                "${valuesTo}"
+                for "${columnsTo}" in (${columns.map((d) => `"${d}"`).join(", ")})
+                )
+            )`,
             mergeOptions(this, {
                 table,
                 method: "longer()",

diff --git a/test/data/files/dataUntidyWithNulls.json b/test/data/files/dataUntidyWithNulls.json
@@ -0,0 +1,29 @@
+[
+    {
+        "Department": "accounting",
+        "2015": null,
+        "2016": 9,
+        "2017": 15,
+        "2018": 11,
+        "2019": 25,
+        "2020": 32
+    },
+    {
+        "Department": "R&D",
+        "2015": 1,
+        "2016": 2,
+        "2017": null,
+        "2018": 2,
+        "2019": 2,
+        "2020": 3
+    },
+    {
+        "Department": "sales",
+        "2015": 2,
+        "2016": 7,
+        "2017": 15,
+        "2018": 32,
+        "2019": 45,
+        "2020": null
+    }
+]
diff --git a/test/unit/methods/longer.test.ts b/test/unit/methods/longer.test.ts
@@ -5,16 +5,16 @@ describe("longer", () => {
     let simpleNodeDB: SimpleNodeDB
     before(async function () {
         simpleNodeDB = new SimpleNodeDB()
-        await simpleNodeDB.loadData(
-            "dataUntidy",
-            "test/data/files/dataUntidy.json"
-        )
     })
     after(async function () {
         await simpleNodeDB.done()
     })
 
     it("should tidy data by stacking mutiple columns", async () => {
+        await simpleNodeDB.loadData(
+            "dataUntidy",
+            "test/data/files/dataUntidy.json"
+        )
         await simpleNodeDB.longer(
             "dataUntidy",
             ["2015", "2016", "2017", "2018", "2019", "2020"],
@@ -23,7 +23,6 @@ describe("longer", () => {
         )
 
         const data = await simpleNodeDB.getData("dataUntidy")
-
         assert.deepStrictEqual(data, [
             { Department: "accounting", year: "2015", employees: 10 },
             { Department: "accounting", year: "2016", employees: 9 },
@@ -45,4 +44,39 @@ describe("longer", () => {
             { Department: "sales", year: "2020", employees: 27 },
         ])
     })
+    it("should tidy data by stacking mutiple columns and by including null values", async () => {
+        await simpleNodeDB.loadData(
+            "dataUntidyWithNulls",
+            "test/data/files/dataUntidyWithNulls.json"
+        )
+        await simpleNodeDB.longer(
+            "dataUntidyWithNulls",
+            ["2015", "2016", "2017", "2018", "2019", "2020"],
+            "year",
+            "employees"
+        )
+
+        const data = await simpleNodeDB.getData("dataUntidyWithNulls")
+
+        assert.deepStrictEqual(data, [
+            { Department: "accounting", year: "2015", employees: null },
+            { Department: "accounting", year: "2016", employees: 9 },
+            { Department: "accounting", year: "2017", employees: 15 },
+            { Department: "accounting", year: "2018", employees: 11 },
+            { Department: "accounting", year: "2019", employees: 25 },
+            { Department: "accounting", year: "2020", employees: 32 },
+            { Department: "R&D", year: "2015", employees: 1 },
+            { Department: "R&D", year: "2016", employees: 2 },
+            { Department: "R&D", year: "2017", employees: null },
+            { Department: "R&D", year: "2018", employees: 2 },
+            { Department: "R&D", year: "2019", employees: 2 },
+            { Department: "R&D", year: "2020", employees: 3 },
+            { Department: "sales", year: "2015", employees: 2 },
+            { Department: "sales", year: "2016", employees: 7 },
+            { Department: "sales", year: "2017", employees: 15 },
+            { Department: "sales", year: "2018", employees: 32 },
+            { Department: "sales", year: "2019", employees: 45 },
+            { Department: "sales", year: "2020", employees: null },
+        ])
+    })
 })