Ensure empty results have field metadata

Author: brianc

lib/build-result.js

@@ -26,7 +26,8 @@ class Result {
     }
   }
 
-  consumeRows (pq, tupleCount) {
+  consumeRows (pq) {
+    const tupleCount = pq.ntuples()
     for (var i = 0; i < tupleCount; i++) {
       const row = this._arrayMode ? this.consumeRowAsArray(pq, i) : this.consumeRowAsObject(pq, i)
       this.rows.push(row)
@@ -65,12 +66,9 @@ class Result {
 
 function buildResult (pq, types, arrayMode) {
   const result = new Result(types, arrayMode)
-  var tupleCount = pq.ntuples()
   result.consumeCommand(pq)
-  if (tupleCount > 0) {
-    result.consumeFields(pq)
-    result.consumeRows(pq, tupleCount)
-  }
+  result.consumeFields(pq)
+  result.consumeRows(pq)
 
   return result
 }

test/empty-query.js

@@ -0,0 +1,16 @@
+var Client = require('../')
+var assert = require('assert')
+
+describe('empty query', () => {
+  it('has field metadata in result', (done) => {
+    const client = new Client()
+    client.connectSync()
+    client.query('SELECT NOW() as now LIMIT 0', (err, rows, res) => {
+      assert(!err)
+      assert.equal(rows.length, 0)
+      assert(Array.isArray(res.fields))
+      assert.equal(res.fields.length, 1)
+      client.end(done)
+    })
+  })
+})