Pass options properly and test nesting

Author: porsager

src/types.js

@@ -96,37 +96,35 @@ export function handleValue(x, parameters, types, options) {
 
 const defaultHandlers = typeHandlers(types)
 
-export function stringify(q, string, value, parameters, types, o) { // eslint-disable-line
+export function stringify(q, string, value, parameters, types, options) { // eslint-disable-line
   for (let i = 1; i < q.strings.length; i++) {
-    string += (
-      value && value[0] instanceof Query ? value.reduce((acc, x) => acc + ' ' + fragment(x, parameters, types, o), '') :
-      value instanceof Query ? fragment(value, parameters, types, o) :
-      value instanceof Identifier ? value.value :
-      value instanceof Builder ? value.build(string, parameters, types, o) :
-      handleValue(value, parameters, types, o)
-    ) + q.strings[i]
+    string += (stringifyValue(string, value, parameters, types, options)) + q.strings[i]
     value = q.args[i]
   }
 
   return string
 }
 
+function stringifyValue(string, value, parameters, types, o) {
+  return (
+    value instanceof Builder ? value.build(string, parameters, types, o) :
+    value instanceof Query ? fragment(value, parameters, types, o) :
+    value instanceof Identifier ? value.value :
+    value && value[0] instanceof Query ? value.reduce((acc, x) => acc + ' ' + fragment(x, parameters, types, o), '') :
+    handleValue(value, parameters, types, o)
+  )
+}
+
 function fragment(q, parameters, types, options) {
   q.fragment = true
   return stringify(q, q.strings[0], q.args[0], parameters, types, options)
 }
 
 function valuesBuilder(first, parameters, types, columns, options) {
-  let value
   return first.map(row =>
-    '(' + columns.map(column => {
-      value = row[column]
-      return (
-        value instanceof Query ? fragment(value, parameters, types) :
-        value instanceof Identifier ? value.value :
-        handleValue(value, parameters, types, options)
-      )
-    }).join(',') + ')'
+    '(' + columns.map(column =>
+      stringifyValue('values', row[column], parameters, types, options)
+    ).join(',') + ')'
   ).join(',')
 }
 
@@ -146,7 +144,7 @@ function select(first, rest, parameters, types, options) {
   return columns.map(x => {
     value = first[x]
     return (
-      value instanceof Query ? fragment(value, parameters, types) :
+      value instanceof Query ? fragment(value, parameters, types, options) :
       value instanceof Identifier ? value.value :
       handleValue(value, parameters, types, options)
     ) + ' as ' + escapeIdentifier(options.transform.column.to ? options.transform.column.to(x) : x)

tests/index.js

@@ -2101,6 +2101,18 @@ t('Supports nested fragments with parameters', async() => {
   ]
 })
 
+t('Supports multiple nested fragments with parameters', async() => {
+  const [{ b }] = await sql`select * ${
+    sql`from ${
+      sql`(values (2, ${ 1 }::int)) as x(${ sql(['a', 'b']) })`
+    }`
+  }`
+  return [
+    1,
+    b
+  ]
+})
+
 t('Supports arrays of fragments', async() => {
   const [{ x }] = await sql`
     ${ [sql`select`, sql`1`, sql`as`, sql`x`] }