Fix handling of null and undefined

porsager · porsager · commit 8890904cfda6 · 2019-11-29T11:13:52.000+01:00
diff --git a/lib/index.js b/lib/index.js
@@ -379,11 +379,13 @@ export default function Postgres(url, options) {
 
     for (let i = 1; i < xs.length; i++) {
       arg = args[i - 1]
-      str += (arg.rows
-        ? parseRows(arg.rows, xargs, types)
-        : arg.row
-          ? parseRow(arg.row, xargs, types)
-          : parseValue(arg, xargs, types)
+      str += (!arg
+        ? parseValue(arg, xargs, types)
+        : arg.rows
+          ? parseRows(arg.rows, xargs, types)
+          : arg.row
+            ? parseRow(arg.row, xargs, types)
+            : parseValue(arg, xargs, types)
       ) + xs[i]
     }
 
@@ -410,8 +412,11 @@ export default function Postgres(url, options) {
   }
 
   function getType(x) {
+    if (x == null)
+      return { type: types.string.to, value: x }
+
     const value = x.type ? x.value : x
-        , type = x && x.array ? typeArrayMap[x.type || inferType(value)] : (x.type || inferType(value))
+        , type = x.array ? typeArrayMap[x.type || inferType(value)] : (x.type || inferType(value))
 
     return {
       type,
@@ -445,10 +450,7 @@ function parseOptions(uri = {}, options) {
     onnotice    : o.onnotice,
     onparameter : o.onparameter,
     none        : crypto.randomBytes(18).toString('base64'),
-    connection  : {
-      application_name: 'postgres.js',
-      ...o.connection
-    },
+    connection  : { application_name: 'postgres.js', ...o.connection },
     ...mergeUserTypes(o.types)
   }
 }
diff --git a/tests/index.js b/tests/index.js
@@ -57,6 +57,14 @@ t('Drop table', async() =>
   ['DROP TABLE', (await sql`drop table test`).command]
 )
 
+t('null', async() =>
+  [null, (await sql`select ${ null } as x`)[0].x]
+)
+
+t('undefined to null', async() =>
+  [null, (await sql`select ${ undefined } as x`)[0].x]
+)
+
 t('Integer', async() =>
   [1, (await sql`select ${ 1 } as x`)[0].x]
 )
@@ -237,7 +245,13 @@ t('Point type array', async() => {
 t('sql file', async() =>
   [1, (await sql.file('./select.sql'))[0].x]
 )
-
+/*
+t('select column vars', async() => {
+  await sql`create table test (x int)`
+  await sql`insert into test values (1)`
+  return [1, (await sql`select ${ 'x' } from test`)[0].x]
+})
+*/
 t('sql file can stream', async() => {
   let result
   await sql.file('./select.sql')
