Fix auto-merge conflict

This commit is contained in:
Brian Carlson 2025-07-19 06:47:37 -05:00
parent fbc1889dfe
commit bc627be6d7

View File

@ -36,8 +36,8 @@ describe('Transaction', () => {
it('should create a client with an empty temp table', async () => { it('should create a client with an empty temp table', async () => {
await withClient(async (client) => { await withClient(async (client) => {
const { rowCount } = await client.query('SELECT * FROM test_table') const { rows } = await client.query('SELECT * FROM test_table')
assert.equal(rowCount, 0, 'Temp table should be empty on creation') assert.equal(rows.length, 0, 'Temp table should be empty on creation')
}) })
}) })
@ -51,15 +51,15 @@ describe('Transaction', () => {
// while inside this transaction, the changes are not visible outside // while inside this transaction, the changes are not visible outside
await withClient(async (innerClient) => { await withClient(async (innerClient) => {
const { rowCount } = await innerClient.query('SELECT * FROM test_table') const { rows } = await innerClient.query('SELECT * FROM test_table')
assert.equal(rowCount, 0, 'Temp table should still be empty inside transaction') assert.equal(rows.length, 0, 'Temp table should still be empty inside transaction')
}) })
})
// now that the transaction is committed, the changes are visible outside // now that the transaction is committed, the changes are visible outside
await withClient(async (innerClient) => { await withClient(async (innerClient) => {
const { rowCount } = await innerClient.query('SELECT * FROM test_table') const { rows } = await innerClient.query('SELECT * FROM test_table')
assert.equal(rowCount, 1, 'Row should be inserted after transaction commits') assert.equal(rows.length, 1, 'Row should be inserted after transaction commits')
})
}) })
}) })
}) })
@ -76,8 +76,8 @@ describe('Transaction', () => {
} }
// After rollback, the table should still be empty // After rollback, the table should still be empty
const { rowCount } = await client.query('SELECT * FROM test_table') const { rows } = await client.query('SELECT * FROM test_table')
assert.equal(rowCount, 0, 'Temp table should be empty after rollback') assert.equal(rows.length, 0, 'Temp table should be empty after rollback')
}) })
}) })
@ -113,8 +113,8 @@ describe('Transaction', () => {
} }
// After rollback, the table should still be empty // After rollback, the table should still be empty
const { rowCount } = await pool.query('SELECT * FROM test_table') const { rows } = await pool.query('SELECT * FROM test_table')
assert.equal(rowCount, 0, 'Temp table should be empty after pool rollback') assert.equal(rows.length, 0, 'Temp table should be empty after pool rollback')
} finally { } finally {
await pool.end() await pool.end()
} }