Add columns to result - fixes porsager#18

porsager · porsager · commit d89f82418e53 · 2020-04-08T14:45:37.000+02:00
diff --git a/lib/backend.js b/lib/backend.js
@@ -107,17 +107,17 @@ function Backend({
 
       value = length === -1
         ? null
-        : column.p === undefined
+        : column.parser === undefined
           ? x.toString('utf8', index, index += length)
-          : column.p.array === true
-            ? column.p(x.toString('utf8', index + 1, index += length))
-            : column.p(x.toString('utf8', index, index += length))
+          : column.parser.array === true
+            ? column.parser(x.toString('utf8', index + 1, index += length))
+            : column.parser(x.toString('utf8', index, index += length))
 
-      row[column.n] = transform.value ? transform.value(value) : value
+      row[column.name] = transform.value ? transform.value(value) : value
     }
 
     backend.query.stream
-      ? backend.query.stream(transform.row ? transform.row(row) : row, rows++)
+      ? backend.query.stream(transform.row ? transform.row(row) : row, backend.query.result)
       : (backend.query.result[rows++] = transform.row ? transform.row(row) : row)
   }
 
@@ -188,7 +188,7 @@ function Backend({
     rows = 0
 
     if (backend.query.statement.columns)
-      return
+      return backend.query.result.columns = backend.query.statement.columns
 
     const length = x.readInt16BE(5)
     let index = 7
@@ -199,14 +199,17 @@ function Backend({
     for (let i = 0; i < length; ++i) {
       start = index
       while (x[index++] !== 0);
+      const type = x.readInt32BE(index + 6)
       backend.query.statement.columns[i] = {
-        n: transform.column
+        name: transform.column
           ? transform.column(x.toString('utf8', start, index - 1))
           : x.toString('utf8', start, index - 1),
-        p: parsers[x.readInt32BE(index + 6)]
+        parser: parsers[type],
+        type
       }
       index += 18
     }
+    backend.query.result.columns = backend.query.statement.columns
   }
 
   /* c8 ignore next 3 */
diff --git a/tests/index.js b/tests/index.js
@@ -785,7 +785,7 @@ t('Stream returns empty array', async() => {
 
 t('Cursor works', async() => {
   const order = []
-  await sql`select 1 as x union select 2 as x`.cursor(async (x) => {
+  await sql`select 1 as x union select 2 as x`.cursor(async(x) => {
     order.push(x.x + 'a')
     await new Promise(r => setTimeout(r, 100))
     order.push(x.x + 'b')
@@ -795,15 +795,15 @@ t('Cursor works', async() => {
 
 t('Cursor custom n works', async() => {
   const order = []
-  await sql`select * from generate_series(1,20)`.cursor(10, async (x) => {
+  await sql`select * from generate_series(1,20)`.cursor(10, async(x) => {
     order.push(x.length)
   })
   return ['10,10', order.join(',')]
 })
 
 t('Cursor cancel works', async() => {
   let result
-  await sql`select * from generate_series(1,10) as x`.cursor(async ({ x }) => {
+  await sql`select * from generate_series(1,10) as x`.cursor(async({ x }) => {
     result = x
     return sql.END
   })
@@ -812,10 +812,10 @@ t('Cursor cancel works', async() => {
 
 t('Cursor throw works', async() => {
   const order = []
-  await sql`select 1 as x union select 2 as x`.cursor(async (x) => {
+  await sql`select 1 as x union select 2 as x`.cursor(async(x) => {
     order.push(x.x + 'a')
     await new Promise(r => setTimeout(r, 100))
-    throw 'watty'
+    throw new Error('watty')
   }).catch(() => order.push('err'))
   return ['1aerr', order.join('')]
 })
@@ -965,3 +965,24 @@ t('requests works after single connect_timeout', async() => {
 t('Postgres errors are of type PostgresError', async() =>
   [true, (await sql`bad keyword`.catch(e => e)) instanceof sql.PostgresError]
 )
+
+t('Result has columns spec', async() =>
+  ['x', (await sql`select 1 as x`).columns[0].name]
+)
+
+t('Stream has result as second argument', async() => {
+  let x
+  await sql`select 1 as x`.stream((_, result) => x = result)
+  return ['x', x.columns[0].name]
+})
+
+t('Result as arrays', async() => {
+  const sql = postgres({
+    ...options,
+    transform: {
+      row: x => Object.values(x)
+    }
+  })
+
+  return ['1,2', (await sql`select 1 as a, 2 as b`)[0].join(',')]
+})
diff --git a/tests/test.js b/tests/test.js
@@ -24,7 +24,11 @@ async function test(o, name, fn) {
     new Promise((resolve, reject) => fn.timer = setTimeout(() => reject('Timed out'), 500)),
     fn()
   ]))
-    .then(([expected, got]) => {
+    .then((x) => {
+      if (!Array.isArray(x))
+        throw new Error('Test should return result array')
+
+      const [expected, got] = x
       if (expected !== got)
         throw new Error(expected + ' != ' + util.inspect(got))
       tests[line].succeeded = true
