Fix porsager#49 and improve sql.array usage

porsager · porsager · commit 22651e3cf9b4 · 2020-05-03T15:08:24.000+02:00
diff --git a/lib/index.js b/lib/index.js
@@ -199,7 +199,7 @@ function Postgres(a, b) {
   function nested(first, rest) {
     const o = Object.create(notPromise)
     o.first = first
-    o.rest = rest
+    o.rest = rest.flat()
     return o
   }
 
@@ -222,12 +222,10 @@ function Postgres(a, b) {
     return connection
   }
 
-  function array(value) {
-    return {
-      type: inferType(value) || 25,
-      array: true,
-      value
-    }
+  function array(xs) {
+    const o = Object.create(notPromise)
+    o.array = xs
+    return o
   }
 
   function json(value) {
@@ -395,10 +393,7 @@ function Postgres(a, b) {
 
     for (let i = 1; i < xs.length; i++) {
       arg = args[i - 1]
-      str += (arg && arg.P === notPromise.P
-        ? parseHelper(str, arg, xargs, types)
-        : parseValue(arg, xargs, types)
-      ) + xs[i]
+      str += parseArg(str, arg, xargs, types) + xs[i]
     }
 
     return {
@@ -408,6 +403,21 @@ function Postgres(a, b) {
     }
   }
 
+  function parseArg(str, arg, xargs, types) {
+    return arg && arg.P === notPromise.P
+      ? arg.array
+        ? parseArray(arg.array, xargs, types)
+        : parseHelper(str, arg, xargs, types)
+      : parseValue(arg, xargs, types)
+  }
+
+  function parseArray(array, xargs, types) {
+    return array.length === 0 ? '\'{}\'' : 'array[' + array.map((x) => Array.isArray(x)
+      ? parseArray(x, xargs, types)
+      : parseValue(x, xargs, types)
+    ).join(',') + ']'
+  }
+
   function parseHelper(str, { first, rest }, xargs, types) {
     xargs.dynamic = true
     if (first !== null && typeof first === 'object' && typeof first[0] !== 'string') {
@@ -458,6 +468,8 @@ function Postgres(a, b) {
 
     return Array.isArray(x)
       ? x.reduce((acc, x) => acc + (acc ? ',' : '') + addValue(x, xargs, types), '')
+      : x && x.P === notPromise.P
+      ? parseArg('', x, xargs, types)
       : addValue(x, xargs, types)
   }
 
@@ -477,7 +489,7 @@ function Postgres(a, b) {
       return { type: 0, value: x }
 
     const value = x.type ? x.value : x
-        , type = x.array ? typeArrayMap[x.type] : (x.type || inferType(value))
+        , type = x.type || inferType(value)
 
     return {
       type,
diff --git a/tests/index.js b/tests/index.js
@@ -109,7 +109,7 @@ t('Json', async() => {
 })
 
 t('Empty array', async() =>
-  [0, (await sql`select ${ sql.array([]) } as x`)[0].x.length]
+  [true, Array.isArray((await sql`select ${ sql.array([]) }::int[] as x`)[0].x)]
 )
 
 t('Array of Integer', async() =>
@@ -986,3 +986,21 @@ t('Result as arrays', async() => {
 
   return ['1,2', (await sql`select 1 as a, 2 as b`)[0].join(',')]
 })
+
+t('Insert empty array', async() => {
+  await sql`create table tester (ints int[])`
+  return [
+    Array.isArray((await sql`insert into tester (ints) values (${ sql.array([]) }) returning *`)[0].ints),
+    true,
+    await sql`drop table tester`
+  ]
+})
+
+t('Insert array in sql()', async() => {
+  await sql`create table tester (ints int[])`
+  return [
+    Array.isArray((await sql`insert into tester ${ sql({ ints: sql.array([]) })} returning *`)[0].ints),
+    true,
+    await sql`drop table tester`
+  ]
+})
