Fix insert into helper

porsager · porsager · commit 94e706b9cd26 · 2019-12-18T15:42:01.000+01:00
diff --git a/lib/index.js b/lib/index.js
@@ -391,23 +391,18 @@ function Postgres(url, options) {
 
   function insertHelper(first, columns, xargs, types) {
     first = Array.isArray(first) ? first : [first]
-    return '(' + escapeHelper(Object.keys(first[0])) + ') values ' +
-      first.map(row =>
-        '(' + Object.entries(row).reduce((acc, [k, v]) =>
-          acc + (!columns.length || columns.indexOf(k) > -1
-            ? (acc ? ',' : '') + parseValue(v, xargs, types)
-            : ''
-          )
-        , '') + ')'
-      ).join(',')
+    columns = columns.length ? columns : Object.keys(first[0])
+    return '(' + escapeHelper(columns) + ') values ' +
+    first.reduce((acc, row) =>
+      acc + (acc ? ',' : '') + '(' +
+        columns.reduce((acc, k) => acc + (acc ? ',' : '') + parseValue(row[k], xargs, types), '') +
+      ')'
+    , '')
   }
 
   function equalsHelper(first, columns, xargs, types) {
-    return Object.entries(first).reduce((acc, [k, v]) =>
-      acc + (!columns.length || columns.indexOf(k) > -1
-        ? (acc ? ',' : '') + escape(k) + ' = ' + parseValue(v, xargs, types)
-        : ''
-      )
+    return columns.length ? columns : Object.keys(first).reduce((acc, [k, v]) =>
+      acc + (acc ? ',' : '') + escape(k) + ' = ' + parseValue(v, xargs, types)
     , '')
   }
 
diff --git a/tests/index.js b/tests/index.js
@@ -441,6 +441,13 @@ t('dynamic insert', async () => {
   return ['the answer', (await sql`insert into test ${ sql(x) } returning *`)[0].b]
 }, () => sql`drop table test`)
 
+t('dynamic insert pluck', async () => {
+  await sql`create table test (a int, b text)`
+  const x = { a: 42, b: 'the answer' }
+
+  return [null, (await sql`insert into test ${ sql(x, 'a') } returning *`)[0].b]
+}, () => sql`drop table test`)
+
 t('array insert', async () => {
   await sql`create table test (a int, b int)`
   return [2, (await sql`insert into test (a, b) values (${ [1,2] }) returning *`)[0].b]
