typeorm 0.3.12-dev.8668c29 → 0.3.12-dev.8731858

package/package.json

@@ -1 +1 @@
-{ "name": "typeorm", "private": false, "version": "0.3.12-dev.8668c29", "description": "Data-Mapper ORM for TypeScript, ES7, ES6, ES5. Supports MySQL, PostgreSQL, MariaDB, SQLite, MS SQL Server, Oracle, MongoDB databases.", "license": "MIT", "readmeFilename": "README.md", "author": { "name": "Umed Khudoiberdiev", "email": "pleerock.me@gmail.com" }, "engines": { "node": ">= 12.9.0" }, "exports": { ".": { "types": "./index.d.ts", "node": { "import": "./index.mjs", "require": "./index.js", "types": "./index.d.ts" }, "browser": { "require": "./index.js", "import": "./browser/index.js", "default": "./index.js" } }, "./browser": { "types": "./index.d.ts", "default": "./browser/index.js" }, "./*.js": "./*.js", "./*": { "require": "./*.js", "import": "./*" } }, "main": "./index.js", "module": "./index.mjs", "types": "./index.d.ts", "browser": { "./browser/connection/ConnectionOptionsReader.js": "./browser/platform/BrowserConnectionOptionsReaderDummy.js", "./browser/connection/options-reader/ConnectionOptionsXmlReader.js": "./browser/platform/BrowserConnectionOptionsReaderDummy.js", "./browser/connection/options-reader/ConnectionOptionsYmlReader.js": "./browser/platform/BrowserConnectionOptionsReaderDummy.js", "./browser/driver/aurora-data-api/AuroraDataApiDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/better-sqlite3/BetterSqlite3Driver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/cockroachdb/CockroachDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/mongodb/MongoDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/mongodb/MongoQueryRunner.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/mysql/MysqlDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/oracle/OracleDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/postgres/PostgresDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/sap/SapDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/sqlite/SqliteDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/sqlserver/SqlServerDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/entity-manager/MongoEntityManager.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/logger/FileLogger.js": "./browser/platform/BrowserFileLoggerDummy.js", "./browser/platform/PlatformTools.js": "./browser/platform/BrowserPlatformTools.js", "./browser/repository/MongoRepository.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/util/DirectoryExportedClassesLoader.js": "./browser/platform/BrowserDirectoryExportedClassesLoader.js", "./index.js": "./browser/index.js", "./index.mjs": "./browser/index.js" }, "repository": { "type": "git", "url": "https://github.com/typeorm/typeorm.git" }, "bugs": { "url": "https://github.com/typeorm/typeorm/issues" }, "homepage": "https://typeorm.io", "tags": [ "orm", "typescript", "typescript-orm", "mysql", "mysql-orm", "postgresql", "postgresql-orm", "mariadb", "mariadb-orm", "spanner", "sqlite", "sqlite-orm", "sql-server", "sql-server-orm", "oracle", "oracle-orm", "cloud-spanner", "cloud-spanner-orm" ], "devDependencies": { "@types/app-root-path": "^1.2.4", "@types/chai": "^4.2.15", "@types/chai-as-promised": "^7.1.3", "@types/debug": "^4.1.5", "@types/js-yaml": "^4.0.0", "@types/mkdirp": "^1.0.1", "@types/mocha": "^8.2.1", "@types/node": "^14.14.31", "@types/rimraf": "^3.0.0", "@types/sha.js": "^2.4.0", "@types/sinon": "^9.0.10", "@types/source-map-support": "^0.5.3", "@types/uuid": "^8.3.4", "@types/xml2js": "^0.4.8", "@types/yargs": "^17.0.2", "better-sqlite3": "^8.0.0", "chai": "^4.3.0", "chai-as-promised": "^7.1.1", "class-transformer": "^0.4.0", "conventional-changelog-angular": "^5.0.12", "conventional-changelog-cli": "^2.1.1", "del": "^6.0.0", "gulp": "^4.0.2", "gulp-istanbul": "^1.1.3", "gulp-mocha": "^8.0.0", "gulp-rename": "^2.0.0", "gulp-replace": "^1.0.0", "gulp-shell": "^0.8.0", "gulp-sourcemaps": "^3.0.0", "gulp-typescript": "^6.0.0-alpha.1", "gulpclass": "^0.2.0", "husky": "^5.1.1", "mocha": "^8.3.0", "mongodb": "^3.6.4", "mssql": "^7.3.0", "mysql": "^2.18.1", "mysql2": "^2.2.5", "pg": "^8.5.1", "pg-query-stream": "^4.0.0", "prettier": "^2.5.1", "redis": "^3.1.1", "remap-istanbul": "^0.13.0", "rimraf": "^3.0.2", "sinon": "^9.2.4", "sinon-chai": "^3.5.0", "source-map-support": "^0.5.19", "sql.js": "^1.4.0", "sqlite3": "^5.0.11", "ts-node": "^10.7.0", "typeorm-aurora-data-api-driver": "^2.0.0", "typescript": "^4.8.2" }, "peerDependencies": { "@google-cloud/spanner": "^5.18.0", "@sap/hana-client": "^2.12.25", "better-sqlite3": "^7.1.2 || ^8.0.0", "hdb-pool": "^0.1.6", "ioredis": "^5.0.4", "mongodb": "^3.6.0", "mssql": "^7.3.0", "mysql2": "^2.2.5", "oracledb": "^5.1.0", "pg": "^8.5.1", "pg-native": "^3.0.0", "pg-query-stream": "^4.0.0", "redis": "^3.1.1 || ^4.0.0", "sql.js": "^1.4.0", "sqlite3": "^5.0.3", "ts-node": "^10.7.0", "typeorm-aurora-data-api-driver": "^2.0.0" }, "peerDependenciesMeta": { "@google-cloud/spanner": { "optional": true }, "@sap/hana-client": { "optional": true }, "better-sqlite3": { "optional": true }, "hdb-pool": { "optional": true }, "ioredis": { "optional": true }, "mongodb": { "optional": true }, "mssql": { "optional": true }, "mysql2": { "optional": true }, "oracledb": { "optional": true }, "pg": { "optional": true }, "pg-native": { "optional": true }, "pg-query-stream": { "optional": true }, "redis": { "optional": true }, "sql.js": { "optional": true }, "sqlite3": { "optional": true }, "ts-node": { "optional": true }, "typeorm-aurora-data-api-driver": { "optional": true } }, "dependencies": { "@sqltools/formatter": "^1.2.2", "app-root-path": "^3.0.0", "buffer": "^6.0.3", "chalk": "^4.1.0", "cli-highlight": "^2.1.11", "date-fns": "^2.28.0", "debug": "^4.3.3", "dotenv": "^16.0.0", "glob": "^7.2.0", "js-yaml": "^4.1.0", "mkdirp": "^1.0.4", "reflect-metadata": "^0.1.13", "sha.js": "^2.4.11", "tslib": "^2.3.1", "uuid": "^8.3.2", "xml2js": "^0.4.23", "yargs": "^17.3.1" }, "scripts": { "test": "rimraf ./build && tsc && mocha --file ./build/compiled/test/utils/test-setup.js --bail --recursive --timeout 60000 ./build/compiled/test", "test-fast": "mocha --file ./build/compiled/test/utils/test-setup.js --bail --recursive --timeout 60000 ./build/compiled/test", "compile": "rimraf ./build && tsc", "watch": "./node_modules/.bin/tsc -w", "package": "gulp package", "pack": "gulp pack", "lint": "prettier --check \"./src/**/*.ts\" \"./test/**/*.ts\" \"./sample/**/*.ts\"", "format": "prettier --write \"./src/**/*.ts\" \"./test/**/*.ts\" \"./sample/**/*.ts\"", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 2" }, "bin": { "typeorm": "./cli.js", "typeorm-ts-node-commonjs": "./cli-ts-node-commonjs.js", "typeorm-ts-node-esm": "./cli-ts-node-esm.js" }, "funding": "https://opencollective.com/typeorm", "collective": { "type": "opencollective", "url": "https://opencollective.com/typeorm", "logo": "https://opencollective.com/opencollective/logo.txt" }, "nyc": { "all": true, "cache": false, "exclude": [ "**/*.d.ts" ], "extension": [ ".ts" ], "include": [ "build/compiled/src/**", "src/**" ], "reporter": "json" } }
+{ "name": "typeorm", "private": false, "version": "0.3.12-dev.8731858", "description": "Data-Mapper ORM for TypeScript, ES7, ES6, ES5. Supports MySQL, PostgreSQL, MariaDB, SQLite, MS SQL Server, Oracle, MongoDB databases.", "license": "MIT", "readmeFilename": "README.md", "author": { "name": "Umed Khudoiberdiev", "email": "pleerock.me@gmail.com" }, "engines": { "node": ">= 12.9.0" }, "exports": { ".": { "types": "./index.d.ts", "node": { "import": "./index.mjs", "require": "./index.js", "types": "./index.d.ts" }, "browser": { "require": "./index.js", "import": "./browser/index.js", "default": "./index.js" } }, "./browser": { "types": "./index.d.ts", "default": "./browser/index.js" }, "./*.js": "./*.js", "./*": { "require": "./*.js", "import": "./*" } }, "main": "./index.js", "module": "./index.mjs", "types": "./index.d.ts", "browser": { "./browser/connection/ConnectionOptionsReader.js": "./browser/platform/BrowserConnectionOptionsReaderDummy.js", "./browser/connection/options-reader/ConnectionOptionsXmlReader.js": "./browser/platform/BrowserConnectionOptionsReaderDummy.js", "./browser/connection/options-reader/ConnectionOptionsYmlReader.js": "./browser/platform/BrowserConnectionOptionsReaderDummy.js", "./browser/driver/aurora-data-api/AuroraDataApiDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/better-sqlite3/BetterSqlite3Driver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/cockroachdb/CockroachDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/mongodb/MongoDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/mongodb/MongoQueryRunner.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/mysql/MysqlDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/oracle/OracleDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/postgres/PostgresDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/sap/SapDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/sqlite/SqliteDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/driver/sqlserver/SqlServerDriver.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/entity-manager/MongoEntityManager.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/logger/FileLogger.js": "./browser/platform/BrowserFileLoggerDummy.js", "./browser/platform/PlatformTools.js": "./browser/platform/BrowserPlatformTools.js", "./browser/repository/MongoRepository.js": "./browser/platform/BrowserDisabledDriversDummy.js", "./browser/util/DirectoryExportedClassesLoader.js": "./browser/platform/BrowserDirectoryExportedClassesLoader.js", "./index.js": "./browser/index.js", "./index.mjs": "./browser/index.js" }, "repository": { "type": "git", "url": "https://github.com/typeorm/typeorm.git" }, "bugs": { "url": "https://github.com/typeorm/typeorm/issues" }, "homepage": "https://typeorm.io", "tags": [ "orm", "typescript", "typescript-orm", "mysql", "mysql-orm", "postgresql", "postgresql-orm", "mariadb", "mariadb-orm", "spanner", "sqlite", "sqlite-orm", "sql-server", "sql-server-orm", "oracle", "oracle-orm", "cloud-spanner", "cloud-spanner-orm" ], "devDependencies": { "@types/app-root-path": "^1.2.4", "@types/chai": "^4.2.15", "@types/chai-as-promised": "^7.1.3", "@types/debug": "^4.1.5", "@types/js-yaml": "^4.0.0", "@types/mkdirp": "^1.0.1", "@types/mocha": "^8.2.1", "@types/node": "^14.14.31", "@types/rimraf": "^3.0.0", "@types/sha.js": "^2.4.0", "@types/sinon": "^9.0.10", "@types/source-map-support": "^0.5.3", "@types/uuid": "^8.3.4", "@types/xml2js": "^0.4.8", "@types/yargs": "^17.0.2", "better-sqlite3": "^8.0.0", "chai": "^4.3.0", "chai-as-promised": "^7.1.1", "class-transformer": "^0.4.0", "conventional-changelog-angular": "^5.0.12", "conventional-changelog-cli": "^2.1.1", "del": "^6.0.0", "gulp": "^4.0.2", "gulp-istanbul": "^1.1.3", "gulp-mocha": "^8.0.0", "gulp-rename": "^2.0.0", "gulp-replace": "^1.0.0", "gulp-shell": "^0.8.0", "gulp-sourcemaps": "^3.0.0", "gulp-typescript": "^6.0.0-alpha.1", "gulpclass": "^0.2.0", "husky": "^5.1.1", "mocha": "^8.3.0", "mongodb": "^3.6.4", "mssql": "^7.3.0", "mysql": "^2.18.1", "mysql2": "^2.2.5", "pg": "^8.5.1", "pg-query-stream": "^4.0.0", "prettier": "^2.5.1", "redis": "^3.1.1", "remap-istanbul": "^0.13.0", "rimraf": "^3.0.2", "sinon": "^9.2.4", "sinon-chai": "^3.5.0", "source-map-support": "^0.5.19", "sql.js": "^1.4.0", "sqlite3": "^5.0.11", "ts-node": "^10.7.0", "typeorm-aurora-data-api-driver": "^2.0.0", "typescript": "^4.8.2" }, "peerDependencies": { "@google-cloud/spanner": "^5.18.0", "@sap/hana-client": "^2.12.25", "better-sqlite3": "^7.1.2 || ^8.0.0", "hdb-pool": "^0.1.6", "ioredis": "^5.0.4", "mongodb": "^3.6.0", "mssql": "^7.3.0", "mysql2": "^2.2.5 || ^3.0.1", "oracledb": "^5.1.0", "pg": "^8.5.1", "pg-native": "^3.0.0", "pg-query-stream": "^4.0.0", "redis": "^3.1.1 || ^4.0.0", "sql.js": "^1.4.0", "sqlite3": "^5.0.3", "ts-node": "^10.7.0", "typeorm-aurora-data-api-driver": "^2.0.0" }, "peerDependenciesMeta": { "@google-cloud/spanner": { "optional": true }, "@sap/hana-client": { "optional": true }, "better-sqlite3": { "optional": true }, "hdb-pool": { "optional": true }, "ioredis": { "optional": true }, "mongodb": { "optional": true }, "mssql": { "optional": true }, "mysql2": { "optional": true }, "oracledb": { "optional": true }, "pg": { "optional": true }, "pg-native": { "optional": true }, "pg-query-stream": { "optional": true }, "redis": { "optional": true }, "sql.js": { "optional": true }, "sqlite3": { "optional": true }, "ts-node": { "optional": true }, "typeorm-aurora-data-api-driver": { "optional": true } }, "dependencies": { "@sqltools/formatter": "^1.2.2", "app-root-path": "^3.0.0", "buffer": "^6.0.3", "chalk": "^4.1.0", "cli-highlight": "^2.1.11", "date-fns": "^2.28.0", "debug": "^4.3.3", "dotenv": "^16.0.0", "glob": "^7.2.0", "js-yaml": "^4.1.0", "mkdirp": "^1.0.4", "reflect-metadata": "^0.1.13", "sha.js": "^2.4.11", "tslib": "^2.3.1", "uuid": "^8.3.2", "xml2js": "^0.4.23", "yargs": "^17.3.1" }, "scripts": { "test": "rimraf ./build && tsc && mocha --file ./build/compiled/test/utils/test-setup.js --bail --recursive --timeout 60000 ./build/compiled/test", "test-fast": "mocha --file ./build/compiled/test/utils/test-setup.js --bail --recursive --timeout 60000 ./build/compiled/test", "compile": "rimraf ./build && tsc", "watch": "./node_modules/.bin/tsc -w", "package": "gulp package", "pack": "gulp pack", "lint": "prettier --check \"./src/**/*.ts\" \"./test/**/*.ts\" \"./sample/**/*.ts\"", "format": "prettier --write \"./src/**/*.ts\" \"./test/**/*.ts\" \"./sample/**/*.ts\"", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 2" }, "bin": { "typeorm": "./cli.js", "typeorm-ts-node-commonjs": "./cli-ts-node-commonjs.js", "typeorm-ts-node-esm": "./cli-ts-node-esm.js" }, "funding": "https://opencollective.com/typeorm", "collective": { "type": "opencollective", "url": "https://opencollective.com/typeorm", "logo": "https://opencollective.com/opencollective/logo.txt" }, "nyc": { "all": true, "cache": false, "exclude": [ "**/*.d.ts" ], "extension": [ ".ts" ], "include": [ "build/compiled/src/**", "src/**" ], "reporter": "json" } }

package/query-builder/InsertOrUpdateOptions.d.ts

@@ -1,3 +1,4 @@
+import { UpsertType } from "../driver/types/UpsertType";
 export declare type InsertOrUpdateOptions = {
     /**
      * If true, postgres will skip the update if no values would be changed (reduces writes)
@@ -7,4 +8,5 @@ export declare type InsertOrUpdateOptions = {
      * If included, postgres will apply the index predicate to a conflict target (partial index)
      */
     indexPredicate?: string;
+    upsertType?: UpsertType;
 };

package/query-builder/InsertOrUpdateOptions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/query-builder/InsertOrUpdateOptions.ts"],"names":[],"mappings":"","file":"InsertOrUpdateOptions.js","sourcesContent":["export type InsertOrUpdateOptions = {\n    /**\n     * If true, postgres will skip the update if no values would be changed (reduces writes)\n     */\n    skipUpdateIfNoValuesChanged?: boolean\n    /**\n     * If included, postgres will apply the index predicate to a conflict target (partial index)\n     */\n    indexPredicate?: string\n}\n"],"sourceRoot":".."}
+{"version":3,"sources":["../../src/query-builder/InsertOrUpdateOptions.ts"],"names":[],"mappings":"","file":"InsertOrUpdateOptions.js","sourcesContent":["import { UpsertType } from \"../driver/types/UpsertType\"\n\nexport type InsertOrUpdateOptions = {\n    /**\n     * If true, postgres will skip the update if no values would be changed (reduces writes)\n     */\n    skipUpdateIfNoValuesChanged?: boolean\n    /**\n     * If included, postgres will apply the index predicate to a conflict target (partial index)\n     */\n    indexPredicate?: string\n    upsertType?: UpsertType\n}\n"],"sourceRoot":".."}

package/query-builder/InsertQueryBuilder.d.ts

@@ -1,10 +1,10 @@
-import { QueryBuilder } from "./QueryBuilder";
-import { ObjectLiteral } from "../common/ObjectLiteral";
 import { EntityTarget } from "../common/EntityTarget";
-import { QueryDeepPartialEntity } from "./QueryPartialEntity";
-import { InsertResult } from "./result/InsertResult";
+import { ObjectLiteral } from "../common/ObjectLiteral";
 import { ColumnMetadata } from "../metadata/ColumnMetadata";
 import { InsertOrUpdateOptions } from "./InsertOrUpdateOptions";
+import { QueryBuilder } from "./QueryBuilder";
+import { QueryDeepPartialEntity } from "./QueryPartialEntity";
+import { InsertResult } from "./result/InsertResult";
 /**
  * Allows to build complex sql queries in a fashion way and execute those queries.
  */

package/query-builder/InsertQueryBuilder.js

@@ -1,17 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InsertQueryBuilder = void 0;
-const QueryBuilder_1 = require("./QueryBuilder");
-const InsertResult_1 = require("./result/InsertResult");
-const ReturningStatementNotSupportedError_1 = require("../error/ReturningStatementNotSupportedError");
-const InsertValuesMissingError_1 = require("../error/InsertValuesMissingError");
-const ReturningResultsEntityUpdator_1 = require("./ReturningResultsEntityUpdator");
-const BroadcasterResult_1 = require("../subscriber/BroadcasterResult");
-const error_1 = require("../error");
 const uuid_1 = require("uuid");
 const DriverUtils_1 = require("../driver/DriverUtils");
-const ObjectUtils_1 = require("../util/ObjectUtils");
+const error_1 = require("../error");
+const InsertValuesMissingError_1 = require("../error/InsertValuesMissingError");
+const ReturningStatementNotSupportedError_1 = require("../error/ReturningStatementNotSupportedError");
+const BroadcasterResult_1 = require("../subscriber/BroadcasterResult");
 const InstanceChecker_1 = require("../util/InstanceChecker");
+const ObjectUtils_1 = require("../util/ObjectUtils");
+const QueryBuilder_1 = require("./QueryBuilder");
+const InsertResult_1 = require("./result/InsertResult");
+const ReturningResultsEntityUpdator_1 = require("./ReturningResultsEntityUpdator");
 /**
  * Allows to build complex sql queries in a fashion way and execute those queries.
  */
@@ -224,6 +224,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
                 columns: statementOrOverwrite === null || statementOrOverwrite === void 0 ? void 0 : statementOrOverwrite.columns,
                 overwrite: statementOrOverwrite === null || statementOrOverwrite === void 0 ? void 0 : statementOrOverwrite.overwrite,
                 skipUpdateIfNoValuesChanged: orUpdateOptions === null || orUpdateOptions === void 0 ? void 0 : orUpdateOptions.skipUpdateIfNoValuesChanged,
+                upsertType: orUpdateOptions === null || orUpdateOptions === void 0 ? void 0 : orUpdateOptions.upsertType,
             };
             return this;
         }
@@ -232,6 +233,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
             conflict: conflictTarget,
             skipUpdateIfNoValuesChanged: orUpdateOptions === null || orUpdateOptions === void 0 ? void 0 : orUpdateOptions.skipUpdateIfNoValuesChanged,
             indexPredicate: orUpdateOptions === null || orUpdateOptions === void 0 ? void 0 : orUpdateOptions.indexPredicate,
+            upsertType: orUpdateOptions === null || orUpdateOptions === void 0 ? void 0 : orUpdateOptions.upsertType,
         };
         return this;
     }
