Firebase Update

express-server/node_modules/pg-pool/test/connection-timeout.js

@@ -73,6 +73,28 @@ describe('connection timeout', () => {
     })
   })
 
+  it('should not break further pending checkouts on a timeout', (done) => {
+    const pool = new Pool({ connectionTimeoutMillis: 200, max: 1 })
+    pool.connect((err, client, releaseOuter) => {
+      expect(err).to.be(undefined)
+
+      pool.connect((err, client) => {
+        expect(err).to.be.an(Error)
+        expect(client).to.be(undefined)
+        releaseOuter()
+      })
+
+      setTimeout(() => {
+        pool.connect((err, client, releaseInner) => {
+          expect(err).to.be(undefined)
+          expect(client).to.not.be(undefined)
+          releaseInner()
+          pool.end(done)
+        })
+      }, 100)
+    })
+  })
+
   it('should timeout on query if all clients are busy', (done) => {
     const pool = new Pool({ connectionTimeoutMillis: 100, max: 1 })
     pool.connect((err, client, release) => {

express-server/node_modules/pg-pool/test/error-handling.js

@@ -1,4 +1,5 @@
 'use strict'
+const net = require('net')
 const co = require('co')
 const expect = require('expect.js')
 
@@ -143,4 +144,25 @@ describe('pool error handling', function () {
       return pool.end()
     }))
   })
+
+  it('should continue with queued items after a connection failure', (done) => {
+    const closeServer = net.createServer((socket) => {
+      socket.destroy()
+    }).unref()
+
+    closeServer.listen(() => {
+      const pool = new Pool({ max: 1, port: closeServer.address().port })
+      pool.connect((err) => {
+        expect(err).to.be.an(Error)
+        expect(err.message).to.be('Connection terminated unexpectedly')
+      })
+      pool.connect((err) => {
+        expect(err).to.be.an(Error)
+        expect(err.message).to.be('Connection terminated unexpectedly')
+        closeServer.close(() => {
+          pool.end(done)
+        })
+      })
+    })
+  })
 })

express-server/node_modules/pg-pool/test/sizing.js

@@ -33,11 +33,17 @@ describe('pool size of 1', () => {
 
   it('can only send 1 query at a time', co.wrap(function * () {
     const pool = new Pool({ max: 1 })
-    const queries = _.times(20, (i) => {
-      return pool.query('SELECT COUNT(*) as counts FROM pg_stat_activity')
-    })
+
+    // the query text column name changed in PostgreSQL 9.2
+    const versionResult = yield pool.query('SHOW server_version_num')
+    const version = parseInt(versionResult.rows[0].server_version_num, 10)
+    const queryColumn = version < 90200 ? 'current_query' : 'query'
+
+    const queryText = 'SELECT COUNT(*) as counts FROM pg_stat_activity WHERE ' + queryColumn + ' = $1'
+    const queries = _.times(20, () =>
+      pool.query(queryText, [queryText]))
     const results = yield Promise.all(queries)
-    const counts = results.map(res => parseInt(res.rows[0].counts), 10)
+    const counts = results.map(res => parseInt(res.rows[0].counts, 10))
     expect(counts).to.eql(_.times(20, i => 1))
     return yield pool.end()
   }))