Fix return value of unsafe query with multiple statements

porsager · porsager · commit 748f19834a93 · 2019-12-28T11:09:57.000+01:00
diff --git a/lib/backend.js b/lib/backend.js
@@ -174,6 +174,13 @@ function Backend({
   }
 
   function RowDescription(x) {
+    if (backend.query.result.command) {
+      backend.query.results = backend.query.results || [backend.query.result]
+      backend.query.results.push(backend.query.result = [])
+      backend.query.result.count = null
+      backend.query.statement.columns = null
+    }
+
     rows = 0
 
     if (backend.query.statement.columns)
diff --git a/lib/connection.js b/lib/connection.js
@@ -131,7 +131,7 @@ function Connection(options = {}) {
       ? (backend.query ? backend.query.reject(err) : error(err))
       : (backend.query && backend.query.resolve(backend.query.stream
         ? backend.query.result.count
-        : backend.query.result))
+        : (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
@@ -681,8 +681,8 @@ t('Multiple queries', async() => {
 t('Multiple statements', async() =>
   [2, await sql.unsafe(`
     select 1 as x;
-    select 2 as x;
-  `).then(([, x]) => x.x)]
+    select 2 as a;
+  `).then(([, [x]]) => x.a)]
 )
 
 t('throws correct error when authentication fails', async() => {