@@ -242,6 +244,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * Creates INSERT express used to perform insert query.
      */
     createInsertExpression() {
+        var _a, _b;
         const tableName = this.getTableName(this.getMainTableName());
         const valuesExpression = this.createValuesExpression(); // its important to get values before returning expression because oracle rely on native parameters and ordering of them is important
         const returningExpression = this.connection.driver.options.type === "oracle" &&
@@ -250,6 +253,9 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
             : this.createReturningExpression("insert"); // oracle doesnt support returning with multi-row insert
         const columnsExpression = this.createColumnNamesExpression();
         let query = "INSERT ";
+        if (((_a = this.expressionMap.onUpdate) === null || _a === void 0 ? void 0 : _a.upsertType) === "primary-key") {
+            query = "UPSERT ";
+        }
         if (DriverUtils_1.DriverUtils.isMySQLFamily(this.connection.driver) ||
             this.connection.driver.options.type === "aurora-mysql") {
             query += `${this.expressionMap.onIgnore ? " IGNORE " : ""}`;
@@ -295,79 +301,79 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
                 query += ` DEFAULT VALUES`;
             }
         }
-        if (this.connection.driver.supportedUpsertType ===
-            "on-conflict-do-update") {
-            if (this.expressionMap.onIgnore) {
-                query += " ON CONFLICT DO NOTHING ";
-            }
-            else if (this.expressionMap.onConflict) {
-                query += ` ON CONFLICT ${this.expressionMap.onConflict} `;
-            }
-            else if (this.expressionMap.onUpdate) {
-                const { overwrite, columns, conflict, skipUpdateIfNoValuesChanged, indexPredicate, } = this.expressionMap.onUpdate;
-                let conflictTarget = "ON CONFLICT";
-                if (Array.isArray(conflict)) {
-                    conflictTarget += ` ( ${conflict
-                        .map((column) => this.escape(column))
-                        .join(", ")} )`;
-                    if (indexPredicate &&
-                        !DriverUtils_1.DriverUtils.isPostgresFamily(this.connection.driver)) {
-                        throw new error_1.TypeORMError(`indexPredicate option is not supported by the current database driver`);
+        if (((_b = this.expressionMap.onUpdate) === null || _b === void 0 ? void 0 : _b.upsertType) !== "primary-key") {
+            if (this.connection.driver.supportedUpsertTypes.includes("on-conflict-do-update")) {
+                if (this.expressionMap.onIgnore) {
+                    query += " ON CONFLICT DO NOTHING ";
+                }
+                else if (this.expressionMap.onConflict) {
+                    query += ` ON CONFLICT ${this.expressionMap.onConflict} `;
+                }
+                else if (this.expressionMap.onUpdate) {
+                    const { overwrite, columns, conflict, skipUpdateIfNoValuesChanged, indexPredicate, } = this.expressionMap.onUpdate;
+                    let conflictTarget = "ON CONFLICT";
+                    if (Array.isArray(conflict)) {
+                        conflictTarget += ` ( ${conflict
+                            .map((column) => this.escape(column))
+                            .join(", ")} )`;
+                        if (indexPredicate &&
+                            !DriverUtils_1.DriverUtils.isPostgresFamily(this.connection.driver)) {
+                            throw new error_1.TypeORMError(`indexPredicate option is not supported by the current database driver`);
+                        }
+                        if (indexPredicate &&
+                            DriverUtils_1.DriverUtils.isPostgresFamily(this.connection.driver)) {
+                            conflictTarget += ` WHERE ( ${this.escape(indexPredicate)} )`;
+                        }
+                    }
+                    else if (conflict) {
+                        conflictTarget += ` ON CONSTRAINT ${this.escape(conflict)}`;
                     }
-                    if (indexPredicate &&
+                    if (Array.isArray(overwrite)) {
+                        query += ` ${conflictTarget} DO UPDATE SET `;
+                        query += overwrite === null || overwrite === void 0 ? void 0 : overwrite.map((column) => `${this.escape(column)} = EXCLUDED.${this.escape(column)}`).join(", ");
+                        query += " ";
+                    }
+                    else if (columns) {
+                        query += ` ${conflictTarget} DO UPDATE SET `;
+                        query += columns
+                            .map((column) => `${this.escape(column)} = :${column}`)
+                            .join(", ");
+                        query += " ";
+                    }
+                    if (Array.isArray(overwrite) &&
+                        skipUpdateIfNoValuesChanged &&
                         DriverUtils_1.DriverUtils.isPostgresFamily(this.connection.driver)) {
-                        conflictTarget += ` WHERE ( ${this.escape(indexPredicate)} )`;
+                        query += ` WHERE (`;
+                        query += overwrite
+                            .map((column) => `${tableName}.${this.escape(column)} IS DISTINCT FROM EXCLUDED.${this.escape(column)}`)
+                            .join(" OR ");
+                        query += ") ";
                     }
                 }
-                else if (conflict) {
-                    conflictTarget += ` ON CONSTRAINT ${this.escape(conflict)}`;
-                }
-                if (Array.isArray(overwrite)) {
-                    query += ` ${conflictTarget} DO UPDATE SET `;
-                    query += overwrite === null || overwrite === void 0 ? void 0 : overwrite.map((column) => `${this.escape(column)} = EXCLUDED.${this.escape(column)}`).join(", ");
-                    query += " ";
-                }
-                else if (columns) {
-                    query += ` ${conflictTarget} DO UPDATE SET `;
-                    query += columns
-                        .map((column) => `${this.escape(column)} = :${column}`)
-                        .join(", ");
-                    query += " ";
-                }
-                if (Array.isArray(overwrite) &&
-                    skipUpdateIfNoValuesChanged &&
-                    DriverUtils_1.DriverUtils.isPostgresFamily(this.connection.driver)) {
-                    query += ` WHERE (`;
-                    query += overwrite
-                        .map((column) => `${tableName}.${this.escape(column)} IS DISTINCT FROM EXCLUDED.${this.escape(column)}`)
-                        .join(" OR ");
-                    query += ") ";
-                }
             }
-        }
-        else if (this.connection.driver.supportedUpsertType ===
-            "on-duplicate-key-update") {
-            if (this.expressionMap.onUpdate) {
-                const { overwrite, columns } = this.expressionMap.onUpdate;
-                if (Array.isArray(overwrite)) {
-                    query += " ON DUPLICATE KEY UPDATE ";
-                    query += overwrite
-                        .map((column) => `${this.escape(column)} = VALUES(${this.escape(column)})`)
-                        .join(", ");
-                    query += " ";
-                }
-                else if (Array.isArray(columns)) {
-                    query += " ON DUPLICATE KEY UPDATE ";
-                    query += columns
-                        .map((column) => `${this.escape(column)} = :${column}`)
-                        .join(", ");
-                    query += " ";
+            else if (this.connection.driver.supportedUpsertTypes.includes("on-duplicate-key-update")) {
+                if (this.expressionMap.onUpdate) {
+                    const { overwrite, columns } = this.expressionMap.onUpdate;
+                    if (Array.isArray(overwrite)) {
+                        query += " ON DUPLICATE KEY UPDATE ";
+                        query += overwrite
+                            .map((column) => `${this.escape(column)} = VALUES(${this.escape(column)})`)
+                            .join(", ");
+                        query += " ";
+                    }
+                    else if (Array.isArray(columns)) {
+                        query += " ON DUPLICATE KEY UPDATE ";
+                        query += columns
+                            .map((column) => `${this.escape(column)} = :${column}`)
+                            .join(", ");
+                        query += " ";
+                    }
                 }
             }
-        }
-        else {
-            if (this.expressionMap.onUpdate) {
-                throw new error_1.TypeORMError(`onUpdate is not supported by the current database driver`);
+            else {
+                if (this.expressionMap.onUpdate) {
+                    throw new error_1.TypeORMError(`onUpdate is not supported by the current database driver`);
+                }
             }
         }
         // add RETURNING expression