diff --git a/package-lock.json b/package-lock.json index a9f7b324f..1e2334020 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,7 +33,7 @@ "sinon": "^15.1.0", "tsd": "^0.28.1", "typedoc": "^0.24.8", - "typescript": "5.1.3" + "typescript": "^5.1.6" }, "engines": { "node": ">=14.0.0" @@ -3653,9 +3653,9 @@ } }, "node_modules/typescript": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.3.tgz", - "integrity": "sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz", + "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==", "dev": true, "bin": { "tsc": "bin/tsc", diff --git a/package.json b/package.json index 031fd99c7..115cd3514 100644 --- a/package.json +++ b/package.json @@ -86,6 +86,6 @@ "sinon": "^15.1.0", "tsd": "^0.28.1", "typedoc": "^0.24.8", - "typescript": "5.1.3" + "typescript": "^5.1.6" } } diff --git a/src/query-builder/insert-query-builder.ts b/src/query-builder/insert-query-builder.ts index 6adbd090e..fb0fe81f3 100644 --- a/src/query-builder/insert-query-builder.ts +++ b/src/query-builder/insert-query-builder.ts @@ -45,7 +45,9 @@ import { ColumnNode } from '../operation-node/column-node.js' import { ReturningInterface } from './returning-interface.js' import { OnConflictBuilder, + OnConflictDatabase, OnConflictDoNothingBuilder, + OnConflictTables, OnConflictUpdateBuilder, } from './on-conflict-builder.js' import { OnConflictNode } from '../operation-node/on-conflict-node.js' @@ -487,7 +489,12 @@ export class InsertQueryBuilder onConflict( callback: ( builder: OnConflictBuilder - ) => OnConflictDoNothingBuilder | OnConflictUpdateBuilder + ) => + | OnConflictUpdateBuilder< + OnConflictDatabase, + OnConflictTables + > + | OnConflictDoNothingBuilder ): InsertQueryBuilder { return new InsertQueryBuilder({ ...this.#props,