Ignore Oracle on bulk upsert tests.

This commit is contained in:
Sam Rose 2024-07-31 12:00:50 +01:00
parent 8ee2e6d0de
commit 4b7042be9f
No known key found for this signature in database
1 changed files with 13 additions and 8 deletions

View File

@ -65,14 +65,16 @@ async function waitForEvent(
} }
describe.each([ describe.each([
["internal", undefined], // ["internal", undefined],
[DatabaseName.POSTGRES, getDatasource(DatabaseName.POSTGRES)], // [DatabaseName.POSTGRES, getDatasource(DatabaseName.POSTGRES)],
[DatabaseName.MYSQL, getDatasource(DatabaseName.MYSQL)], // [DatabaseName.MYSQL, getDatasource(DatabaseName.MYSQL)],
[DatabaseName.SQL_SERVER, getDatasource(DatabaseName.SQL_SERVER)], // [DatabaseName.SQL_SERVER, getDatasource(DatabaseName.SQL_SERVER)],
[DatabaseName.MARIADB, getDatasource(DatabaseName.MARIADB)], // [DatabaseName.MARIADB, getDatasource(DatabaseName.MARIADB)],
[DatabaseName.ORACLE, getDatasource(DatabaseName.ORACLE)],
])("/rows (%s)", (providerType, dsProvider) => { ])("/rows (%s)", (providerType, dsProvider) => {
const isInternal = dsProvider === undefined const isInternal = dsProvider === undefined
const isMSSQL = providerType === DatabaseName.SQL_SERVER const isMSSQL = providerType === DatabaseName.SQL_SERVER
const isOracle = providerType === DatabaseName.ORACLE
const config = setup.getConfig() const config = setup.getConfig()
let table: Table let table: Table
@ -127,7 +129,8 @@ describe.each([
primary: ["id"], primary: ["id"],
schema: defaultSchema, schema: defaultSchema,
} }
return merge(req, ...overrides) const merged = merge(req, ...overrides)
return merged
} }
function defaultTable( function defaultTable(
@ -1369,9 +1372,10 @@ describe.each([
expect(rows[2].description).toEqual("Row 3 description") expect(rows[2].description).toEqual("Row 3 description")
}) })
// Upserting isn't yet supported in MSSQL, see: // Upserting isn't yet supported in MSSQL or Oracle, see:
// https://github.com/knex/knex/pull/6050 // https://github.com/knex/knex/pull/6050
!isMSSQL && !isMSSQL &&
!isOracle &&
!isInternal && !isInternal &&
it("should be able to update existing rows with composite primary keys with bulkImport", async () => { it("should be able to update existing rows with composite primary keys with bulkImport", async () => {
const tableName = uuid.v4() const tableName = uuid.v4()
@ -1438,9 +1442,10 @@ describe.each([
expect(rows[2].description).toEqual("Row 3 description") expect(rows[2].description).toEqual("Row 3 description")
}) })
// Upserting isn't yet supported in MSSQL, see: // Upserting isn't yet supported in MSSQL/Oracle, see:
// https://github.com/knex/knex/pull/6050 // https://github.com/knex/knex/pull/6050
!isMSSQL && !isMSSQL &&
!isOracle &&
!isInternal && !isInternal &&
it("should be able to update existing rows an autoID primary key", async () => { it("should be able to update existing rows an autoID primary key", async () => {
const tableName = uuid.v4() const tableName = uuid.v4()