Update aftr rebase

Author: Gobie

test/integration/connection-pool/error-tests.js

@@ -1,6 +1,7 @@
 'use strict'
 var helper = require('./test-helper')
 const pg = helper.pg
+const native = helper.args.native
 
 const suite = new helper.Suite()
 suite.test('connecting to invalid port', (cb) => {
@@ -102,14 +103,28 @@ suite.test('connection-level errors cause future queries to fail', (cb) => {
 
 suite.test('handles socket error during pool.query and destroys it immediately', (cb) => {
   const pool = new pg.Pool({ max: 1 })
-  pool.query('SELECT pg_sleep(10)', [], (err) => {
-    assert.equal(err.message, 'network issue')
-    assert.equal(stream.destroyed, true)
-    cb()
-  })
 
-  const stream = pool._clients[0].connection.stream
-  setTimeout(() => {
-    stream.emit('error', new Error('network issue'))
-  }, 100)
+  if (native) {
+    pool.query('SELECT pg_sleep(10)', [], (err) => {
+      assert.equal(err.message, 'canceling statement due to user request')
+      cb()
+    })
+
+    setTimeout(() => {
+      pool._clients[0].native.cancel((err) => {
+        assert.ifError(err)
+      })
+    }, 100)
+  } else {
+    pool.query('SELECT pg_sleep(10)', [], (err) => {
+      assert.equal(err.message, 'network issue')
+      assert.equal(stream.destroyed, true)
+      cb()
+    })
+
+    const stream = pool._clients[0].connection.stream
+    setTimeout(() => {
+      stream.emit('error', new Error('network issue'))
+    }, 100)
+  }
 })