Fix array as multiple parameters

porsager · porsager · commit 0574fa853920 · 2019-12-09T21:38:29.000+01:00
diff --git a/lib/index.js b/lib/index.js
@@ -381,7 +381,7 @@ export default function Postgres(url, options) {
   function selectHelper(first, columns, xargs, types) {
     return Object.entries(first).reduce((acc, [k, v]) =>
       acc + (!columns.length || columns.indexOf(k) > -1
-        ? (acc ? ', ' : '') + parseValue(v, xargs, types) + ' as ' + escape(k)
+        ? (acc ? ',' : '') + parseValue(v, xargs, types) + ' as ' + escape(k)
         : ''
       )
     , '')
@@ -393,29 +393,29 @@ export default function Postgres(url, options) {
       first.map(row =>
         '(' + Object.entries(row).reduce((acc, [k, v]) =>
           acc + (!columns.length || columns.indexOf(k) > -1
-            ? (acc ? ', ' : '') + parseValue(v, xargs, types)
+            ? (acc ? ',' : '') + parseValue(v, xargs, types)
             : ''
           )
         , '') + ')'
-      ).join(', ')
+      ).join(',')
   }
 
   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)
+        ? (acc ? ',' : '') + escape(k) + ' = ' + parseValue(v, xargs, types)
         : ''
       )
     , '')
   }
 
   function escapeHelper(xs) {
-    return xs.reduce((acc, x) => acc + (acc ? ', ' : '') + escape(x), '')
+    return xs.reduce((acc, x) => acc + (acc ? ',' : '') + escape(x), '')
   }
 
   function parseValue(x, xargs, types) {
     return Array.isArray(x)
-      ? x.reduce((acc, x) => addValue(x, xargs, types), '')
+      ? x.reduce((acc, x) => acc + (acc ? ',' : '') + addValue(x, xargs, types), '')
       : addValue(x, xargs, types)
   }
 
diff --git a/tests/index.js b/tests/index.js
@@ -438,6 +438,20 @@ t('dynamic insert', async () => {
   return ['the answer', (await sql`insert into test ${ sql(x) } 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]
+}, () => sql`drop table test`)
+
+t('parameters in()', async () => {
+  return [2, (await sql`
+    with rows as (
+      select * from (values (1), (2), (3), (4)) as x(a)
+    )
+    select * from rows where a in (${ [3, 4] })
+  `).count]
+})
+
 t('dynamic multi row insert', async () => {
   await sql`create table test (a int, b text)`
   const x = { a: 42, b: 'the answer' }
@@ -471,7 +485,7 @@ t('dynamic select args', async () => {
   return ['yay', (await sql`select ${ sql('a', 'b') } from test`)[0].b]
 }, () => sql`drop table test`)
 
-ot('connection parameters', async() => {
+t('connection parameters', async() => {
   const sql = postgres({
     ...options,
     connection: {

Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ export default function Postgres(url, options) {`
`381`	`381`	`function selectHelper(first, columns, xargs, types) {`
`382`	`382`	`return Object.entries(first).reduce((acc, [k, v]) =>`
`383`	`383`	`acc + (!columns.length \|\| columns.indexOf(k) > -1`
`384`		`- ? (acc ? ', ' : '') + parseValue(v, xargs, types) + ' as ' + escape(k)`
	`384`	`+ ? (acc ? ',' : '') + parseValue(v, xargs, types) + ' as ' + escape(k)`
`385`	`385`	`: ''`
`386`	`386`	`)`
`387`	`387`	`, '')`
`@@ -393,29 +393,29 @@ export default function Postgres(url, options) {`
`393`	`393`	`first.map(row =>`
`394`	`394`	`'(' + Object.entries(row).reduce((acc, [k, v]) =>`
`395`	`395`	`acc + (!columns.length \|\| columns.indexOf(k) > -1`
`396`		`- ? (acc ? ', ' : '') + parseValue(v, xargs, types)`
	`396`	`+ ? (acc ? ',' : '') + parseValue(v, xargs, types)`
`397`	`397`	`: ''`
`398`	`398`	`)`
`399`	`399`	`, '') + ')'`
`400`		`- ).join(', ')`
	`400`	`+ ).join(',')`
`401`	`401`	`}`
`402`	`402`
`403`	`403`	`function equalsHelper(first, columns, xargs, types) {`
`404`	`404`	`return Object.entries(first).reduce((acc, [k, v]) =>`
`405`	`405`	`acc + (!columns.length \|\| columns.indexOf(k) > -1`
`406`		`- ? (acc ? ', ' : '') + escape(k) + ' = ' + parseValue(v, xargs, types)`
	`406`	`+ ? (acc ? ',' : '') + escape(k) + ' = ' + parseValue(v, xargs, types)`
`407`	`407`	`: ''`
`408`	`408`	`)`
`409`	`409`	`, '')`
`410`	`410`	`}`
`411`	`411`
`412`	`412`	`function escapeHelper(xs) {`
`413`		`- return xs.reduce((acc, x) => acc + (acc ? ', ' : '') + escape(x), '')`
	`413`	`+ return xs.reduce((acc, x) => acc + (acc ? ',' : '') + escape(x), '')`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`function parseValue(x, xargs, types) {`
`417`	`417`	`return Array.isArray(x)`
`418`		`- ? x.reduce((acc, x) => addValue(x, xargs, types), '')`
	`418`	`+ ? x.reduce((acc, x) => acc + (acc ? ',' : '') + addValue(x, xargs, types), '')`
`419`	`419`	`: addValue(x, xargs, types)`
`420`	`420`	`}`
`421`	`421`