diff --git a/japaFile.js b/japaFile.js index 46b457cd..23f2d3fe 100644 --- a/japaFile.js +++ b/japaFile.js @@ -2,5 +2,8 @@ require('ts-node/register') const { configure } = require('japa') configure({ - files: ['test/**/*.spec.ts'] + files: ['test/**/*.spec.ts'], + after: [async () => { + await require('fs-extra').remove(require('path').join(__dirname, 'test-helpers', 'tmp')) + }] }) diff --git a/test-helpers/index.ts b/test-helpers/index.ts index bf23227f..50e0d8d4 100644 --- a/test-helpers/index.ts +++ b/test-helpers/index.ts @@ -132,11 +132,6 @@ export async function setup () { * Does cleanup removes database */ export async function cleanup () { - if (process.env.DB === 'sqlite') { - await fs.cleanup() - return - } - const db = knex(getConfig()) await db.schema.dropTableIfExists('users') await db.schema.dropTableIfExists('profiles') @@ -232,8 +227,8 @@ export function getDb () { /** * Returns the orm adapter */ -export function ormAdapter () { - return new Adapter(getDb()) +export function ormAdapter (db: DatabaseContract) { + return new Adapter(db) } /** diff --git a/test/connection/connection-manager.spec.ts b/test/connection/connection-manager.spec.ts index e768781f..366bfb02 100644 --- a/test/connection/connection-manager.spec.ts +++ b/test/connection/connection-manager.spec.ts @@ -24,12 +24,13 @@ test.group('ConnectionManager', (group) => { await cleanup() }) - test('do not connect until connect is called', (assert) => { + test('do not connect until connect is called', async (assert) => { const manager = new ConnectionManager(getLogger()) manager.add('primary', getConfig()) assert.isTrue(manager.has('primary')) assert.isFalse(manager.isConnected('primary')) + await manager.closeAll() }) test('connect and set its state to open', async (assert) => { @@ -39,6 +40,7 @@ test.group('ConnectionManager', (group) => { assert.equal(manager.get('primary')!.state, 'open') assert.isTrue(manager.isConnected('primary')) + await manager.closeAll() }) test('on disconnect set state to closed', async (assert) => { @@ -49,6 +51,7 @@ test.group('ConnectionManager', (group) => { await manager.connections.get('primary')!.connection!.disconnect() assert.equal(manager.get('primary')!.state, 'closed') assert.isFalse(manager.isConnected('primary')) + await manager.closeAll() }) test('add duplicate connection must be a noop', async (assert) => { @@ -58,6 +61,7 @@ test.group('ConnectionManager', (group) => { manager.add('primary', Object.assign({}, getConfig(), { client: 'foo' })) assert.notEqual(manager.get('primary')!.config.client, 'foo') + await manager.closeAll() }) test('patch config when connection is not in open state', async (assert) => { @@ -69,6 +73,7 @@ test.group('ConnectionManager', (group) => { const fn = () => manager.add('primary', getConfig()) assert.doesNotThrow(fn) + await manager.closeAll() }) test('ignore multiple calls to `connect` on a single connection', async () => { @@ -81,6 +86,7 @@ test.group('ConnectionManager', (group) => { }) manager.connect('primary') + await manager.closeAll() }) test('releasing a connection must close it first', async (assert) => { @@ -104,8 +110,9 @@ test.group('ConnectionManager', (group) => { const manager = new ConnectionManager(getLogger()) manager.add('primary', getConfig()) - manager.on('connect', (connection) => { + manager.on('connect', async (connection) => { assert.instanceOf(connection, Connection) + await manager.closeAll() done() }) @@ -133,12 +140,14 @@ test.group('ConnectionManager', (group) => { const manager = new ConnectionManager(getLogger()) manager.add('primary', Object.assign({}, getConfig(), { client: null })) - manager.on('error', ({ message }, connection) => { + manager.on('error', async ({ message }, connection) => { try { assert.equal(message, 'knex: Required configuration option \'client\' is missing.') assert.instanceOf(connection, Connection) + await manager.closeAll() done() } catch (error) { + await manager.closeAll() done(error) } }) @@ -155,7 +164,7 @@ test.group('ConnectionManager', (group) => { const manager = new ConnectionManager(getLogger()) manager.add('primary', getConfig()) - manager.on('disconnect', (connection) => { + manager.on('disconnect', async (connection) => { try { assert.deepEqual(connection, connections[0]) assert.equal(manager['_orphanConnections'].size, 0) @@ -167,8 +176,10 @@ test.group('ConnectionManager', (group) => { connection: connections[1], }, }) + await manager.removeAllListeners().closeAll() done() } catch (error) { + await manager.removeAllListeners().closeAll() done(error) } }) diff --git a/test/connection/connection.spec.ts b/test/connection/connection.spec.ts index e62e747b..76bcc67c 100644 --- a/test/connection/connection.spec.ts +++ b/test/connection/connection.spec.ts @@ -91,9 +91,10 @@ test.group('Connection | setup', (group) => { test('instantiate knex when connect is invoked', async (assert, done) => { const connection = new Connection('primary', getConfig(), getLogger()) - connection.on('connect', () => { + connection.on('connect', async () => { assert.isDefined(connection.client!) assert.equal(connection.pool!.numUsed(), 0) + await connection.disconnect() done() }) @@ -156,6 +157,7 @@ test.group('Connection | setup', (group) => { assert.equal(connection.client!['_context'].client.constructor.name, 'Client_MySQL') assert.equal(connection.client!['_context'].client.config.connection.charset, 'utf-8') assert.equal(connection.client!['_context'].client.config.connection.typeCast, false) + await connection.disconnect() }) }) } @@ -180,6 +182,8 @@ test.group('Health Checks', (group) => { message: 'Connection is healthy', error: null, }) + + await connection.disconnect() }) if (process.env.DB !== 'sqlite') { @@ -194,6 +198,8 @@ test.group('Health Checks', (group) => { const report = await connection.getReport() assert.equal(report.message, 'Unable to reach the database server') assert.equal(report.error!.errno, 'ENOTFOUND') + + await connection.disconnect() }).timeout(0) test('get healthcheck report for un-healthy read host', async (assert) => { @@ -215,6 +221,8 @@ test.group('Health Checks', (group) => { const report = await connection.getReport() assert.equal(report.message, 'Unable to reach one of the read hosts') assert.equal(report.error!.errno, 'ENOTFOUND') + + await connection.disconnect() }).timeout(0) } }) diff --git a/test/database/insert-query-builder.spec.ts b/test/database/insert-query-builder.spec.ts index 4f670d0c..85c7cd1a 100644 --- a/test/database/insert-query-builder.spec.ts +++ b/test/database/insert-query-builder.spec.ts @@ -23,7 +23,7 @@ test.group('Query Builder | insert', (group) => { await cleanup() }) - test('perform insert', (assert) => { + test('perform insert', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -37,9 +37,11 @@ test.group('Query Builder | insert', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + + await connection.disconnect() }) - test('perform multi insert', (assert) => { + test('perform multi insert', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -56,9 +58,11 @@ test.group('Query Builder | insert', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + + await connection.disconnect() }) - test('define returning columns', (assert) => { + test('define returning columns', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -77,5 +81,6 @@ test.group('Query Builder | insert', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) }) diff --git a/test/database/query-builder.spec.ts b/test/database/query-builder.spec.ts index 5991294c..a75a87a0 100644 --- a/test/database/query-builder.spec.ts +++ b/test/database/query-builder.spec.ts @@ -33,7 +33,7 @@ if (process.env.DB !== 'sqlite') { await cleanup() }) - test('use read client when making select query', (assert) => { + test('use read client when making select query', async (assert) => { assert.plan(1) const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -48,9 +48,10 @@ if (process.env.DB !== 'sqlite') { db.select('*').from('users') db['getQueryClient']() + await connection.disconnect() }) - test('use write client for update', (assert) => { + test('use write client for update', async (assert) => { assert.plan(1) const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -65,9 +66,10 @@ if (process.env.DB !== 'sqlite') { db.from('users').update('username', 'virk') db['getQueryClient']() + await connection.disconnect() }) - test('use write client for delete', (assert) => { + test('use write client for delete', async (assert) => { assert.plan(1) const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -82,6 +84,7 @@ if (process.env.DB !== 'sqlite') { db.from('users').del() db['getQueryClient']() + await connection.disconnect() }) test('use transaction client when query is used inside a transaction', async () => { @@ -98,6 +101,7 @@ if (process.env.DB !== 'sqlite') { const trx = await client.transaction() await db.select('*').from('users').useTransaction(trx).exec() await trx.commit() + await connection.disconnect() }) test('use transaction client when insert query is used inside a transaction', async () => { @@ -114,6 +118,7 @@ if (process.env.DB !== 'sqlite') { const trx = await client.transaction() await db.table('users').useTransaction(trx).insert({ username: 'virk' }).exec() await trx.rollback() + await connection.disconnect() }) test('use transaction client when query is issued from transaction client', async () => { @@ -129,6 +134,7 @@ if (process.env.DB !== 'sqlite') { const trx = await client.transaction() await trx.query().select('*').from('users').exec() await trx.commit() + await connection.disconnect() }) test('use transaction client when insert query is issued from transaction client', async () => { @@ -157,7 +163,7 @@ test.group('Query Builder | from', (group) => { await cleanup() }) - test('define query table', (assert) => { + test('define query table', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -167,9 +173,10 @@ test.group('Query Builder | from', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('define table alias', (assert) => { + test('define table alias', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -191,7 +198,7 @@ test.group('Query Builder | where', (group) => { await cleanup() }) - test('add where clause', (assert) => { + test('add where clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -208,9 +215,10 @@ test.group('Query Builder | where', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add where clause as an object', (assert) => { + test('add where clause as an object', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -227,9 +235,10 @@ test.group('Query Builder | where', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add where wrapped clause', (assert) => { + test('add where wrapped clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -246,9 +255,10 @@ test.group('Query Builder | where', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add where clause with operator', (assert) => { + test('add where clause with operator', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -265,9 +275,10 @@ test.group('Query Builder | where', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add where clause as a raw query', (assert) => { + test('add where clause as a raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -284,9 +295,10 @@ test.group('Query Builder | where', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add orWhere clause', (assert) => { + test('add orWhere clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -305,9 +317,10 @@ test.group('Query Builder | where', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add orWhere wrapped clause', (assert) => { + test('add orWhere wrapped clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -343,7 +356,7 @@ test.group('Query Builder | whereNot', (group) => { await cleanup() }) - test('add where no clause', (assert) => { + test('add where no clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -360,9 +373,10 @@ test.group('Query Builder | whereNot', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add where not clause as an object', (assert) => { + test('add where not clause as an object', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -379,9 +393,10 @@ test.group('Query Builder | whereNot', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add where not wrapped clause', (assert) => { + test('add where not wrapped clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -398,9 +413,10 @@ test.group('Query Builder | whereNot', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add where not clause with operator', (assert) => { + test('add where not clause with operator', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -417,9 +433,10 @@ test.group('Query Builder | whereNot', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add where not clause as a raw query', (assert) => { + test('add where not clause as a raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -436,9 +453,10 @@ test.group('Query Builder | whereNot', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add orWhereNot clause', (assert) => { + test('add orWhereNot clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -457,9 +475,10 @@ test.group('Query Builder | whereNot', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add orWhereNot wrapped clause', (assert) => { + test('add orWhereNot wrapped clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -495,7 +514,7 @@ test.group('Query Builder | whereIn', (group) => { await cleanup() }) - test('add whereIn clause', (assert) => { + test('add whereIn clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -512,9 +531,10 @@ test.group('Query Builder | whereIn', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add whereIn as a query callback', (assert) => { + test('add whereIn as a query callback', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -535,9 +555,10 @@ test.group('Query Builder | whereIn', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add whereIn as a subquery', (assert) => { + test('add whereIn as a subquery', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -554,9 +575,10 @@ test.group('Query Builder | whereIn', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add whereIn as a rawquery', (assert) => { + test('add whereIn as a rawquery', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -579,9 +601,10 @@ test.group('Query Builder | whereIn', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add whereIn as a subquery with array of keys', (assert) => { + test('add whereIn as a subquery with array of keys', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -601,9 +624,10 @@ test.group('Query Builder | whereIn', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add whereIn as a 2d array', (assert) => { + test('add whereIn as a 2d array', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -620,9 +644,10 @@ test.group('Query Builder | whereIn', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add orWhereIn clause', (assert) => { + test('add orWhereIn clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -641,9 +666,10 @@ test.group('Query Builder | whereIn', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add orWhereIn as a query callback', (assert) => { + test('add orWhereIn as a query callback', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -682,7 +708,7 @@ test.group('Query Builder | whereNotIn', (group) => { await cleanup() }) - test('add whereNotIn clause', (assert) => { + test('add whereNotIn clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -699,9 +725,10 @@ test.group('Query Builder | whereNotIn', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add whereNotIn as a query callback', (assert) => { + test('add whereNotIn as a query callback', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -722,9 +749,10 @@ test.group('Query Builder | whereNotIn', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add whereNotIn as a sub query', (assert) => { + test('add whereNotIn as a sub query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -741,9 +769,10 @@ test.group('Query Builder | whereNotIn', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add whereNotIn as a 2d array', (assert) => { + test('add whereNotIn as a 2d array', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -760,9 +789,10 @@ test.group('Query Builder | whereNotIn', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add orWhereNotIn clause', (assert) => { + test('add orWhereNotIn clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -781,9 +811,10 @@ test.group('Query Builder | whereNotIn', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add orWhereNotIn as a subquery', (assert) => { + test('add orWhereNotIn as a subquery', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -822,7 +853,7 @@ test.group('Query Builder | whereNull', (group) => { await cleanup() }) - test('add where null clause', (assert) => { + test('add where null clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -839,9 +870,10 @@ test.group('Query Builder | whereNull', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add or where null clause', (assert) => { + test('add or where null clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -872,7 +904,7 @@ test.group('Query Builder | whereNotNull', (group) => { await cleanup() }) - test('add where not null clause', (assert) => { + test('add where not null clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -889,9 +921,10 @@ test.group('Query Builder | whereNotNull', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add or where not null clause', (assert) => { + test('add or where not null clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -922,7 +955,7 @@ test.group('Query Builder | whereExists', (group) => { await cleanup() }) - test('add where exists clause', (assert) => { + test('add where exists clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -943,9 +976,10 @@ test.group('Query Builder | whereExists', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add where exists clause as a subquery', (assert) => { + test('add where exists clause as a subquery', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -962,9 +996,10 @@ test.group('Query Builder | whereExists', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add or where exists clause', (assert) => { + test('add or where exists clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -985,9 +1020,10 @@ test.group('Query Builder | whereExists', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add or where exists clause as a subquery', (assert) => { + test('add or where exists clause as a subquery', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1016,7 +1052,7 @@ test.group('Query Builder | whereNotExists', (group) => { await cleanup() }) - test('add where exists clause', (assert) => { + test('add where exists clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1037,9 +1073,10 @@ test.group('Query Builder | whereNotExists', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add where exists clause as a subquery', (assert) => { + test('add where exists clause as a subquery', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1056,9 +1093,10 @@ test.group('Query Builder | whereNotExists', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add or where exists clause', (assert) => { + test('add or where exists clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1079,9 +1117,10 @@ test.group('Query Builder | whereNotExists', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add or where exists clause as a subquery', (assert) => { + test('add or where exists clause as a subquery', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1110,7 +1149,7 @@ test.group('Query Builder | whereBetween', (group) => { await cleanup() }) - test('add where between clause', (assert) => { + test('add where between clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1127,9 +1166,10 @@ test.group('Query Builder | whereBetween', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add where between clause as a raw query', (assert) => { + test('add where between clause as a raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1152,9 +1192,10 @@ test.group('Query Builder | whereBetween', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add or where between clause', (assert) => { + test('add or where between clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1171,9 +1212,10 @@ test.group('Query Builder | whereBetween', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add or where between clause as a raw query', (assert) => { + test('add or where between clause as a raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1208,7 +1250,7 @@ test.group('Query Builder | whereNotBetween', (group) => { await cleanup() }) - test('add where not between clause', (assert) => { + test('add where not between clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1225,9 +1267,10 @@ test.group('Query Builder | whereNotBetween', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add where not between clause as a raw query', (assert) => { + test('add where not between clause as a raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1250,9 +1293,10 @@ test.group('Query Builder | whereNotBetween', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add or where not between clause', (assert) => { + test('add or where not between clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1269,9 +1313,10 @@ test.group('Query Builder | whereNotBetween', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add or where not between clause as a raw query', (assert) => { + test('add or where not between clause as a raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1306,7 +1351,7 @@ test.group('Query Builder | whereRaw', (group) => { await cleanup() }) - test('add where raw clause', (assert) => { + test('add where raw clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1323,9 +1368,10 @@ test.group('Query Builder | whereRaw', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add where raw clause without bindings', (assert) => { + test('add where raw clause without bindings', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1342,9 +1388,10 @@ test.group('Query Builder | whereRaw', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add where raw clause with object of bindings', (assert) => { + test('add where raw clause with object of bindings', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1361,9 +1408,10 @@ test.group('Query Builder | whereRaw', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add where raw clause from a raw query', (assert) => { + test('add where raw clause from a raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1380,9 +1428,10 @@ test.group('Query Builder | whereRaw', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add or where raw clause', (assert) => { + test('add or where raw clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1413,7 +1462,7 @@ test.group('Query Builder | join', (group) => { await cleanup() }) - test('add query join', (assert) => { + test('add query join', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1430,9 +1479,10 @@ test.group('Query Builder | join', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query join with operator', (assert) => { + test('add query join with operator', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1449,9 +1499,10 @@ test.group('Query Builder | join', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query join using join callback', (assert) => { + test('add query join using join callback', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1472,9 +1523,10 @@ test.group('Query Builder | join', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query join as a raw query', (assert) => { + test('add query join as a raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1503,7 +1555,7 @@ test.group('Query Builder | innerJoin', (group) => { await cleanup() }) - test('add query innerJoin', (assert) => { + test('add query innerJoin', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1520,9 +1572,10 @@ test.group('Query Builder | innerJoin', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query innerJoin with operator', (assert) => { + test('add query innerJoin with operator', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1539,9 +1592,10 @@ test.group('Query Builder | innerJoin', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query innerJoin using join callback', (assert) => { + test('add query innerJoin using join callback', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1562,9 +1616,10 @@ test.group('Query Builder | innerJoin', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query innerJoin as a raw query', (assert) => { + test('add query innerJoin as a raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1593,7 +1648,7 @@ test.group('Query Builder | leftJoin', (group) => { await cleanup() }) - test('add query leftJoin', (assert) => { + test('add query leftJoin', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1610,9 +1665,10 @@ test.group('Query Builder | leftJoin', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query leftJoin with operator', (assert) => { + test('add query leftJoin with operator', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1629,9 +1685,10 @@ test.group('Query Builder | leftJoin', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query leftJoin using join callback', (assert) => { + test('add query leftJoin using join callback', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1652,9 +1709,10 @@ test.group('Query Builder | leftJoin', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query leftJoin as a raw query', (assert) => { + test('add query leftJoin as a raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1683,7 +1741,7 @@ test.group('Query Builder | leftOuterJoin', (group) => { await cleanup() }) - test('add query leftOuterJoin', (assert) => { + test('add query leftOuterJoin', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1700,9 +1758,10 @@ test.group('Query Builder | leftOuterJoin', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query leftOuterJoin with operator', (assert) => { + test('add query leftOuterJoin with operator', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1719,9 +1778,10 @@ test.group('Query Builder | leftOuterJoin', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query leftOuterJoin using join callback', (assert) => { + test('add query leftOuterJoin using join callback', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1742,9 +1802,10 @@ test.group('Query Builder | leftOuterJoin', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query leftOuterJoin as a raw query', (assert) => { + test('add query leftOuterJoin as a raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1773,7 +1834,7 @@ test.group('Query Builder | rightJoin', (group) => { await cleanup() }) - test('add query rightJoin', (assert) => { + test('add query rightJoin', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1790,9 +1851,10 @@ test.group('Query Builder | rightJoin', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query rightJoin with operator', (assert) => { + test('add query rightJoin with operator', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1809,9 +1871,10 @@ test.group('Query Builder | rightJoin', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query rightJoin using join callback', (assert) => { + test('add query rightJoin using join callback', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1832,9 +1895,10 @@ test.group('Query Builder | rightJoin', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query rightJoin as a raw query', (assert) => { + test('add query rightJoin as a raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1863,7 +1927,7 @@ test.group('Query Builder | rightOuterJoin', (group) => { await cleanup() }) - test('add query rightOuterJoin', (assert) => { + test('add query rightOuterJoin', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1880,9 +1944,10 @@ test.group('Query Builder | rightOuterJoin', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query rightOuterJoin with operator', (assert) => { + test('add query rightOuterJoin with operator', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1899,9 +1964,10 @@ test.group('Query Builder | rightOuterJoin', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query rightOuterJoin using join callback', (assert) => { + test('add query rightOuterJoin using join callback', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1922,9 +1988,10 @@ test.group('Query Builder | rightOuterJoin', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query rightOuterJoin as a raw query', (assert) => { + test('add query rightOuterJoin as a raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1953,7 +2020,7 @@ test.group('Query Builder | fullOuterJoin', (group) => { await cleanup() }) - test('add query fullOuterJoin', (assert) => { + test('add query fullOuterJoin', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1970,9 +2037,10 @@ test.group('Query Builder | fullOuterJoin', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query fullOuterJoin with operator', (assert) => { + test('add query fullOuterJoin with operator', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -1989,9 +2057,10 @@ test.group('Query Builder | fullOuterJoin', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query fullOuterJoin using join callback', (assert) => { + test('add query fullOuterJoin using join callback', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2012,9 +2081,10 @@ test.group('Query Builder | fullOuterJoin', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query fullOuterJoin as a raw query', (assert) => { + test('add query fullOuterJoin as a raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2043,7 +2113,7 @@ test.group('Query Builder | crossJoin', (group) => { await cleanup() }) - test('add query crossJoin', (assert) => { + test('add query crossJoin', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2060,9 +2130,10 @@ test.group('Query Builder | crossJoin', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query crossJoin with operator', (assert) => { + test('add query crossJoin with operator', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2079,9 +2150,10 @@ test.group('Query Builder | crossJoin', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query crossJoin using join callback', (assert) => { + test('add query crossJoin using join callback', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2102,9 +2174,10 @@ test.group('Query Builder | crossJoin', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add query crossJoin as a raw query', (assert) => { + test('add query crossJoin as a raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2133,7 +2206,7 @@ test.group('Query Builder | joinRaw', (group) => { await cleanup() }) - test('add join as a raw join', (assert) => { + test('add join as a raw join', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2150,9 +2223,10 @@ test.group('Query Builder | joinRaw', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add join as a raw join by passing the raw query output', (assert) => { + test('add join as a raw join by passing the raw query output', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2181,7 +2255,7 @@ test.group('Query Builder | distinct', (group) => { await cleanup() }) - test('define distinct columns', (assert) => { + test('define distinct columns', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2210,7 +2284,7 @@ test.group('Query Builder | groupBy', (group) => { await cleanup() }) - test('define group by columns', (assert) => { + test('define group by columns', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2239,7 +2313,7 @@ test.group('Query Builder | groupByRaw', (group) => { await cleanup() }) - test('define group by columns as a raw query', (assert) => { + test('define group by columns as a raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2268,7 +2342,7 @@ test.group('Query Builder | orderBy', (group) => { await cleanup() }) - test('define order by columns', (assert) => { + test('define order by columns', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2285,9 +2359,10 @@ test.group('Query Builder | orderBy', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('define order by columns with explicit direction', (assert) => { + test('define order by columns with explicit direction', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2304,9 +2379,10 @@ test.group('Query Builder | orderBy', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('define order by columns as an array of objects', (assert) => { + test('define order by columns as an array of objects', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2335,7 +2411,7 @@ test.group('Query Builder | orderByRaw', (group) => { await cleanup() }) - test('define order by columns as a raw query', (assert) => { + test('define order by columns as a raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2364,7 +2440,7 @@ test.group('Query Builder | offset', (group) => { await cleanup() }) - test('define select offset', (assert) => { + test('define select offset', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2393,7 +2469,7 @@ test.group('Query Builder | limit', (group) => { await cleanup() }) - test('define results limit', (assert) => { + test('define results limit', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2422,7 +2498,7 @@ test.group('Query Builder | union', (group) => { await cleanup() }) - test('define union query as a callback', (assert) => { + test('define union query as a callback', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2443,9 +2519,10 @@ test.group('Query Builder | union', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('define union query as a subquery', (assert) => { + test('define union query as a subquery', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2462,9 +2539,10 @@ test.group('Query Builder | union', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('define union query as a raw query', (assert) => { + test('define union query as a raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2481,9 +2559,10 @@ test.group('Query Builder | union', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('define union query as an array of callbacks', (assert) => { + test('define union query as an array of callbacks', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2504,9 +2583,10 @@ test.group('Query Builder | union', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('define union query as an array of subqueries', (assert) => { + test('define union query as an array of subqueries', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2523,9 +2603,10 @@ test.group('Query Builder | union', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('define union query as an array of raw queries', (assert) => { + test('define union query as an array of raw queries', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2554,7 +2635,7 @@ test.group('Query Builder | unionAll', (group) => { await cleanup() }) - test('define unionAll query as a callback', (assert) => { + test('define unionAll query as a callback', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2575,9 +2656,10 @@ test.group('Query Builder | unionAll', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('define unionAll query as a subquery', (assert) => { + test('define unionAll query as a subquery', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2594,9 +2676,10 @@ test.group('Query Builder | unionAll', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('define unionAll query as a raw query', (assert) => { + test('define unionAll query as a raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2613,9 +2696,10 @@ test.group('Query Builder | unionAll', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('define unionAll query as an array of callbacks', (assert) => { + test('define unionAll query as an array of callbacks', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2636,9 +2720,10 @@ test.group('Query Builder | unionAll', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('define unionAll query as an array of subqueries', (assert) => { + test('define unionAll query as an array of subqueries', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2655,9 +2740,10 @@ test.group('Query Builder | unionAll', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('define unionAll query as an array of raw queries', (assert) => { + test('define unionAll query as an array of raw queries', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2686,7 +2772,7 @@ test.group('Query Builder | forUpdate', (group) => { await cleanup() }) - test('define FOR UPDATE lock', (assert) => { + test('define FOR UPDATE lock', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2703,9 +2789,10 @@ test.group('Query Builder | forUpdate', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('define FOR UPDATE lock with additional tables (pg only)', (assert) => { + test('define FOR UPDATE lock with additional tables (pg only)', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2734,7 +2821,7 @@ test.group('Query Builder | forShare', (group) => { await cleanup() }) - test('define FOR SHARE lock', (assert) => { + test('define FOR SHARE lock', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2751,9 +2838,10 @@ test.group('Query Builder | forShare', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('define FOR SHARE lock with additional tables (pg only)', (assert) => { + test('define FOR SHARE lock with additional tables (pg only)', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2783,7 +2871,7 @@ if (['pg', 'mysql'].includes(process.env.DB!)) { await cleanup() }) - test('add no wait instruction to the query', (assert) => { + test('add no wait instruction to the query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2814,7 +2902,7 @@ if (['pg', 'mysql'].includes(process.env.DB!)) { await cleanup() }) - test('add skip locked instruction to the query', (assert) => { + test('add skip locked instruction to the query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2846,7 +2934,7 @@ test.group('Query Builder | having', (group) => { await cleanup() }) - test('add having clause', (assert) => { + test('add having clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2863,9 +2951,10 @@ test.group('Query Builder | having', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add having clause as a callback', (assert) => { + test('add having clause as a callback', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2886,9 +2975,10 @@ test.group('Query Builder | having', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add having clause value being a raw query', (assert) => { + test('add having clause value being a raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() const ref = connection.client!.ref.bind(connection.client!) @@ -2914,9 +3004,10 @@ test.group('Query Builder | having', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add having clause value being a sub query', (assert) => { + test('add having clause value being a sub query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2941,9 +3032,10 @@ test.group('Query Builder | having', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add having clause as a raw query', (assert) => { + test('add having clause as a raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2960,9 +3052,10 @@ test.group('Query Builder | having', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add or having clause', (assert) => { + test('add or having clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -2993,7 +3086,7 @@ test.group('Query Builder | havingIn', (group) => { await cleanup() }) - test('add having in clause', (assert) => { + test('add having in clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3010,9 +3103,10 @@ test.group('Query Builder | havingIn', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add having in clause values as subqueries', (assert) => { + test('add having in clause values as subqueries', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3029,9 +3123,10 @@ test.group('Query Builder | havingIn', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add having in clause values as raw queries', (assert) => { + test('add having in clause values as raw queries', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3048,9 +3143,10 @@ test.group('Query Builder | havingIn', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add having in clause values as query callbacks', (assert) => { + test('add having in clause values as query callbacks', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3071,9 +3167,10 @@ test.group('Query Builder | havingIn', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add or having in clause', (assert) => { + test('add or having in clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3104,7 +3201,7 @@ test.group('Query Builder | havingNotIn', (group) => { await cleanup() }) - test('add not having in clause', (assert) => { + test('add not having in clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3121,9 +3218,10 @@ test.group('Query Builder | havingNotIn', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add having in clause values as subqueries', (assert) => { + test('add having in clause values as subqueries', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3140,9 +3238,10 @@ test.group('Query Builder | havingNotIn', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add having in clause values as raw queries', (assert) => { + test('add having in clause values as raw queries', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3159,9 +3258,10 @@ test.group('Query Builder | havingNotIn', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add having in clause values as query callbacks', (assert) => { + test('add having in clause values as query callbacks', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3182,9 +3282,10 @@ test.group('Query Builder | havingNotIn', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add or having in clause', (assert) => { + test('add or having in clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3215,7 +3316,7 @@ test.group('Query Builder | havingNull', (group) => { await cleanup() }) - test('add having null clause', (assert) => { + test('add having null clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3232,9 +3333,10 @@ test.group('Query Builder | havingNull', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add or having null clause', (assert) => { + test('add or having null clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3265,7 +3367,7 @@ test.group('Query Builder | havingNotNull', (group) => { await cleanup() }) - test('add having null clause', (assert) => { + test('add having null clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3282,9 +3384,10 @@ test.group('Query Builder | havingNotNull', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add or having not null clause', (assert) => { + test('add or having not null clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3315,7 +3418,7 @@ test.group('Query Builder | havingExists', (group) => { await cleanup() }) - test('add having exists clause', (assert) => { + test('add having exists clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3336,9 +3439,10 @@ test.group('Query Builder | havingExists', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add having exists clause as a subquery', (assert) => { + test('add having exists clause as a subquery', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3355,9 +3459,10 @@ test.group('Query Builder | havingExists', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add or having exists clause', (assert) => { + test('add or having exists clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3396,7 +3501,7 @@ test.group('Query Builder | havingNotExists', (group) => { await cleanup() }) - test('add having not exists clause', (assert) => { + test('add having not exists clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3417,9 +3522,10 @@ test.group('Query Builder | havingNotExists', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add having not exists clause as a subquery', (assert) => { + test('add having not exists clause as a subquery', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3436,9 +3542,10 @@ test.group('Query Builder | havingNotExists', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add or having not exists clause', (assert) => { + test('add or having not exists clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3477,7 +3584,7 @@ test.group('Query Builder | havingBetween', (group) => { await cleanup() }) - test('add having between clause', (assert) => { + test('add having between clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3494,9 +3601,10 @@ test.group('Query Builder | havingBetween', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add having between clause with raw values', (assert) => { + test('add having between clause with raw values', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3519,9 +3627,10 @@ test.group('Query Builder | havingBetween', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add having between clause with subqueries', (assert) => { + test('add having between clause with subqueries', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3544,9 +3653,10 @@ test.group('Query Builder | havingBetween', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add or having between clause', (assert) => { + test('add or having between clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3577,7 +3687,7 @@ test.group('Query Builder | havingNotBetween', (group) => { await cleanup() }) - test('add having not between clause', (assert) => { + test('add having not between clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3594,9 +3704,10 @@ test.group('Query Builder | havingNotBetween', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add having not between clause with raw values', (assert) => { + test('add having not between clause with raw values', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3619,9 +3730,10 @@ test.group('Query Builder | havingNotBetween', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add having not between clause with subqueries', (assert) => { + test('add having not between clause with subqueries', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3644,9 +3756,10 @@ test.group('Query Builder | havingNotBetween', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add or having not between clause', (assert) => { + test('add or having not between clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3677,7 +3790,7 @@ test.group('Query Builder | havingRaw', (group) => { await cleanup() }) - test('add having raw clause', (assert) => { + test('add having raw clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3694,9 +3807,10 @@ test.group('Query Builder | havingRaw', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add having raw clause without bindings', (assert) => { + test('add having raw clause without bindings', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3713,9 +3827,10 @@ test.group('Query Builder | havingRaw', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add having raw clause with object of bindings', (assert) => { + test('add having raw clause with object of bindings', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3732,9 +3847,10 @@ test.group('Query Builder | havingRaw', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add having raw clause from a raw query', (assert) => { + test('add having raw clause from a raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3751,9 +3867,10 @@ test.group('Query Builder | havingRaw', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('add or having raw clause', (assert) => { + test('add or having raw clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3784,7 +3901,7 @@ test.group('Query Builder | clearSelect', (group) => { await cleanup() }) - test('clear selected columns', (assert) => { + test('clear selected columns', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3815,7 +3932,7 @@ test.group('Query Builder | clearWhere', (group) => { await cleanup() }) - test('clear where clauses', (assert) => { + test('clear where clauses', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3846,7 +3963,7 @@ test.group('Query Builder | clearOrder', (group) => { await cleanup() }) - test('clear order by columns', (assert) => { + test('clear order by columns', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3877,7 +3994,7 @@ test.group('Query Builder | clearHaving', (group) => { await cleanup() }) - test('clear having clause', (assert) => { + test('clear having clause', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3908,7 +4025,7 @@ test.group('Query Builder | count', (group) => { await cleanup() }) - test('count all rows', (assert) => { + test('count all rows', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3925,9 +4042,10 @@ test.group('Query Builder | count', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('count multiple rows', (assert) => { + test('count multiple rows', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3944,9 +4062,10 @@ test.group('Query Builder | count', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('count by raw query', (assert) => { + test('count by raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3968,9 +4087,10 @@ test.group('Query Builder | count', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('count by subquery', (assert) => { + test('count by subquery', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -3989,9 +4109,10 @@ test.group('Query Builder | count', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('count by raw query on multiple columns', (assert) => { + test('count by raw query on multiple columns', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4014,9 +4135,10 @@ test.group('Query Builder | count', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('count by subquery on multiple columns', (assert) => { + test('count by subquery on multiple columns', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4051,7 +4173,7 @@ test.group('Query Builder | countDistinct', (group) => { await cleanup() }) - test('count all rows', (assert) => { + test('count all rows', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4068,9 +4190,10 @@ test.group('Query Builder | countDistinct', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('count multiple rows', (assert) => { + test('count multiple rows', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4087,9 +4210,10 @@ test.group('Query Builder | countDistinct', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('count by raw query', (assert) => { + test('count by raw query', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4111,9 +4235,10 @@ test.group('Query Builder | countDistinct', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('count by subquery', (assert) => { + test('count by subquery', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4132,9 +4257,10 @@ test.group('Query Builder | countDistinct', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('count by raw query on multiple columns', (assert) => { + test('count by raw query on multiple columns', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4157,9 +4283,10 @@ test.group('Query Builder | countDistinct', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('count by subquery on multiple columns', (assert) => { + test('count by subquery on multiple columns', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4194,7 +4321,7 @@ test.group('Query Builder | min', (group) => { await cleanup() }) - test('use min function', (assert) => { + test('use min function', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4211,9 +4338,10 @@ test.group('Query Builder | min', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use min function for multiple times', (assert) => { + test('use min function for multiple times', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4230,9 +4358,10 @@ test.group('Query Builder | min', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use raw queries to compute min', (assert) => { + test('use raw queries to compute min', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4254,9 +4383,10 @@ test.group('Query Builder | min', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use subqueries to compute min', (assert) => { + test('use subqueries to compute min', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4275,9 +4405,10 @@ test.group('Query Builder | min', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use raw query to compute min with multiple columns', (assert) => { + test('use raw query to compute min with multiple columns', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4300,9 +4431,10 @@ test.group('Query Builder | min', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use subquery to compute min with multiple columns', (assert) => { + test('use subquery to compute min with multiple columns', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4337,7 +4469,7 @@ test.group('Query Builder | max', (group) => { await cleanup() }) - test('use max function', (assert) => { + test('use max function', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4354,9 +4486,10 @@ test.group('Query Builder | max', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use max function for multiple times', (assert) => { + test('use max function for multiple times', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4373,9 +4506,10 @@ test.group('Query Builder | max', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use raw queries to compute max', (assert) => { + test('use raw queries to compute max', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4397,9 +4531,10 @@ test.group('Query Builder | max', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use subqueries to compute max', (assert) => { + test('use subqueries to compute max', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4418,9 +4553,10 @@ test.group('Query Builder | max', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use raw query to compute max with multiple columns', (assert) => { + test('use raw query to compute max with multiple columns', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4443,9 +4579,10 @@ test.group('Query Builder | max', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use subquery to compute max with multiple columns', (assert) => { + test('use subquery to compute max with multiple columns', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4480,7 +4617,7 @@ test.group('Query Builder | sum', (group) => { await cleanup() }) - test('use sum function', (assert) => { + test('use sum function', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4497,9 +4634,10 @@ test.group('Query Builder | sum', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use sum function for multiple times', (assert) => { + test('use sum function for multiple times', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4516,9 +4654,10 @@ test.group('Query Builder | sum', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use raw queries to compute sum', (assert) => { + test('use raw queries to compute sum', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4540,9 +4679,10 @@ test.group('Query Builder | sum', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use subqueries to compute sum', (assert) => { + test('use subqueries to compute sum', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4561,9 +4701,10 @@ test.group('Query Builder | sum', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use raw query to compute sum with multiple columns', (assert) => { + test('use raw query to compute sum with multiple columns', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4586,9 +4727,10 @@ test.group('Query Builder | sum', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use subquery to compute sum with multiple columns', (assert) => { + test('use subquery to compute sum with multiple columns', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4623,7 +4765,7 @@ test.group('Query Builder | avg', (group) => { await cleanup() }) - test('use avg function', (assert) => { + test('use avg function', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4640,9 +4782,10 @@ test.group('Query Builder | avg', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use avg function for multiple times', (assert) => { + test('use avg function for multiple times', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4659,9 +4802,10 @@ test.group('Query Builder | avg', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use raw queries to compute avg', (assert) => { + test('use raw queries to compute avg', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4683,9 +4827,10 @@ test.group('Query Builder | avg', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use subqueries to compute avg', (assert) => { + test('use subqueries to compute avg', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4704,9 +4849,10 @@ test.group('Query Builder | avg', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use raw query to compute avg with multiple columns', (assert) => { + test('use raw query to compute avg with multiple columns', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4729,9 +4875,10 @@ test.group('Query Builder | avg', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use subquery to compute avg with multiple columns', (assert) => { + test('use subquery to compute avg with multiple columns', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4766,7 +4913,7 @@ test.group('Query Builder | avgDistinct', (group) => { await cleanup() }) - test('use avgDistinct function', (assert) => { + test('use avgDistinct function', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4783,9 +4930,10 @@ test.group('Query Builder | avgDistinct', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use avgDistinct function for multiple times', (assert) => { + test('use avgDistinct function for multiple times', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4802,9 +4950,10 @@ test.group('Query Builder | avgDistinct', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use raw queries to compute avgDistinct', (assert) => { + test('use raw queries to compute avgDistinct', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4826,9 +4975,10 @@ test.group('Query Builder | avgDistinct', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use subqueries to compute avgDistinct', (assert) => { + test('use subqueries to compute avgDistinct', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4847,9 +4997,10 @@ test.group('Query Builder | avgDistinct', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use raw query to compute avgDistinct with multiple columns', (assert) => { + test('use raw query to compute avgDistinct with multiple columns', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4872,9 +5023,10 @@ test.group('Query Builder | avgDistinct', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) - test('use subquery to compute avgDistinct with multiple columns', (assert) => { + test('use subquery to compute avgDistinct with multiple columns', async (assert) => { const connection = new Connection('primary', getConfig(), getLogger()) connection.connect() @@ -4897,5 +5049,6 @@ test.group('Query Builder | avgDistinct', (group) => { assert.equal(sql, knexSql) assert.deepEqual(bindings, knexBindings) + await connection.disconnect() }) }) diff --git a/test/database/transactions.spec.ts b/test/database/transactions.spec.ts index e79d0d7b..a5c3aa2a 100644 --- a/test/database/transactions.spec.ts +++ b/test/database/transactions.spec.ts @@ -39,6 +39,8 @@ test.group('Transaction | query', (group) => { assert.isArray(results) assert.lengthOf(results, 0) + + await connection.disconnect() }) test('commit insert', async (assert) => { @@ -53,6 +55,8 @@ test.group('Transaction | query', (group) => { assert.isArray(results) assert.lengthOf(results, 1) assert.equal(results[0].username, 'virk') + + await connection.disconnect() }) test('rollback insert', async (assert) => { @@ -66,6 +70,8 @@ test.group('Transaction | query', (group) => { const results = await new QueryClient('dual', connection).query().from('users') assert.isArray(results) assert.lengthOf(results, 0) + + await connection.disconnect() }) test('perform nested transactions with save points', async (assert) => { @@ -98,6 +104,8 @@ test.group('Transaction | query', (group) => { assert.isArray(results) assert.lengthOf(results, 1) assert.equal(results[0].username, 'virk') + + await connection.disconnect() }) test('emit after commit event', async (assert) => { @@ -118,6 +126,8 @@ test.group('Transaction | query', (group) => { assert.deepEqual(db.listenerCount('commit'), 0) assert.deepEqual(db.listenerCount('rollback'), 0) assert.deepEqual(stack, ['commit']) + + await connection.disconnect() }) test('execute before and after rollback hooks', async (assert) => { @@ -137,5 +147,7 @@ test.group('Transaction | query', (group) => { assert.deepEqual(db.listenerCount('commit'), 0) assert.deepEqual(db.listenerCount('rollback'), 0) assert.deepEqual(stack, ['rollback']) + + await connection.disconnect() }) }) diff --git a/test/orm/adapter.spec.ts b/test/orm/adapter.spec.ts index 9bf77238..44a219cf 100644 --- a/test/orm/adapter.spec.ts +++ b/test/orm/adapter.spec.ts @@ -13,13 +13,19 @@ import test from 'japa' import { column } from '../../src/Orm/Decorators' import { setup, cleanup, getDb, resetTables, getBaseModel, ormAdapter } from '../../test-helpers' +let db: ReturnType +let BaseModel: ReturnType + test.group('Adapter', (group) => { group.before(async () => { + db = getDb() + BaseModel = getBaseModel(ormAdapter(db)) await setup() }) group.after(async () => { await cleanup() + await db.manager.closeAll() }) group.afterEach(async () => { @@ -27,8 +33,6 @@ test.group('Adapter', (group) => { }) test('make insert call using a model', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -52,8 +56,6 @@ test.group('Adapter', (group) => { }) test('make update call using a model', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -82,9 +84,6 @@ test.group('Adapter', (group) => { }) test('make delete call using a model', async (assert) => { - const db = getDb() - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -113,9 +112,6 @@ test.group('Adapter', (group) => { }) test('get array of model instances using the all call', async (assert) => { - const db = getDb() - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -145,8 +141,6 @@ test.group('Adapter', (group) => { }) test('use transaction client set on the model for the insert', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -158,7 +152,6 @@ test.group('Adapter', (group) => { } User.$boot() - const db = getDb() const trx = await db.transaction() const user = new User() @@ -178,8 +171,6 @@ test.group('Adapter', (group) => { }) test('do not insert when transaction rollbacks', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -191,7 +182,6 @@ test.group('Adapter', (group) => { } User.$boot() - const db = getDb() const trx = await db.transaction() const user = new User() @@ -211,8 +201,6 @@ test.group('Adapter', (group) => { }) test('cleanup old trx event listeners when transaction is updated', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -224,7 +212,6 @@ test.group('Adapter', (group) => { } User.$boot() - const db = getDb() const trx = await db.transaction() const trx1 = await trx.transaction() @@ -239,8 +226,6 @@ test.group('Adapter', (group) => { }) test('use transaction client set on the model for the update', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -261,7 +246,6 @@ test.group('Adapter', (group) => { assert.isFalse(user.$isDirty) assert.isTrue(user.$persisted) - const db = getDb() const trx = await db.transaction() user.$trx = trx user.username = 'nikk' @@ -274,9 +258,6 @@ test.group('Adapter', (group) => { }) test('use transaction client set on the model for the delete', async (assert) => { - const db = getDb() - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' diff --git a/test/orm/base-model-options.spec.ts b/test/orm/base-model-options.spec.ts index 5d562344..23a748fa 100644 --- a/test/orm/base-model-options.spec.ts +++ b/test/orm/base-model-options.spec.ts @@ -15,13 +15,19 @@ import { Profiler } from '@adonisjs/profiler/build/standalone' import { column } from '../../src/Orm/Decorators' import { setup, cleanup, getDb, resetTables, getBaseModel, ormAdapter } from '../../test-helpers' +let db: ReturnType +let BaseModel: ReturnType + test.group('Model options | QueryBuilder', (group) => { group.before(async () => { + db = getDb() + BaseModel = getBaseModel(ormAdapter(db)) await setup() }) group.after(async () => { await cleanup() + await db.manager.closeAll() }) group.afterEach(async () => { @@ -29,8 +35,6 @@ test.group('Model options | QueryBuilder', (group) => { }) test('query builder set model options from the query client', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -41,7 +45,6 @@ test.group('Model options | QueryBuilder', (group) => { public username: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const users = await User.query().exec() @@ -52,8 +55,6 @@ test.group('Model options | QueryBuilder', (group) => { }) test('query builder set model options when only one row is fetched', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -64,7 +65,6 @@ test.group('Model options | QueryBuilder', (group) => { public username: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const user = await User.query().first() @@ -76,11 +76,14 @@ test.group('Model options | QueryBuilder', (group) => { test.group('Model options | Adapter', (group) => { group.before(async () => { + db = getDb() + BaseModel = getBaseModel(ormAdapter(db)) await setup() }) group.after(async () => { await cleanup() + await db.manager.closeAll() }) group.afterEach(async () => { @@ -88,8 +91,6 @@ test.group('Model options | Adapter', (group) => { }) test('use correct client when custom connection is defined', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -100,7 +101,6 @@ test.group('Model options | Adapter', (group) => { public username: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const user = await User.query({ connection: 'secondary' }).first() @@ -109,8 +109,6 @@ test.group('Model options | Adapter', (group) => { }) test('pass profiler to the client when defined explicitly', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -121,7 +119,6 @@ test.group('Model options | Adapter', (group) => { public username: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const profiler = new Profiler({}) @@ -131,8 +128,6 @@ test.group('Model options | Adapter', (group) => { }) test('pass custom client to query builder', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -143,7 +138,6 @@ test.group('Model options | Adapter', (group) => { public username: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const client = db.connection() @@ -153,8 +147,6 @@ test.group('Model options | Adapter', (group) => { }) test('pass transaction client to query builder', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -165,7 +157,6 @@ test.group('Model options | Adapter', (group) => { public username: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const trx = await db.connection('secondary').transaction() @@ -178,11 +169,14 @@ test.group('Model options | Adapter', (group) => { test.group('Model options | Model.find', (group) => { group.before(async () => { + db = getDb() + BaseModel = getBaseModel(ormAdapter(db)) await setup() }) group.after(async () => { await cleanup() + await db.manager.closeAll() }) group.afterEach(async () => { @@ -190,8 +184,6 @@ test.group('Model options | Model.find', (group) => { }) test('define custom connection', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -202,7 +194,6 @@ test.group('Model options | Model.find', (group) => { public username: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const user = await User.find(1, { connection: 'secondary' }) @@ -211,8 +202,6 @@ test.group('Model options | Model.find', (group) => { }) test('define custom profiler', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -223,7 +212,6 @@ test.group('Model options | Model.find', (group) => { public username: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const profiler = new Profiler({}) @@ -232,8 +220,6 @@ test.group('Model options | Model.find', (group) => { }) test('define custom query client', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -244,7 +230,6 @@ test.group('Model options | Model.find', (group) => { public username: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const client = db.connection() @@ -256,11 +241,14 @@ test.group('Model options | Model.find', (group) => { test.group('Model options | Model.findOrFail', (group) => { group.before(async () => { + db = getDb() + BaseModel = getBaseModel(ormAdapter(db)) await setup() }) group.after(async () => { await cleanup() + await db.manager.closeAll() }) group.afterEach(async () => { @@ -268,8 +256,6 @@ test.group('Model options | Model.findOrFail', (group) => { }) test('define custom connection', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -280,7 +266,6 @@ test.group('Model options | Model.findOrFail', (group) => { public username: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const user = await User.findOrFail(1, { connection: 'secondary' }) @@ -289,8 +274,6 @@ test.group('Model options | Model.findOrFail', (group) => { }) test('define custom profiler', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -310,8 +293,6 @@ test.group('Model options | Model.findOrFail', (group) => { }) test('define custom query client', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -322,7 +303,6 @@ test.group('Model options | Model.findOrFail', (group) => { public username: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const client = db.connection('secondary') @@ -334,11 +314,14 @@ test.group('Model options | Model.findOrFail', (group) => { test.group('Model options | Model.findMany', (group) => { group.before(async () => { + db = getDb() + BaseModel = getBaseModel(ormAdapter(db)) await setup() }) group.after(async () => { await cleanup() + await db.manager.closeAll() }) group.afterEach(async () => { @@ -346,8 +329,6 @@ test.group('Model options | Model.findMany', (group) => { }) test('define custom connection', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -358,7 +339,6 @@ test.group('Model options | Model.findMany', (group) => { public username: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const users = await User.findMany([1], { connection: 'secondary' }) @@ -367,8 +347,6 @@ test.group('Model options | Model.findMany', (group) => { }) test('define custom profiler', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -379,7 +357,6 @@ test.group('Model options | Model.findMany', (group) => { public username: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const profiler = new Profiler({}) @@ -388,8 +365,6 @@ test.group('Model options | Model.findMany', (group) => { }) test('define custom query client', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -400,7 +375,6 @@ test.group('Model options | Model.findMany', (group) => { public username: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const client = db.connection('secondary') @@ -412,11 +386,14 @@ test.group('Model options | Model.findMany', (group) => { test.group('Model options | Model.firstOrSave', (group) => { group.before(async () => { + db = getDb() + BaseModel = getBaseModel(ormAdapter(db)) await setup() }) group.after(async () => { await cleanup() + await db.manager.closeAll() }) group.afterEach(async () => { @@ -424,8 +401,6 @@ test.group('Model options | Model.firstOrSave', (group) => { }) test('define custom connection', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -436,7 +411,6 @@ test.group('Model options | Model.firstOrSave', (group) => { public username: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const user = await User.firstOrSave({ username: 'virk' }, undefined, { connection: 'secondary' }) @@ -448,8 +422,6 @@ test.group('Model options | Model.firstOrSave', (group) => { }) test('define custom connection when search fails', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -460,7 +432,6 @@ test.group('Model options | Model.firstOrSave', (group) => { public username: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const user = await User.firstOrSave({ username: 'nikk' }, undefined, { connection: 'secondary' }) @@ -472,8 +443,6 @@ test.group('Model options | Model.firstOrSave', (group) => { }) test('define custom profiler', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -484,7 +453,6 @@ test.group('Model options | Model.firstOrSave', (group) => { public username: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const profiler = new Profiler({}) @@ -497,8 +465,6 @@ test.group('Model options | Model.firstOrSave', (group) => { }) test('define custom profiler when search fails', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -509,7 +475,6 @@ test.group('Model options | Model.firstOrSave', (group) => { public username: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const profiler = new Profiler({}) @@ -521,8 +486,6 @@ test.group('Model options | Model.firstOrSave', (group) => { }) test('define custom client', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -533,7 +496,6 @@ test.group('Model options | Model.firstOrSave', (group) => { public username: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const client = db.connection('secondary') @@ -546,8 +508,6 @@ test.group('Model options | Model.firstOrSave', (group) => { }) test('define custom client when search fails', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'users' @@ -558,7 +518,6 @@ test.group('Model options | Model.firstOrSave', (group) => { public username: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const client = db.connection('secondary') diff --git a/test/orm/base-model.spec.ts b/test/orm/base-model.spec.ts index 17309fb4..cccad146 100644 --- a/test/orm/base-model.spec.ts +++ b/test/orm/base-model.spec.ts @@ -22,10 +22,20 @@ import { getBaseModel, } from '../../test-helpers' -test.group('Base model | boot', () => { - test('compute table name from model name', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) +let db: ReturnType +let BaseModel: ReturnType +test.group('Base model | boot', (group) => { + group.before(async () => { + db = getDb() + BaseModel = getBaseModel(ormAdapter(db)) + }) + + group.after(async () => { + await db.manager.closeAll() + }) + + test('compute table name from model name', async (assert) => { class User extends BaseModel { @column({ primary: true }) public id: number @@ -39,8 +49,6 @@ test.group('Base model | boot', () => { }) test('allow overriding table name', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $table = 'my_users' @@ -56,8 +64,6 @@ test.group('Base model | boot', () => { }) test('set increments to true by default', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column({ primary: true }) public id: number @@ -71,8 +77,6 @@ test.group('Base model | boot', () => { }) test('allow overriding increments', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public static $increments = false @@ -88,7 +92,6 @@ test.group('Base model | boot', () => { }) test('initiate all required static properties', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) class User extends BaseModel { } @@ -99,10 +102,17 @@ test.group('Base model | boot', () => { }) }) -test.group('Base Model | getter-setters', () => { - test('set property on $attributes when defined on model instance', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) +test.group('Base Model | getter-setters', (group) => { + group.before(async () => { + db = getDb() + BaseModel = getBaseModel(ormAdapter(db)) + }) + + group.after(async () => { + await db.manager.closeAll() + }) + test('set property on $attributes when defined on model instance', (assert) => { class User extends BaseModel { @column() public username: string @@ -115,8 +125,6 @@ test.group('Base Model | getter-setters', () => { }) test('pass value to setter when defined', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column() public set username (value: any) { @@ -131,8 +139,6 @@ test.group('Base Model | getter-setters', () => { }) test('set value on model instance when is not a column', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public username: string } @@ -146,8 +152,6 @@ test.group('Base Model | getter-setters', () => { }) test('get value from attributes', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column() public username: string @@ -160,8 +164,6 @@ test.group('Base Model | getter-setters', () => { }) test('rely on getter when column is defined as a getter', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column() public get username () { @@ -176,8 +178,6 @@ test.group('Base Model | getter-setters', () => { }) test('get value from model instance when is not a column', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { public username = 'virk' } @@ -188,8 +188,6 @@ test.group('Base Model | getter-setters', () => { }) test('get value for primary key', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column({ primary: true }) public id: number @@ -205,8 +203,6 @@ test.group('Base Model | getter-setters', () => { }) test('invoke getter when accessing value using $primaryKeyValue', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column({ primary: true }) public get id () { @@ -224,10 +220,17 @@ test.group('Base Model | getter-setters', () => { }) }) -test.group('Base Model | dirty', () => { - test('get dirty properties on a fresh model', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) +test.group('Base Model | dirty', (group) => { + group.before(async () => { + db = getDb() + BaseModel = getBaseModel(ormAdapter(db)) + }) + + group.after(async () => { + await db.manager.closeAll() + }) + test('get dirty properties on a fresh model', (assert) => { class User extends BaseModel { @column() public username: string @@ -241,8 +244,6 @@ test.group('Base Model | dirty', () => { }) test('get empty object when model is not dirty', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column() public username: string @@ -258,8 +259,6 @@ test.group('Base Model | dirty', () => { }) test('get empty object when model is not dirty with null values', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column() public username: string @@ -276,8 +275,6 @@ test.group('Base Model | dirty', () => { }) test('get empty object when model is not dirty with false values', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column() public username: string @@ -294,8 +291,6 @@ test.group('Base Model | dirty', () => { }) test('get values removed as a side-effect of fill as dirty', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - const adapter = new FakeAdapter() class User extends BaseModel { @column() @@ -320,10 +315,17 @@ test.group('Base Model | dirty', () => { }) }) -test.group('Base Model | persist', () => { - test('persist model with the adapter', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) +test.group('Base Model | persist', (group) => { + group.before(async () => { + db = getDb() + BaseModel = getBaseModel(ormAdapter(db)) + }) + + group.after(async () => { + await db.manager.closeAll() + }) + test('persist model with the adapter', async (assert) => { const adapter = new FakeAdapter() class User extends BaseModel { @@ -354,8 +356,6 @@ test.group('Base Model | persist', () => { }) test('merge adapter insert return value with attributes', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - const adapter = new FakeAdapter() class User extends BaseModel { @@ -388,8 +388,6 @@ test.group('Base Model | persist', () => { }) test('do not merge adapter results when not part of model columns', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - const adapter = new FakeAdapter() class User extends BaseModel { @@ -419,8 +417,6 @@ test.group('Base Model | persist', () => { }) test('issue update when model has already been persisted', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - const adapter = new FakeAdapter() class User extends BaseModel { @@ -448,8 +444,6 @@ test.group('Base Model | persist', () => { }) test('merge return values from update', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - const adapter = new FakeAdapter() class User extends BaseModel { @@ -484,8 +478,6 @@ test.group('Base Model | persist', () => { }) test('do not issue update when model is not dirty', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - const adapter = new FakeAdapter() class User extends BaseModel { @@ -510,10 +502,17 @@ test.group('Base Model | persist', () => { }) }) -test.group('Base Model | create from adapter results', () => { - test('create model instance using $createFromAdapterResult method', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) +test.group('Base Model | create from adapter results', (group) => { + group.before(async () => { + db = getDb() + BaseModel = getBaseModel(ormAdapter(db)) + }) + + group.after(async () => { + await db.manager.closeAll() + }) + test('create model instance using $createFromAdapterResult method', async (assert) => { class User extends BaseModel { @column() public username: string @@ -533,7 +532,6 @@ test.group('Base Model | create from adapter results', () => { }) test('set options on model instance passed to $createFromAdapterResult', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) class User extends BaseModel { @column() public username: string @@ -553,7 +551,6 @@ test.group('Base Model | create from adapter results', () => { }) test('return null from $createFromAdapterResult when input is not object', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) class User extends BaseModel { @column() public username: string @@ -567,8 +564,6 @@ test.group('Base Model | create from adapter results', () => { }) test('create multiple model instance using $createMultipleFromAdapterResult', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column() public username: string @@ -597,8 +592,6 @@ test.group('Base Model | create from adapter results', () => { }) test('pass model options via $createMultipleFromAdapterResult', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column() public username: string @@ -631,8 +624,6 @@ test.group('Base Model | create from adapter results', () => { }) test('skip rows that are not valid objects inside array', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column() public username: string @@ -655,10 +646,17 @@ test.group('Base Model | create from adapter results', () => { }) }) -test.group('Base Model | delete', () => { - test('delete model instance using adapter', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) +test.group('Base Model | delete', (group) => { + group.before(async () => { + db = getDb() + BaseModel = getBaseModel(ormAdapter(db)) + }) + + group.after(async () => { + await db.manager.closeAll() + }) + test('delete model instance using adapter', async (assert) => { const adapter = new FakeAdapter() class User extends BaseModel { @@ -679,8 +677,6 @@ test.group('Base Model | delete', () => { }) test('raise exception when trying to mutate model after deletion', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - const adapter = new FakeAdapter() assert.plan(1) @@ -702,10 +698,17 @@ test.group('Base Model | delete', () => { }) }) -test.group('Base Model | toJSON', () => { - test('convert model to its JSON representation', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) +test.group('Base Model | toJSON', (group) => { + group.before(async () => { + db = getDb() + BaseModel = getBaseModel(ormAdapter(db)) + }) + group.after(async () => { + await db.manager.closeAll() + }) + + test('convert model to its JSON representation', async (assert) => { class User extends BaseModel { @column() public username: string @@ -718,8 +721,6 @@ test.group('Base Model | toJSON', () => { }) test('use serializeAs key when converting model to JSON', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column({ serializeAs: 'theUsername' }) public username: string @@ -732,8 +733,6 @@ test.group('Base Model | toJSON', () => { }) test('do not serialize when serialize is set to false', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column({ serialize: false }) public username: string @@ -746,8 +745,6 @@ test.group('Base Model | toJSON', () => { }) test('add computed properties to toJSON result', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column() public username: string @@ -765,8 +762,6 @@ test.group('Base Model | toJSON', () => { }) test('do not add computed property when it returns undefined', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column() public username: string @@ -784,10 +779,17 @@ test.group('Base Model | toJSON', () => { }) }) -test.group('BaseModel | cache', () => { - test('cache getter value', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) +test.group('BaseModel | cache', (group) => { + group.before(async () => { + db = getDb() + BaseModel = getBaseModel(ormAdapter(db)) + }) + + group.after(async () => { + await db.manager.closeAll() + }) + test('cache getter value', (assert) => { let invokedCounter = 0 class User extends BaseModel { @@ -812,8 +814,6 @@ test.group('BaseModel | cache', () => { }) test('re-call getter function when attribute value changes', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - let invokedCounter = 0 class User extends BaseModel { @@ -841,10 +841,17 @@ test.group('BaseModel | cache', () => { }) }) -test.group('BaseModel | fill/merge', () => { - test('fill model instance with bulk attributes', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) +test.group('BaseModel | fill/merge', (group) => { + group.before(async () => { + db = getDb() + BaseModel = getBaseModel(ormAdapter(db)) + }) + + group.after(async () => { + await db.manager.closeAll() + }) + test('fill model instance with bulk attributes', (assert) => { class User extends BaseModel { @column() public username: string @@ -856,8 +863,6 @@ test.group('BaseModel | fill/merge', () => { }) test('set extra properties via fill', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column() public username: string @@ -870,8 +875,6 @@ test.group('BaseModel | fill/merge', () => { }) test('overwrite existing values when using fill', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column() public username: string @@ -889,8 +892,6 @@ test.group('BaseModel | fill/merge', () => { }) test('merge to existing when using merge instead of fill', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column() public username: string @@ -908,8 +909,6 @@ test.group('BaseModel | fill/merge', () => { }) test('invoke setter when using fill', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column() public username: string @@ -933,10 +932,17 @@ test.group('BaseModel | fill/merge', () => { }) }) -test.group('Base | apdater', () => { - test('pass model instance with attributes to the adapter insert method', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) +test.group('Base | apdater', (group) => { + group.before(async () => { + db = getDb() + BaseModel = getBaseModel(ormAdapter(db)) + }) + group.after(async () => { + await db.manager.closeAll() + }) + + test('pass model instance with attributes to the adapter insert method', async (assert) => { const adapter = new FakeAdapter() class User extends BaseModel { @@ -959,8 +965,6 @@ test.group('Base | apdater', () => { }) test('pass model instance with attributes to the adapter update method', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - const adapter = new FakeAdapter() class User extends BaseModel { @@ -993,8 +997,6 @@ test.group('Base | apdater', () => { }) test('pass model instance to the adapter delete method', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - const adapter = new FakeAdapter() class User extends BaseModel { @@ -1024,10 +1026,17 @@ test.group('Base | apdater', () => { }) }) -test.group('Base Model | sideloaded', () => { - test('define sideloaded properties using $consumeAdapterResults method', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) +test.group('Base Model | sideloaded', (group) => { + group.before(async () => { + db = getDb() + BaseModel = getBaseModel(ormAdapter(db)) + }) + + group.after(async () => { + await db.manager.closeAll() + }) + test('define sideloaded properties using $consumeAdapterResults method', (assert) => { class User extends BaseModel { @column() public username: string @@ -1041,8 +1050,6 @@ test.group('Base Model | sideloaded', () => { }) test('define sideloaded properties using $createFromAdapterResult method', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column() public username: string @@ -1054,8 +1061,6 @@ test.group('Base Model | sideloaded', () => { }) test('define sideloaded properties using $createMultipleFromAdapterResult method', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column() public username: string @@ -1074,10 +1079,17 @@ test.group('Base Model | sideloaded', () => { }) }) -test.group('Base Model | relations', () => { - test('set hasOne relation', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) +test.group('Base Model | relations', (group) => { + group.before(async () => { + db = getDb() + BaseModel = getBaseModel(ormAdapter(db)) + }) + + group.after(async () => { + await db.manager.closeAll() + }) + test('set hasOne relation', (assert) => { class Profile extends BaseModel { @column() public username: string @@ -1103,8 +1115,6 @@ test.group('Base Model | relations', () => { }) test('return null when relation is not preloaded', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class Profile extends BaseModel { @column() public username: string @@ -1131,8 +1141,6 @@ test.group('Base Model | relations', () => { }) test('serialize relation toJSON', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class Profile extends BaseModel { @column() public username: string @@ -1162,8 +1170,6 @@ test.group('Base Model | relations', () => { }) test('serialize relation toJSON with custom serializeAs key', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class Profile extends BaseModel { @column() public username: string @@ -1195,11 +1201,14 @@ test.group('Base Model | relations', () => { test.group('Base Model | fetch', (group) => { group.before(async () => { + db = getDb() + BaseModel = getBaseModel(ormAdapter(db)) await setup() }) group.after(async () => { await cleanup() + await db.manager.closeAll() }) group.afterEach(async () => { @@ -1207,8 +1216,6 @@ test.group('Base Model | fetch', (group) => { }) test('find using the primary key', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column({ primary: true }) public id: number @@ -1220,7 +1227,6 @@ test.group('Base Model | fetch', (group) => { public email: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const user = await User.find(1) @@ -1230,8 +1236,6 @@ test.group('Base Model | fetch', (group) => { test('raise exception when row is not found', async (assert) => { assert.plan(1) - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column({ primary: true }) public id: number @@ -1251,8 +1255,6 @@ test.group('Base Model | fetch', (group) => { }) test('find many using the primary key', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column({ primary: true }) public id: number @@ -1264,7 +1266,6 @@ test.group('Base Model | fetch', (group) => { public email: string } - const db = getDb() await db.insertQuery().table('users').multiInsert([ { username: 'virk' }, { username: 'nikk' }, @@ -1277,8 +1278,6 @@ test.group('Base Model | fetch', (group) => { }) test('return the existing row when search criteria matches', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column({ primary: true }) public id: number @@ -1290,7 +1289,6 @@ test.group('Base Model | fetch', (group) => { public email: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const user = await User.firstOrSave({ username: 'virk' }) @@ -1303,8 +1301,6 @@ test.group('Base Model | fetch', (group) => { }) test('create new row when search criteria doesn\'t match', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column({ primary: true }) public id: number @@ -1316,7 +1312,6 @@ test.group('Base Model | fetch', (group) => { public email: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const user = await User.firstOrSave({ username: 'nikk' }, { email: 'nikk@gmail.com' }) @@ -1332,8 +1327,6 @@ test.group('Base Model | fetch', (group) => { }) test('return the existing row when search criteria matches using firstOrNew', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column({ primary: true }) public id: number @@ -1345,7 +1338,6 @@ test.group('Base Model | fetch', (group) => { public email: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const user = await User.firstOrNew({ username: 'virk' }) @@ -1358,8 +1350,6 @@ test.group('Base Model | fetch', (group) => { }) test('instantiate new row when search criteria doesn\'t match using firstOrNew', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column({ primary: true }) public id: number @@ -1371,7 +1361,6 @@ test.group('Base Model | fetch', (group) => { public email: string } - const db = getDb() await db.insertQuery().table('users').insert({ username: 'virk' }) const user = await User.firstOrNew({ username: 'nikk' }, { email: 'nikk@gmail.com' }) diff --git a/test/orm/model-has-one.spec.ts b/test/orm/model-has-one.spec.ts index df55f968..8d4533bf 100644 --- a/test/orm/model-has-one.spec.ts +++ b/test/orm/model-has-one.spec.ts @@ -13,13 +13,19 @@ import test from 'japa' import { column, hasOne } from '../../src/Orm/Decorators' import { ormAdapter, getBaseModel, setup, cleanup, resetTables, getDb } from '../../test-helpers' +let db: ReturnType +let BaseModel: ReturnType + test.group('Model | Has one', (group) => { group.before(async () => { + db = getDb() + BaseModel = getBaseModel(ormAdapter(db)) await setup() }) group.after(async () => { await cleanup() + await db.manager.closeAll() }) group.afterEach(async () => { @@ -28,7 +34,6 @@ test.group('Model | Has one', (group) => { test('raise error when localKey is missing', (assert) => { assert.plan(1) - const BaseModel = getBaseModel(ormAdapter()) try { class Profile extends BaseModel { @@ -41,13 +46,15 @@ test.group('Model | Has one', (group) => { User.$boot() } catch ({ message }) { - assert.equal(message, 'E_MISSING_RELATED_LOCAL_KEY: User.id required by User.profile relation is missing') + assert.equal( + message, + 'E_MISSING_RELATED_LOCAL_KEY: User.id required by User.profile relation is missing', + ) } }) test('raise error when foreignKey is missing', (assert) => { assert.plan(1) - const BaseModel = getBaseModel(ormAdapter()) try { class Profile extends BaseModel { @@ -72,8 +79,6 @@ test.group('Model | Has one', (group) => { }) test('use primary key is as the local key', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class Profile extends BaseModel { @column() public userId: number @@ -94,8 +99,6 @@ test.group('Model | Has one', (group) => { }) test('use custom defined primary key', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class Profile extends BaseModel { @column() public userId: number @@ -120,8 +123,6 @@ test.group('Model | Has one', (group) => { }) test('compute foreign key from model name and primary key', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class Profile extends BaseModel { @column() public userId: number @@ -142,8 +143,6 @@ test.group('Model | Has one', (group) => { }) test('use pre defined foreign key', (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class Profile extends BaseModel { @column({ castAs: 'user_id' }) public userUid: number @@ -164,8 +163,6 @@ test.group('Model | Has one', (group) => { }) test('preload has one relationship', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class Profile extends BaseModel { @column({ primary: true }) public id: number @@ -185,7 +182,6 @@ test.group('Model | Has one', (group) => { public profile: Profile } - const db = getDb() await db.insertQuery().table('users').insert([{ username: 'virk' }, { username: 'nikk' }]) const users = await db.query().from('users') @@ -207,7 +203,6 @@ test.group('Model | Has one', (group) => { test('raise exception when local key is not selected', async (assert) => { assert.plan(1) - const BaseModel = getBaseModel(ormAdapter()) class Profile extends BaseModel { @column({ primary: true }) @@ -228,7 +223,6 @@ test.group('Model | Has one', (group) => { public profile: Profile } - const db = getDb() await db.insertQuery().table('users').insert([{ username: 'virk' }, { username: 'nikk' }]) const users = await db.query().from('users') @@ -251,7 +245,6 @@ test.group('Model | Has one', (group) => { }) test('pass callback to preload', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) class Profile extends BaseModel { @column({ primary: true }) @@ -272,7 +265,6 @@ test.group('Model | Has one', (group) => { public profile: Profile } - const db = getDb() await db.insertQuery().table('users').insert([{ username: 'virk' }, { username: 'nikk' }]) await db.insertQuery().table('profiles').insert([ { @@ -295,8 +287,6 @@ test.group('Model | Has one', (group) => { }) test('preload nested relations', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class Identity extends BaseModel { @column({ primary: true }) public id: number @@ -330,7 +320,6 @@ test.group('Model | Has one', (group) => { public profile: Profile } - const db = getDb() await db.insertQuery().table('users').insert([{ username: 'virk' }, { username: 'nikk' }]) await db.insertQuery().table('profiles').insert([ { @@ -366,8 +355,6 @@ test.group('Model | Has one', (group) => { }) test('preload nested relations with primary relation repeating twice', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class Identity extends BaseModel { @column({ primary: true }) public id: number @@ -401,7 +388,6 @@ test.group('Model | Has one', (group) => { public profile: Profile } - const db = getDb() await db.insertQuery().table('users').insert([{ username: 'virk' }, { username: 'nikk' }]) await db.insertQuery().table('profiles').insert([ { @@ -442,8 +428,6 @@ test.group('Model | Has one', (group) => { }) test('pass main query options down the chain', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class Identity extends BaseModel { @column({ primary: true }) public id: number @@ -477,7 +461,6 @@ test.group('Model | Has one', (group) => { public profile: Profile } - const db = getDb() await db.insertQuery().table('users').insert([{ username: 'virk' }, { username: 'nikk' }]) await db.insertQuery().table('profiles').insert([ { diff --git a/test/orm/model-query-builder.spec.ts b/test/orm/model-query-builder.spec.ts index d432e470..4befe456 100644 --- a/test/orm/model-query-builder.spec.ts +++ b/test/orm/model-query-builder.spec.ts @@ -22,13 +22,19 @@ import { getBaseModel, } from '../../test-helpers' +let db: ReturnType +let BaseModel: ReturnType + test.group('Model query builder', (group) => { group.before(async () => { + db = getDb() + BaseModel = getBaseModel(ormAdapter(db)) await setup() }) group.after(async () => { await cleanup() + await db.manager.closeAll() }) group.afterEach(async () => { @@ -36,8 +42,6 @@ test.group('Model query builder', (group) => { }) test('get instance of query builder for the given model', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) - class User extends BaseModel { @column({ primary: true }) public id: number @@ -51,7 +55,6 @@ test.group('Model query builder', (group) => { }) test('pre select the table for the query builder instance', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) class User extends BaseModel { @column({ primary: true }) public id: number @@ -65,7 +68,6 @@ test.group('Model query builder', (group) => { }) test('execute select queries', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) class User extends BaseModel { @column({ primary: true }) public id: number @@ -75,7 +77,6 @@ test.group('Model query builder', (group) => { } User.$boot() - const db = getDb() await db.insertQuery().table('users').insert([{ username: 'virk' }, { username: 'nikk' }]) const users = await User.query().where('username', 'virk') @@ -85,7 +86,6 @@ test.group('Model query builder', (group) => { }) test('pass custom connection to the model instance', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) class User extends BaseModel { @column({ primary: true }) public id: number @@ -95,7 +95,6 @@ test.group('Model query builder', (group) => { } User.$boot() - const db = getDb() await db.insertQuery().table('users').insert([{ username: 'virk' }, { username: 'nikk' }]) const users = await User.query({ connection: 'secondary' }).where('username', 'virk') @@ -106,7 +105,6 @@ test.group('Model query builder', (group) => { }) test('pass sideloaded attributes to the model instance', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) class User extends BaseModel { @column({ primary: true }) public id: number @@ -116,7 +114,6 @@ test.group('Model query builder', (group) => { } User.$boot() - const db = getDb() await db.insertQuery().table('users').insert([{ username: 'virk' }, { username: 'nikk' }]) const users = await User @@ -131,7 +128,6 @@ test.group('Model query builder', (group) => { }) test('pass custom profiler to the model instance', async (assert) => { - const BaseModel = getBaseModel(ormAdapter()) class User extends BaseModel { @column({ primary: true }) public id: number @@ -141,7 +137,6 @@ test.group('Model query builder', (group) => { } User.$boot() - const db = getDb() await db.insertQuery().table('users').insert([{ username: 'virk' }, { username: 'nikk' }]) const profiler = getProfiler()