feat: allow nullable fields

forbesmyester · Dec 24, 2019 · 4f35342 · 4f35342
1 parent 7029261
commit 4f35342
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "ajv": "^6.10.2",
     "body-parser": "^1.19.0",
     "cors": "^2.8.5",
-    "esqlate-lib": "^1.0.6",
+    "esqlate-lib": "^1.0.8",
     "esqlate-promise-returning-function-to-generator": "^1.0.0",
     "esqlate-queue": "^2.0.0",
     "express": "^4.17.1",

diff --git a/src/QueryRunner.ts b/src/QueryRunner.ts
@@ -64,6 +64,13 @@ export function pgQuery(statement: EsqlateStatementNormalized, inputValues: {[k:
         knownValues: string[];
     }
 
+    function getSqlValue(p: EsqlateParameter) {
+        if (p.empty_string_is_null && (inputValues[p.name] == "")) {
+            return null;
+        }
+        return inputValues[p.name];
+    }
+
     function reducer(acc: PgQueryExtra, ed: string | EsqlateParameter): PgQueryExtra {
 
         if (typeof ed === "string") {
@@ -75,7 +82,7 @@ export function pgQuery(statement: EsqlateStatementNormalized, inputValues: {[k:
         }
 
         if (acc.knownValues.indexOf(ed.name) === -1) {
-            acc.values = acc.values.concat(inputValues[ed.name]);
+            acc.values = acc.values.concat(getSqlValue(ed));
             acc.knownValues = acc.knownValues.concat([ed.name]);
         }