fix(postgres): invalidate connection after client-side timeout

src/dialects/postgres/query.js

@@ -85,6 +85,8 @@ class Query extends AbstractQuery {
         || /Unable to set non-blocking to true/i.test(error)
         || /SSL SYSCALL error: EOF detected/i.test(error)
         || /Local: Authentication failure/i.test(error)
+        // https://github.com/sequelize/sequelize/pull/15144
+        || error.message === 'Query read timeout'
       ) {
         connection._invalid = true;
       }

test/integration/dialects/postgres/query.test.js

@@ -4,7 +4,8 @@ const chai = require('chai'),
   expect = chai.expect,
   Support = require('../../support'),
   dialect = Support.getTestDialect(),
-  DataTypes = require('sequelize/lib/data-types');
+  DataTypes = require('sequelize/lib/data-types'),
+  DatabaseError = require('sequelize/lib/errors/database-error');
 
 if (dialect.match(/^postgres/)) {
   describe('[POSTGRES] Query', () => {
@@ -188,5 +189,49 @@ if (dialect.match(/^postgres/)) {
         order: [['order_0', 'DESC']]
       });
     });
+
+    describe('Connection Invalidation', () => {
+      if (process.env.DIALECT === 'postgres-native') {
+        // native driver doesn't support statement_timeout or query_timeout
+        return;
+      }
+
+      async function setUp(clientQueryTimeoutMs) {
+        const sequelize = Support.createSequelizeInstance({
+          dialectOptions: {
+            statement_timeout: 500, // ms
+            query_timeout: clientQueryTimeoutMs
+          },
+          pool: {
+            max: 1, // having only one helps us know whether the connection was invalidated
+            idle: 60000
+          }
+        });
+
+        return { sequelize, originalPid: await getConnectionPid(sequelize) };
+      }
+
+      async function getConnectionPid(sequelize) {
+        const connection = await sequelize.connectionManager.getConnection();
+        const pid = connection.processID;
+        sequelize.connectionManager.releaseConnection(connection);
+
+        return pid;
+      }
+
+      it('reuses connection after statement timeout', async () => {
+        // client timeout > statement timeout means that the query should fail with a statement timeout
+        const { sequelize, originalPid } = await setUp(10000);
+        await expect(sequelize.query('select pg_sleep(1)')).to.eventually.be.rejectedWith(DatabaseError, 'canceling statement due to statement timeout');
+        expect(await getConnectionPid(sequelize)).to.equal(originalPid);
+      });
+
+      it('invalidates connection after client-side query timeout', async () => {
+        // client timeout < statement timeout means that the query should fail with a read timeout
+        const { sequelize, originalPid } = await setUp(250);
+        await expect(sequelize.query('select pg_sleep(1)')).to.eventually.be.rejectedWith(DatabaseError, 'Query read timeout');
+        expect(await getConnectionPid(sequelize)).to.not.equal(originalPid);
+      });
+    });
   });
 }