Patch slonik to close streams more reliably

.circleci/config.yml

@@ -12,7 +12,7 @@ jobs:
  steps:
  - checkout
  - run: make check-file-headers
- - run: npm ci
+ - run: npm ci --legacy-peer-deps
  - run: node lib/bin/create-docker-databases.js
  - run: make test-full
 

.github/workflows/benchmarker.yml

@@ -30,7 +30,7 @@ jobs:
  with:
  node-version: ${{ matrix.node-version }}
  cache: 'npm'
- - run: npm ci
+ - run: npm ci --legacy-peer-deps
  - run: node lib/bin/create-docker-databases.js
  - name: Benchmark
  timeout-minutes: 10

Makefile

@@ -1,7 +1,7 @@
 default: base
 
 node_modules: package.json
- npm install
+ npm install --legacy-peer-deps
  touch node_modules
 
 .PHONY: node_version

package.json

@@ -38,7 +38,7 @@
  "prompt": "~1",
  "ramda": "~0",
  "sanitize-filename": "~1",
- "slonik": "23.6.2",
+ "slonik": "npm:@getodk/slonik@23.6.2-3",
  "slonik-sql-tag-raw": "1.0.3",
  "tmp-promise": "~3",
  "uuid": "~3",

test/integration/other/db-stream.js

@@ -30,27 +30,13 @@ describe('db.stream()', () => {
  await clock.tickAsync(60 * 1000);
  };
 
- beforeEach(() => { clock = FakeTimers.install({ shouldClearNativeTimers: true }); });
- afterEach(() => clock?.uninstall());
-
- // TODO this doesn't seem like the correct behaviour - no Error is thrown
- // here. At some point, this should be fixed elsewhere!
- it('should close streams given an invalid sql statement', async () => {
- // when
- const stream = await db.stream(sql`NOT A SQL STATEMENT`);
-
- // then
- pool.getPoolState().activeConnectionCount.should.equal(1);
- stream.destroyed.should.equal(false);
-
- // when
- await oneMinute();
- await oneMinute();
- // then
- pool.getPoolState().activeConnectionCount.should.equal(0);
- stream.destroyed.should.equal(true);
+ beforeEach(() => {
+ clock = FakeTimers.install({
+ shouldClearNativeTimers: true,
+ toFake: ['setTimeout', 'clearTimeout'],
+ });
  });
-
+ afterEach(() => clock?.uninstall());
 
  it('should time out after 2 mins if no activity at all', async () => {
  // given