Fix support for null in arrays - fixes porsager#371

porsager · porsager · commit b04c853c2cb3 · 2022-05-24T11:11:55.000+02:00
diff --git a/src/connection.js b/src/connection.js
@@ -731,7 +731,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
     options.shared.typeArrayMap[oid] = typarray
     options.parsers[typarray] = (xs) => arrayParser(xs, parser)
     options.parsers[typarray].array = true
-    options.serializers[typarray] = (xs) => arraySerializer(xs, options.serializers[oid])
+    options.serializers[typarray] = (xs) => arraySerializer(xs, options.serializers[oid], options)
   }
 
   function tryNext(x, xs) {
diff --git a/src/types.js b/src/types.js
@@ -231,7 +231,7 @@ function arrayEscape(x) {
     .replace(escapeQuote, '\\"')
 }
 
-export const arraySerializer = function arraySerializer(xs, serializer) {
+export const arraySerializer = function arraySerializer(xs, serializer, options) {
   if (Array.isArray(xs) === false)
     return xs
 
@@ -243,9 +243,19 @@ export const arraySerializer = function arraySerializer(xs, serializer) {
   if (Array.isArray(first) && !first.type)
     return '{' + xs.map(x => arraySerializer(x, serializer)).join(',') + '}'
 
-  return '{' + xs.map(x =>
-    '"' + arrayEscape(serializer ? serializer(x.type ? x.value : x) : '' + x) + '"'
-  ).join(',') + '}'
+  return '{' + xs.map(x => {
+    if (x === undefined) {
+      x = options.transform.undefined
+      if (x === undefined)
+        throw Errors.generic('UNDEFINED_VALUE', 'Undefined values are not allowed')
+    }
+
+    return x === null
+      ? 'null'
+      : x === undefined
+        ? '' + options.transform.undefined
+        : '"' + arrayEscape(serializer ? serializer(x.type ? x.value : x) : '' + x) + '"'
+  }).join(',') + '}'
 }
 
 const arrayParserState = {
diff --git a/tests/index.js b/tests/index.js
@@ -2142,7 +2142,7 @@ t('Does not try rollback when commit errors', async() => {
 })
 
 t('Last keyword used even with duplicate keywords', async() => {
-  await sql`create table test (x int);`
+  await sql`create table test (x int)`
   await sql`insert into test values(1)`
   const [{ x }] = await sql`
     select
@@ -2151,5 +2151,35 @@ t('Last keyword used even with duplicate keywords', async() => {
     where x in ${ sql([1, 2]) }
   `
 
-  return [x, true]
+  return [x, true, await sql`drop table test`]
+})
+
+t('Insert array with null', async() => {
+  await sql`create table test (x int[])`
+  await sql`insert into test ${ sql({ x: [1, null, 3] }) }`
+  return [
+    1,
+    (await sql`select x from test`)[0].x[0],
+    await sql`drop table test`
+  ]
+})
+
+t('Insert array with undefined throws', async() => {
+  await sql`create table test (x int[])`
+  return [
+    'UNDEFINED_VALUE',
+    await sql`insert into test ${ sql({ x: [1, undefined, 3] }) }`.catch(e => e.code),
+    await sql`drop table test`
+  ]
+})
+
+t('Insert array with undefined transform', async() => {
+  const sql = postgres({ ...options, transform: { undefined: null } })
+  await sql`create table test (x int[])`
+  await sql`insert into test ${ sql({ x: [1, undefined, 3] }) }`
+  return [
+    1,
+    (await sql`select x from test`)[0].x[0],
+    await sql`drop table test`
+  ]
 })

Original file line number	Diff line number	Diff line change
`@@ -731,7 +731,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose`
`731`	`731`	`options.shared.typeArrayMap[oid] = typarray`
`732`	`732`	`options.parsers[typarray] = (xs) => arrayParser(xs, parser)`
`733`	`733`	`options.parsers[typarray].array = true`
`734`		`- options.serializers[typarray] = (xs) => arraySerializer(xs, options.serializers[oid])`
	`734`	`+ options.serializers[typarray] = (xs) => arraySerializer(xs, options.serializers[oid], options)`
`735`	`735`	`}`
`736`	`736`
`737`	`737`	`function tryNext(x, xs) {`