Make stream promise resolve with correct result

porsager · Dec 29, 2019 · 730df2c · 730df2c
1 parent 748f198
commit 730df2c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/lib/connection.js b/lib/connection.js
@@ -129,9 +129,7 @@ function Connection(options = {}) {
   function onready(err) {
     err
       ? (backend.query ? backend.query.reject(err) : error(err))
-      : (backend.query && backend.query.resolve(backend.query.stream
-        ? backend.query.result.count
-        : (backend.query.results || backend.query.result)))
+      : (backend.query && backend.query.resolve(backend.query.results || backend.query.result))
 
     backend.query = backend.error = null
     timeout && queries.length === 0 && idle()

diff --git a/tests/index.js b/tests/index.js
@@ -735,6 +735,16 @@ t('bytea serializes and parses', async() => {
   return [0, Buffer.compare(buf, (await sql`select x from test`)[0].x)]
 })
 
+t('Stream works', async() => {
+  let result
+  await sql`select 1 as x`.stream(({ x }) => result = x)
+  return [1, result]
+})
+
+t('Stream returns empty array', async() => {
+  return [0, (await sql`select 1 as x`.stream(x => {})).length]
+})
+
 t('Transform row', async() => {
   const sql = postgres({
     ...options,