taon-typeorm 18.0.19 → 18.0.20

package/lib/typeorm/query-builder/InsertQueryBuilder.js

@@ -1,313 +1,281 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InsertQueryBuilder = void 0;
-var tslib_1 = require("tslib");
-var QueryBuilder_1 = require("./QueryBuilder");
+const QueryBuilder_1 = require("./QueryBuilder");
 //#endregion
-var InsertResult_1 = require("./result/InsertResult");
-var ReturningStatementNotSupportedError_1 = require("../error/ReturningStatementNotSupportedError");
-var InsertValuesMissingError_1 = require("../error/InsertValuesMissingError");
-var ReturningResultsEntityUpdator_1 = require("./ReturningResultsEntityUpdator");
-var BroadcasterResult_1 = require("../subscriber/BroadcasterResult");
-var error_1 = require("../error");
-var uuid_1 = require("uuid");
+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");
 //#endregion
-var DriverUtils_1 = require("../driver/DriverUtils");
-var ObjectUtils_1 = require("../util/ObjectUtils");
-var InstanceChecker_1 = require("../util/InstanceChecker");
-var typescript_class_helpers_1 = require("typescript-class-helpers");
+const DriverUtils_1 = require("../driver/DriverUtils");
+const ObjectUtils_1 = require("../util/ObjectUtils");
+const InstanceChecker_1 = require("../util/InstanceChecker");
+const typescript_class_helpers_1 = require("typescript-class-helpers");
 /**
  * Allows to build complex sql queries in a fashion way and execute those queries.
  */
-var InsertQueryBuilder = /** @class */ (function (_super) {
-    tslib_1.__extends(InsertQueryBuilder, _super);
-    function InsertQueryBuilder() {
-        var _this = _super.apply(this, tslib_1.__spreadArray([], tslib_1.__read(arguments), false)) || this;
-        _this["@instanceof"] = Symbol.for("InsertQueryBuilder");
-        return _this;
-    }
+let InsertQueryBuilder = class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
+    "@instanceof" = Symbol.for("InsertQueryBuilder");
     // -------------------------------------------------------------------------
     // Public Implemented Methods
     // -------------------------------------------------------------------------
     /**
      * Gets generated SQL query without parameters being replaced.
      */
-    InsertQueryBuilder.prototype.getQuery = function () {
-        var sql = this.createComment();
+    getQuery() {
+        let sql = this.createComment();
         sql += this.createCteExpression();
         sql += this.createInsertExpression();
         return sql.trim();
-    };
+    }
     /**
      * Executes sql generated by query builder and returns raw database results.
      */
-    InsertQueryBuilder.prototype.execute = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var valueSets, queryRunner, transactionStartedByUs, broadcastResult_1, declareSql, selectOutputSql, returningResultsEntityUpdator, returningColumns_1, _a, _b, columnPath, _c, insertSql, parameters, statements, sql, queryResult, insertResult, broadcastResult_2, error_2, rollbackError_1;
-            var e_1, _d;
-            var _this = this;
-            return tslib_1.__generator(this, function (_e) {
-                switch (_e.label) {
-                    case 0:
-                        valueSets = this.getValueSets();
-                        // console.timeEnd(".value sets");
-                        // If user passed empty array of entities then we don't need to do
-                        // anything.
-                        //
-                        // Fixes GitHub issues #3111 and #5734. If we were to let this through
-                        // we would run into problems downstream, like subscribers getting
-                        // invoked with the empty array where they expect an entity, and SQL
-                        // queries with an empty VALUES clause.
-                        if (valueSets.length === 0)
-                            return [2 /*return*/, new InsertResult_1.InsertResult()
-                                // console.time("QueryBuilder.execute");
-                                // console.time(".database stuff");
-                            ];
-                        queryRunner = this.obtainQueryRunner();
-                        transactionStartedByUs = false;
-                        _e.label = 1;
-                    case 1:
-                        _e.trys.push([1, 13, 18, 21]);
-                        if (!(this.expressionMap.useTransaction === true &&
-                            queryRunner.isTransactionActive === false)) return [3 /*break*/, 3];
-                        return [4 /*yield*/, queryRunner.startTransaction()];
-                    case 2:
-                        _e.sent();
-                        transactionStartedByUs = true;
-                        _e.label = 3;
-                    case 3:
-                        if (!(this.expressionMap.callListeners === true &&
-                            this.expressionMap.mainAlias.hasMetadata)) return [3 /*break*/, 5];
-                        broadcastResult_1 = new BroadcasterResult_1.BroadcasterResult();
-                        valueSets.forEach(function (valueSet) {
-                            queryRunner.broadcaster.broadcastBeforeInsertEvent(broadcastResult_1, _this.expressionMap.mainAlias.metadata, valueSet);
-                        });
-                        return [4 /*yield*/, broadcastResult_1.wait()];
-                    case 4:
-                        _e.sent();
-                        _e.label = 5;
-                    case 5:
-                        declareSql = null;
-                        selectOutputSql = null;
-                        returningResultsEntityUpdator = new ReturningResultsEntityUpdator_1.ReturningResultsEntityUpdator(queryRunner, this.expressionMap);
-                        returningColumns_1 = [];
-                        if (Array.isArray(this.expressionMap.returning) &&
-                            this.expressionMap.mainAlias.hasMetadata) {
-                            try {
-                                for (_a = tslib_1.__values(this.expressionMap.returning), _b = _a.next(); !_b.done; _b = _a.next()) {
-                                    columnPath = _b.value;
-                                    returningColumns_1.push.apply(returningColumns_1, tslib_1.__spreadArray([], tslib_1.__read(this.expressionMap.mainAlias.metadata.findColumnsWithPropertyPath(columnPath)), false));
-                                }
-                            }
-                            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                            finally {
-                                try {
-                                    if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
-                                }
-                                finally { if (e_1) throw e_1.error; }
-                            }
-                        }
-                        if (this.expressionMap.updateEntity === true &&
-                            this.expressionMap.mainAlias.hasMetadata) {
-                            if (!(valueSets.length > 1 &&
-                                this.connection.driver.options.type === "oracle")) {
-                                this.expressionMap.extraReturningColumns =
-                                    this.expressionMap.mainAlias.metadata.getInsertionReturningColumns();
-                            }
-                            returningColumns_1.push.apply(returningColumns_1, tslib_1.__spreadArray([], tslib_1.__read(this.expressionMap.extraReturningColumns.filter(function (c) { return !returningColumns_1.includes(c); })), false));
-                        }
-                        if (returningColumns_1.length > 0 &&
-                            this.connection.driver.options.type === "mssql") {
-                            declareSql = 
-                            //#region @backend
-                            this.connection.driver
-                            //#endregion
-                            /* */
-                            /* */
-                            /* */
-                            /* */
-                            /* */
-                            .buildTableVariableDeclaration("@OutputTable", returningColumns_1);
-                            selectOutputSql = "SELECT * FROM @OutputTable";
-                        }
-                        _c = tslib_1.__read(this.getQueryAndParameters(), 2), insertSql = _c[0], parameters = _c[1];
-                        statements = [declareSql, insertSql, selectOutputSql];
-                        sql = statements.filter(function (s) { return s != null; }).join(";\n\n");
-                        return [4 /*yield*/, queryRunner.query(sql, parameters, true)];
-                    case 6:
-                        queryResult = _e.sent();
-                        insertResult = InsertResult_1.InsertResult.from(queryResult);
-                        if (!(this.expressionMap.updateEntity === true &&
-                            this.expressionMap.mainAlias.hasMetadata)) return [3 /*break*/, 8];
-                        // console.time(".updating entity");
-                        return [4 /*yield*/, returningResultsEntityUpdator.insert(insertResult, valueSets)
-                            // console.timeEnd(".updating entity");
-                        ];
-                    case 7:
-                        // console.time(".updating entity");
-                        _e.sent();
-                        _e.label = 8;
-                    case 8:
-                        if (!(this.expressionMap.callListeners === true &&
-                            this.expressionMap.mainAlias.hasMetadata)) return [3 /*break*/, 10];
-                        broadcastResult_2 = new BroadcasterResult_1.BroadcasterResult();
-                        valueSets.forEach(function (valueSet) {
-                            queryRunner.broadcaster.broadcastAfterInsertEvent(broadcastResult_2, _this.expressionMap.mainAlias.metadata, valueSet);
-                        });
-                        return [4 /*yield*/, broadcastResult_2.wait()];
-                    case 9:
-                        _e.sent();
-                        _e.label = 10;
-                    case 10:
-                        if (!transactionStartedByUs) return [3 /*break*/, 12];
-                        return [4 /*yield*/, queryRunner.commitTransaction()];
-                    case 11:
-                        _e.sent();
-                        _e.label = 12;
-                    case 12: 
-                    // console.timeEnd(".commit");
-                    return [2 /*return*/, insertResult];
-                    case 13:
-                        error_2 = _e.sent();
-                        if (!transactionStartedByUs) return [3 /*break*/, 17];
-                        _e.label = 14;
-                    case 14:
-                        _e.trys.push([14, 16, , 17]);
-                        return [4 /*yield*/, queryRunner.rollbackTransaction()];
-                    case 15:
-                        _e.sent();
-                        return [3 /*break*/, 17];
-                    case 16:
-                        rollbackError_1 = _e.sent();
-                        return [3 /*break*/, 17];
-                    case 17: throw error_2;
-                    case 18:
-                        if (!(queryRunner !== this.queryRunner)) return [3 /*break*/, 20];
-                        // means we created our own query runner
-                        return [4 /*yield*/, queryRunner.release()];
-                    case 19:
-                        // means we created our own query runner
-                        _e.sent();
-                        _e.label = 20;
-                    case 20: return [7 /*endfinally*/];
-                    case 21: return [2 /*return*/];
+    async execute() {
+        // console.time(".value sets");
+        const valueSets = this.getValueSets();
+        // console.timeEnd(".value sets");
+        // If user passed empty array of entities then we don't need to do
+        // anything.
+        //
+        // Fixes GitHub issues #3111 and #5734. If we were to let this through
+        // we would run into problems downstream, like subscribers getting
+        // invoked with the empty array where they expect an entity, and SQL
+        // queries with an empty VALUES clause.
+        if (valueSets.length === 0)
+            return new InsertResult_1.InsertResult();
+        // console.time("QueryBuilder.execute");
+        // console.time(".database stuff");
+        const queryRunner = this.obtainQueryRunner();
+        let transactionStartedByUs = false;
+        try {
+            // start transaction if it was enabled
+            if (this.expressionMap.useTransaction === true &&
+                queryRunner.isTransactionActive === false) {
+                await queryRunner.startTransaction();
+                transactionStartedByUs = true;
+            }
+            // console.timeEnd(".database stuff");
+            // call before insertion methods in listeners and subscribers
+            if (this.expressionMap.callListeners === true &&
+                this.expressionMap.mainAlias.hasMetadata) {
+                const broadcastResult = new BroadcasterResult_1.BroadcasterResult();
+                valueSets.forEach((valueSet) => {
+                    queryRunner.broadcaster.broadcastBeforeInsertEvent(broadcastResult, this.expressionMap.mainAlias.metadata, valueSet);
+                });
+                await broadcastResult.wait();
+            }
+            let declareSql = null;
+            let selectOutputSql = null;
+            // if update entity mode is enabled we may need extra columns for the returning statement
+            // console.time(".prepare returning statement");
+            const returningResultsEntityUpdator = new ReturningResultsEntityUpdator_1.ReturningResultsEntityUpdator(queryRunner, this.expressionMap);
+            const returningColumns = [];
+            if (Array.isArray(this.expressionMap.returning) &&
+                this.expressionMap.mainAlias.hasMetadata) {
+                for (const columnPath of this.expressionMap.returning) {
+                    returningColumns.push(...this.expressionMap.mainAlias.metadata.findColumnsWithPropertyPath(columnPath));
                 }
-            });
-        });
-    };
+            }
+            if (this.expressionMap.updateEntity === true &&
+                this.expressionMap.mainAlias.hasMetadata) {
+                if (!(valueSets.length > 1 &&
+                    this.connection.driver.options.type === "oracle")) {
+                    this.expressionMap.extraReturningColumns =
+                        this.expressionMap.mainAlias.metadata.getInsertionReturningColumns();
+                }
+                returningColumns.push(...this.expressionMap.extraReturningColumns.filter((c) => !returningColumns.includes(c)));
+            }
+            if (returningColumns.length > 0 &&
+                this.connection.driver.options.type === "mssql") {
+                declareSql = 
+                //#region @backend
+                this.connection.driver
+                //#endregion
+                /* */
+                /* */
+                /* */
+                /* */
+                /* */
+                .buildTableVariableDeclaration("@OutputTable", returningColumns);
+                selectOutputSql = `SELECT * FROM @OutputTable`;
+            }
+            // console.timeEnd(".prepare returning statement");
+            // execute query
+            // console.time(".getting query and parameters");
+            const [insertSql, parameters] = this.getQueryAndParameters();
+            // console.timeEnd(".getting query and parameters");
+            // console.time(".query execution by database");
+            const statements = [declareSql, insertSql, selectOutputSql];
+            const sql = statements.filter((s) => s != null).join(";\n\n");
+            const queryResult = await queryRunner.query(sql, parameters, true);
+            const insertResult = InsertResult_1.InsertResult.from(queryResult);
+            // console.timeEnd(".query execution by database");
+            // load returning results and set them to the entity if entity updation is enabled
+            if (this.expressionMap.updateEntity === true &&
+                this.expressionMap.mainAlias.hasMetadata) {
+                // console.time(".updating entity");
+                await returningResultsEntityUpdator.insert(insertResult, valueSets);
+                // console.timeEnd(".updating entity");
+            }
+            // call after insertion methods in listeners and subscribers
+            if (this.expressionMap.callListeners === true &&
+                this.expressionMap.mainAlias.hasMetadata) {
+                const broadcastResult = new BroadcasterResult_1.BroadcasterResult();
+                valueSets.forEach((valueSet) => {
+                    queryRunner.broadcaster.broadcastAfterInsertEvent(broadcastResult, this.expressionMap.mainAlias.metadata, valueSet);
+                });
+                await broadcastResult.wait();
+            }
+            // close transaction if we started it
+            // console.time(".commit");
+            if (transactionStartedByUs) {
+                await queryRunner.commitTransaction();
+            }
+            // console.timeEnd(".commit");
+            return insertResult;
+        }
+        catch (error) {
+            // rollback transaction if we started it
+            if (transactionStartedByUs) {
+                try {
+                    await queryRunner.rollbackTransaction();
+                }
+                catch (rollbackError) { }
+            }
+            throw error;
+        }
+        finally {
+            // console.time(".releasing connection");
+            if (queryRunner !== this.queryRunner) {
+                // means we created our own query runner
+                await queryRunner.release();
+            }
+            // console.timeEnd(".releasing connection");
+            // console.timeEnd("QueryBuilder.execute");
+        }
+    }
     // -------------------------------------------------------------------------
     // Public Methods
     // -------------------------------------------------------------------------
     /**
      * Specifies INTO which entity's table insertion will be executed.
      */
-    InsertQueryBuilder.prototype.into = function (entityTarget, columns) {
+    into(entityTarget, columns) {
         entityTarget = InstanceChecker_1.InstanceChecker.isEntitySchema(entityTarget)
             ? entityTarget.options.name
             : entityTarget;
-        var mainAlias = this.createFromAlias(entityTarget);
+        const mainAlias = this.createFromAlias(entityTarget);
         this.expressionMap.setMainAlias(mainAlias);
         this.expressionMap.insertColumns = columns || [];
         return this;
-    };
+    }
     /**
      * Values needs to be inserted into table.
      */
-    InsertQueryBuilder.prototype.values = function (values) {
+    values(values) {
         this.expressionMap.valuesSet = values;
         return this;
-    };
+    }
     /**
      * Optional returning/output clause.
      */
-    InsertQueryBuilder.prototype.output = function (output) {
+    output(output) {
         return this.returning(output);
-    };
+    }
     /**
      * Optional returning/output clause.
      */
-    InsertQueryBuilder.prototype.returning = function (returning) {
+    returning(returning) {
         // not all databases support returning/output cause
         if (!this.connection.driver.isReturningSqlSupported("insert")) {
             throw new ReturningStatementNotSupportedError_1.ReturningStatementNotSupportedError();
         }
         this.expressionMap.returning = returning;
         return this;
-    };
+    }
     /**
      * Indicates if entity must be updated after insertion operations.
      * This may produce extra query or use RETURNING / OUTPUT statement (depend on database).
      * Enabled by default.
      */
-    InsertQueryBuilder.prototype.updateEntity = function (enabled) {
+    updateEntity(enabled) {
         this.expressionMap.updateEntity = enabled;
         return this;
-    };
+    }
     /**
      * Adds additional ON CONFLICT statement supported in postgres and cockroach.
      *
      * @deprecated Use `orIgnore` or `orUpdate`
      */
-    InsertQueryBuilder.prototype.onConflict = function (statement) {
+    onConflict(statement) {
         this.expressionMap.onConflict = statement;
         return this;
-    };
+    }
     /**
      * Adds additional ignore statement supported in databases.
      */
-    InsertQueryBuilder.prototype.orIgnore = function (statement) {
-        if (statement === void 0) { statement = true; }
+    orIgnore(statement = true) {
         this.expressionMap.onIgnore = !!statement;
         return this;
-    };
+    }
     /**
      * Adds additional update statement supported in databases.
      */
-    InsertQueryBuilder.prototype.orUpdate = function (statementOrOverwrite, conflictTarget, orUpdateOptions) {
+    orUpdate(statementOrOverwrite, conflictTarget, orUpdateOptions) {
         if (!Array.isArray(statementOrOverwrite)) {
             this.expressionMap.onUpdate = {
-                conflict: statementOrOverwrite === null || statementOrOverwrite === void 0 ? void 0 : statementOrOverwrite.conflict_target,
-                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,
+                conflict: statementOrOverwrite?.conflict_target,
+                columns: statementOrOverwrite?.columns,
+                overwrite: statementOrOverwrite?.overwrite,
+                skipUpdateIfNoValuesChanged: orUpdateOptions?.skipUpdateIfNoValuesChanged,
             };
             return this;
         }
         this.expressionMap.onUpdate = {
             overwrite: statementOrOverwrite,
             conflict: conflictTarget,
-            skipUpdateIfNoValuesChanged: orUpdateOptions === null || orUpdateOptions === void 0 ? void 0 : orUpdateOptions.skipUpdateIfNoValuesChanged,
+            skipUpdateIfNoValuesChanged: orUpdateOptions?.skipUpdateIfNoValuesChanged,
         };
         return this;
-    };
+    }
     // -------------------------------------------------------------------------
     // Protected Methods
     // -------------------------------------------------------------------------
     /**
      * Creates INSERT express used to perform insert query.
      */
-    InsertQueryBuilder.prototype.createInsertExpression = function () {
-        var _this = this;
-        var tableName = this.getTableName(this.getMainTableName());
-        var valuesExpression = this.createValuesExpression(); // its important to get values before returning expression because oracle rely on native parameters and ordering of them is important
-        var returningExpression = this.connection.driver.options.type === "oracle" &&
+    createInsertExpression() {
+        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" &&
             this.getValueSets().length > 1
             ? null
             : this.createReturningExpression("insert"); // oracle doesnt support returning with multi-row insert
-        var columnsExpression = this.createColumnNamesExpression();
-        var query = "INSERT ";
+        const columnsExpression = this.createColumnNamesExpression();
+        let query = "INSERT ";
         if (DriverUtils_1.DriverUtils.isMySQLFamily(this.connection.driver) ||
             this.connection.driver.options.type === "aurora-mysql") {
-            query += "".concat(this.expressionMap.onIgnore ? " IGNORE " : "");
+            query += `${this.expressionMap.onIgnore ? " IGNORE " : ""}`;
         }
-        query += "INTO ".concat(tableName);
+        query += `INTO ${tableName}`;
         if (this.alias !== this.getMainTableName() &&
             DriverUtils_1.DriverUtils.isPostgresFamily(this.connection.driver)) {
-            query += " AS \"".concat(this.alias, "\"");
+            query += ` AS "${this.alias}"`;
         }
         // add columns expression
         if (columnsExpression) {
-            query += "(".concat(columnsExpression, ")");
+            query += `(${columnsExpression})`;
         }
         else {
             if (!valuesExpression &&
@@ -319,16 +287,16 @@ var InsertQueryBuilder = /** @class */ (function (_super) {
         // add OUTPUT expression
         if (returningExpression &&
             this.connection.driver.options.type === "mssql") {
-            query += " OUTPUT ".concat(returningExpression);
+            query += ` OUTPUT ${returningExpression}`;
         }
         // add VALUES expression
         if (valuesExpression) {
             if (this.connection.driver.options.type === "oracle" &&
                 this.getValueSets().length > 1) {
-                query += " ".concat(valuesExpression);
+                query += ` ${valuesExpression}`;
             }
             else {
-                query += " VALUES ".concat(valuesExpression);
+                query += ` VALUES ${valuesExpression}`;
             }
         }
         else {
@@ -338,7 +306,7 @@ var InsertQueryBuilder = /** @class */ (function (_super) {
                 query += " VALUES ()";
             }
             else {
-                query += " DEFAULT VALUES";
+                query += ` DEFAULT VALUES`;
             }
         }
         if (this.connection.driver.supportedUpsertType ===
@@ -347,41 +315,39 @@ var InsertQueryBuilder = /** @class */ (function (_super) {
                 query += " ON CONFLICT DO NOTHING ";
             }
             else if (this.expressionMap.onConflict) {
-                query += " ON CONFLICT ".concat(this.expressionMap.onConflict, " ");
+                query += ` ON CONFLICT ${this.expressionMap.onConflict} `;
             }
             else if (this.expressionMap.onUpdate) {
-                var _a = this.expressionMap.onUpdate, overwrite = _a.overwrite, columns = _a.columns, conflict = _a.conflict, skipUpdateIfNoValuesChanged = _a.skipUpdateIfNoValuesChanged;
-                var conflictTarget = "ON CONFLICT";
+                const { overwrite, columns, conflict, skipUpdateIfNoValuesChanged, } = this.expressionMap.onUpdate;
+                let conflictTarget = "ON CONFLICT";
                 if (Array.isArray(conflict)) {
-                    conflictTarget += " ( ".concat(conflict
-                        .map(function (column) { return _this.escape(column); })
-                        .join(", "), " )");
+                    conflictTarget += ` ( ${conflict
+                        .map((column) => this.escape(column))
+                        .join(", ")} )`;
                 }
                 else if (conflict) {
-                    conflictTarget += " ON CONSTRAINT ".concat(this.escape(conflict));
+                    conflictTarget += ` ON CONSTRAINT ${this.escape(conflict)}`;
                 }
                 if (Array.isArray(overwrite)) {
-                    query += " ".concat(conflictTarget, " DO UPDATE SET ");
-                    query += overwrite === null || overwrite === void 0 ? void 0 : overwrite.map(function (column) {
-                        return "".concat(_this.escape(column), " = EXCLUDED.").concat(_this.escape(column));
-                    }).join(", ");
+                    query += ` ${conflictTarget} DO UPDATE SET `;
+                    query += overwrite
+                        ?.map((column) => `${this.escape(column)} = EXCLUDED.${this.escape(column)}`)
+                        .join(", ");
                     query += " ";
                 }
                 else if (columns) {
-                    query += " ".concat(conflictTarget, " DO UPDATE SET ");
+                    query += ` ${conflictTarget} DO UPDATE SET `;
                     query += columns
-                        .map(function (column) { return "".concat(_this.escape(column), " = :").concat(column); })
+                        .map((column) => `${this.escape(column)} = :${column}`)
                         .join(", ");
                     query += " ";
                 }
                 if (Array.isArray(overwrite) &&
                     skipUpdateIfNoValuesChanged &&
                     DriverUtils_1.DriverUtils.isPostgresFamily(this.connection.driver)) {
-                    query += " WHERE (";
+                    query += ` WHERE (`;
                     query += overwrite
-                        .map(function (column) {
-                        return "".concat(tableName, ".").concat(_this.escape(column), " IS DISTINCT FROM EXCLUDED.").concat(_this.escape(column));
-                    })
+                        .map((column) => `${tableName}.${this.escape(column)} IS DISTINCT FROM EXCLUDED.${this.escape(column)}`)
                         .join(" OR ");
                     query += ") ";
                 }
@@ -390,20 +356,18 @@ var InsertQueryBuilder = /** @class */ (function (_super) {
         else if (this.connection.driver.supportedUpsertType ===
             "on-duplicate-key-update") {
             if (this.expressionMap.onUpdate) {
-                var _b = this.expressionMap.onUpdate, overwrite = _b.overwrite, columns = _b.columns;
+                const { overwrite, columns } = this.expressionMap.onUpdate;
                 if (Array.isArray(overwrite)) {
                     query += " ON DUPLICATE KEY UPDATE ";
                     query += overwrite
-                        .map(function (column) {
-                        return "".concat(_this.escape(column), " = VALUES(").concat(_this.escape(column), ")");
-                    })
+                        .map((column) => `${this.escape(column)} = VALUES(${this.escape(column)})`)
                         .join(", ");
                     query += " ";
                 }
                 else if (Array.isArray(columns)) {
                     query += " ON DUPLICATE KEY UPDATE ";
                     query += columns
-                        .map(function (column) { return "".concat(_this.escape(column), " = :").concat(column); })
+                        .map((column) => `${this.escape(column)} = :${column}`)
                         .join(", ");
                     query += " ";
                 }
@@ -411,7 +375,7 @@ var InsertQueryBuilder = /** @class */ (function (_super) {
         }
         else {
             if (this.expressionMap.onUpdate) {
-                throw new error_1.TypeORMError("onUpdate is not supported by the current database driver");
+                throw new error_1.TypeORMError(`onUpdate is not supported by the current database driver`);
             }
         }
         // add RETURNING expression
@@ -420,36 +384,31 @@ var InsertQueryBuilder = /** @class */ (function (_super) {
                 this.connection.driver.options.type === "oracle" ||
                 this.connection.driver.options.type === "cockroachdb" ||
                 DriverUtils_1.DriverUtils.isMySQLFamily(this.connection.driver))) {
-            query += " RETURNING ".concat(returningExpression);
+            query += ` RETURNING ${returningExpression}`;
         }
         // Inserting a specific value for an auto-increment primary key in mssql requires enabling IDENTITY_INSERT
         // IDENTITY_INSERT can only be enabled for tables where there is an IDENTITY column and only if there is a value to be inserted (i.e. supplying DEFAULT is prohibited if IDENTITY_INSERT is enabled)
         if (this.connection.driver.options.type === "mssql" &&
             this.expressionMap.mainAlias.hasMetadata &&
             this.expressionMap
-                .mainAlias.metadata.columns.filter(function (column) {
-                return _this.expressionMap.insertColumns.length > 0
-                    ? _this.expressionMap.insertColumns.indexOf(column.propertyPath) !== -1
-                    : column.isInsert;
-            })
-                .some(function (column) {
-                return _this.isOverridingAutoIncrementBehavior(column);
-            })) {
-            query = "SET IDENTITY_INSERT ".concat(tableName, " ON; ").concat(query, "; SET IDENTITY_INSERT ").concat(tableName, " OFF");
+                .mainAlias.metadata.columns.filter((column) => this.expressionMap.insertColumns.length > 0
+                ? this.expressionMap.insertColumns.indexOf(column.propertyPath) !== -1
+                : column.isInsert)
+                .some((column) => this.isOverridingAutoIncrementBehavior(column))) {
+            query = `SET IDENTITY_INSERT ${tableName} ON; ${query}; SET IDENTITY_INSERT ${tableName} OFF`;
         }
         return query;
-    };
+    }
     /**
      * Gets list of columns where values must be inserted to.
      */
-    InsertQueryBuilder.prototype.getInsertedColumns = function () {
-        var _this = this;
+    getInsertedColumns() {
         if (!this.expressionMap.mainAlias.hasMetadata)
             return [];
-        return this.expressionMap.mainAlias.metadata.columns.filter(function (column) {
+        return this.expressionMap.mainAlias.metadata.columns.filter((column) => {
             // if user specified list of columns he wants to insert to, then we filter only them
-            if (_this.expressionMap.insertColumns.length)
-                return (_this.expressionMap.insertColumns.indexOf(column.propertyPath) !== -1);
+            if (this.expressionMap.insertColumns.length)
+                return (this.expressionMap.insertColumns.indexOf(column.propertyPath) !== -1);
             // skip columns the user doesn't want included by default
             if (!column.isInsert) {
                 return false;
@@ -458,69 +417,67 @@ var InsertQueryBuilder = /** @class */ (function (_super) {
             // for Oracle we return auto-increment column as well because Oracle does not support DEFAULT VALUES expression
             if (column.isGenerated &&
                 column.generationStrategy === "increment" &&
-                !(_this.connection.driver.options.type === "spanner") &&
-                !(_this.connection.driver.options.type === "oracle") &&
-                !DriverUtils_1.DriverUtils.isSQLiteFamily(_this.connection.driver) &&
-                !DriverUtils_1.DriverUtils.isMySQLFamily(_this.connection.driver) &&
-                !(_this.connection.driver.options.type === "aurora-mysql") &&
-                !(_this.connection.driver.options.type === "mssql" &&
-                    _this.isOverridingAutoIncrementBehavior(column)))
+                !(this.connection.driver.options.type === "spanner") &&
+                !(this.connection.driver.options.type === "oracle") &&
+                !DriverUtils_1.DriverUtils.isSQLiteFamily(this.connection.driver) &&
+                !DriverUtils_1.DriverUtils.isMySQLFamily(this.connection.driver) &&
+                !(this.connection.driver.options.type === "aurora-mysql") &&
+                !(this.connection.driver.options.type === "mssql" &&
+                    this.isOverridingAutoIncrementBehavior(column)))
                 return false;
             return true;
         });
-    };
+    }
     /**
      * Creates a columns string where values must be inserted to for INSERT INTO expression.
      */
-    InsertQueryBuilder.prototype.createColumnNamesExpression = function () {
-        var _this = this;
-        var columns = this.getInsertedColumns();
+    createColumnNamesExpression() {
+        const columns = this.getInsertedColumns();
         if (columns.length > 0)
             return columns
-                .map(function (column) { return _this.escape(column.databaseName); })
+                .map((column) => this.escape(column.databaseName))
                 .join(", ");
         // in the case if there are no insert columns specified and table without metadata used
         // we get columns from the inserted value map, in the case if only one inserted map is specified
         if (!this.expressionMap.mainAlias.hasMetadata &&
             !this.expressionMap.insertColumns.length) {
-            var valueSets = this.getValueSets();
+            const valueSets = this.getValueSets();
             if (valueSets.length === 1)
                 return Object.keys(valueSets[0])
-                    .map(function (columnName) { return _this.escape(columnName); })
+                    .map((columnName) => this.escape(columnName))
                     .join(", ");
         }
         // get a table name and all column database names
         return this.expressionMap.insertColumns
-            .map(function (columnName) { return _this.escape(columnName); })
+            .map((columnName) => this.escape(columnName))
             .join(", ");
-    };
+    }
     /**
      * Creates list of values needs to be inserted in the VALUES expression.
      */
-    InsertQueryBuilder.prototype.createValuesExpression = function () {
-        var _this = this;
-        var valueSets = this.getValueSets();
-        var columns = this.getInsertedColumns();
+    createValuesExpression() {
+        const valueSets = this.getValueSets();
+        const columns = this.getInsertedColumns();
         // if column metadatas are given then apply all necessary operations with values
         if (columns.length > 0) {
-            var expression_1 = "";
-            valueSets.forEach(function (valueSet, valueSetIndex) {
-                columns.forEach(function (column, columnIndex) {
+            let expression = "";
+            valueSets.forEach((valueSet, valueSetIndex) => {
+                columns.forEach((column, columnIndex) => {
                     if (columnIndex === 0) {
-                        if (_this.connection.driver.options.type === "oracle" &&
+                        if (this.connection.driver.options.type === "oracle" &&
                             valueSets.length > 1) {
-                            expression_1 += " SELECT ";
+                            expression += " SELECT ";
                         }
-                        else if (_this.connection.driver.options.type === "sap" &&
+                        else if (this.connection.driver.options.type === "sap" &&
                             valueSets.length > 1) {
-                            expression_1 += " SELECT ";
+                            expression += " SELECT ";
                         }
                         else {
-                            expression_1 += "(";
+                            expression += "(";
                         }
                     }
                     // extract real value from the entity
-                    var value = column.getEntityValue(valueSet);
+                    let value = column.getEntityValue(valueSet);
                     // if column is relational and value is an object then get real referenced column value from this object
                     // for example column value is { question: { id: 1 } }, value will be equal to { id: 1 }
                     // and we extract "1" from this object
@@ -529,12 +486,12 @@ var InsertQueryBuilder = /** @class */ (function (_super) {
                     }*/
                     if (!(typeof value === "function")) {
                         // make sure our value is normalized by a driver
-                        value = _this.connection.driver.preparePersistentValue(value, column);
+                        value = this.connection.driver.preparePersistentValue(value, column);
                     }
                     // newly inserted entities always have a version equal to 1 (first version)
                     // also, user-specified version must be empty
                     if (column.isVersion && value === undefined) {
-                        expression_1 += "1";
+                        expression += "1";
                         // } else if (column.isNestedSetLeft) {
                         //     const tableName = this.connection.driver.escape(column.entityMetadata.tablePath);
                         //     const rightColumnName = this.connection.driver.escape(column.entityMetadata.nestedSetRightColumn!.databaseName);
@@ -548,7 +505,7 @@ var InsertQueryBuilder = /** @class */ (function (_super) {
                         //     expression += subQuery;
                     }
                     else if (column.isDiscriminator) {
-                        expression_1 += _this.createParameter(_this.expressionMap.mainAlias.metadata
+                        expression += this.createParameter(this.expressionMap.mainAlias.metadata
                             .discriminatorValue);
                         // return "1";
                         // for create and update dates we insert current date
@@ -560,63 +517,63 @@ var InsertQueryBuilder = /** @class */ (function (_super) {
                     }
                     else if (column.isGenerated &&
                         column.generationStrategy === "uuid" &&
-                        !_this.connection.driver.isUUIDGenerationSupported() &&
+                        !this.connection.driver.isUUIDGenerationSupported() &&
                         value === undefined) {
                         value = (0, uuid_1.v4)();
-                        expression_1 += _this.createParameter(value);
+                        expression += this.createParameter(value);
                         if (!(valueSetIndex in
-                            _this.expressionMap.locallyGenerated)) {
-                            _this.expressionMap.locallyGenerated[valueSetIndex] =
+                            this.expressionMap.locallyGenerated)) {
+                            this.expressionMap.locallyGenerated[valueSetIndex] =
                                 {};
                         }
-                        column.setEntityValue(_this.expressionMap.locallyGenerated[valueSetIndex], value);
+                        column.setEntityValue(this.expressionMap.locallyGenerated[valueSetIndex], value);
                         // if value for this column was not provided then insert default value
                     }
                     else if (value === undefined) {
-                        if ((_this.connection.driver.options.type === "oracle" &&
+                        if ((this.connection.driver.options.type === "oracle" &&
                             valueSets.length > 1) ||
-                            DriverUtils_1.DriverUtils.isSQLiteFamily(_this.connection.driver) ||
-                            _this.connection.driver.options.type === "sap" ||
-                            _this.connection.driver.options.type === "spanner") {
+                            DriverUtils_1.DriverUtils.isSQLiteFamily(this.connection.driver) ||
+                            this.connection.driver.options.type === "sap" ||
+                            this.connection.driver.options.type === "spanner") {
                             // unfortunately sqlite does not support DEFAULT expression in INSERT queries
                             if (column.default !== undefined &&
                                 column.default !== null) {
                                 // try to use default defined in the column
-                                expression_1 +=
-                                    _this.connection.driver.normalizeDefault(column);
+                                expression +=
+                                    this.connection.driver.normalizeDefault(column);
                             }
                             else {
-                                expression_1 += "NULL"; // otherwise simply use NULL and pray if column is nullable
+                                expression += "NULL"; // otherwise simply use NULL and pray if column is nullable
                             }
                         }
                         else {
-                            expression_1 += "DEFAULT";
+                            expression += "DEFAULT";
                         }
                     }
                     else if (value === null &&
-                        _this.connection.driver.options.type === "spanner") {
-                        expression_1 += "NULL";
+                        this.connection.driver.options.type === "spanner") {
+                        expression += "NULL";
                         // support for SQL expressions in queries
                     }
                     else if (typeof value === "function") {
-                        expression_1 += value();
+                        expression += value();
                         // just any other regular value
                     }
                     else {
                         //#region @backend
-                        if (_this.connection.driver.options.type === "mssql")
-                            value = _this.connection.driver.parametrizeValue(column, value);
+                        if (this.connection.driver.options.type === "mssql")
+                            value = this.connection.driver.parametrizeValue(column, value);
                         // we need to store array values in a special class to make sure parameter replacement will work correctly
                         // if (value instanceof Array)
                         //     value = new ArrayParameter(value);
                         //#endregion
-                        var paramName = _this.createParameter(value);
+                        const paramName = this.createParameter(value);
                         if (
                         //#region @backend
-                        (DriverUtils_1.DriverUtils.isMySQLFamily(_this.connection.driver) ||
-                            _this.connection.driver.options.type ===
+                        (DriverUtils_1.DriverUtils.isMySQLFamily(this.connection.driver) ||
+                            this.connection.driver.options.type ===
                                 "aurora-mysql") &&
-                            _this.connection.driver.spatialTypes.indexOf(column.type) !== -1
+                            this.connection.driver.spatialTypes.indexOf(column.type) !== -1
                         //#endregion
                         /* */
                         /* */
@@ -624,9 +581,9 @@ var InsertQueryBuilder = /** @class */ (function (_super) {
                         /* */
                         /* */
                         ) {
-                            var useLegacy = 
+                            const useLegacy = 
                             //#region @backend
-                            _this.connection.driver
+                            this.connection.driver
                             //#endregion
                             /* */
                             /* */
@@ -634,28 +591,28 @@ var InsertQueryBuilder = /** @class */ (function (_super) {
                             /* */
                             /* */
                             .options.legacySpatialSupport;
-                            var geomFromText = useLegacy
+                            const geomFromText = useLegacy
                                 ? "GeomFromText"
                                 : "ST_GeomFromText";
                             if (column.srid != null) {
-                                expression_1 += "".concat(geomFromText, "(").concat(paramName, ", ").concat(column.srid, ")");
+                                expression += `${geomFromText}(${paramName}, ${column.srid})`;
                             }
                             else {
-                                expression_1 += "".concat(geomFromText, "(").concat(paramName, ")");
+                                expression += `${geomFromText}(${paramName})`;
                             }
                         }
-                        else if (DriverUtils_1.DriverUtils.isPostgresFamily(_this.connection.driver) &&
-                            _this.connection.driver.spatialTypes.indexOf(column.type) !== -1) {
+                        else if (DriverUtils_1.DriverUtils.isPostgresFamily(this.connection.driver) &&
+                            this.connection.driver.spatialTypes.indexOf(column.type) !== -1) {
                             if (column.srid != null) {
-                                expression_1 += "ST_SetSRID(ST_GeomFromGeoJSON(".concat(paramName, "), ").concat(column.srid, ")::").concat(column.type);
+                                expression += `ST_SetSRID(ST_GeomFromGeoJSON(${paramName}), ${column.srid})::${column.type}`;
                             }
                             else {
-                                expression_1 += "ST_GeomFromGeoJSON(".concat(paramName, ")::").concat(column.type);
+                                expression += `ST_GeomFromGeoJSON(${paramName})::${column.type}`;
                             }
                         }
-                        else if (_this.connection.driver.options.type === "mssql" &&
-                            _this.connection.driver.spatialTypes.indexOf(column.type) !== -1) {
-                            expression_1 +=
+                        else if (this.connection.driver.options.type === "mssql" &&
+                            this.connection.driver.spatialTypes.indexOf(column.type) !== -1) {
+                            expression +=
                                 column.type +
                                     "::STGeomFromText(" +
                                     paramName +
@@ -664,129 +621,126 @@ var InsertQueryBuilder = /** @class */ (function (_super) {
                                     ")";
                         }
                         else {
-                            expression_1 += paramName;
+                            expression += paramName;
                         }
                     }
                     if (columnIndex === columns.length - 1) {
                         if (valueSetIndex === valueSets.length - 1) {
-                            if (_this.connection.driver.options.type ===
+                            if (this.connection.driver.options.type ===
                                 "oracle" &&
                                 valueSets.length > 1) {
-                                expression_1 += " FROM DUAL ";
+                                expression += " FROM DUAL ";
                             }
-                            else if (_this.connection.driver.options.type === "sap" &&
+                            else if (this.connection.driver.options.type === "sap" &&
                                 valueSets.length > 1) {
-                                expression_1 += " FROM dummy ";
+                                expression += " FROM dummy ";
                             }
                             else {
-                                expression_1 += ")";
+                                expression += ")";
                             }
                         }
                         else {
-                            if (_this.connection.driver.options.type ===
+                            if (this.connection.driver.options.type ===
                                 "oracle" &&
                                 valueSets.length > 1) {
-                                expression_1 += " FROM DUAL UNION ALL ";
+                                expression += " FROM DUAL UNION ALL ";
                             }
-                            else if (_this.connection.driver.options.type === "sap" &&
+                            else if (this.connection.driver.options.type === "sap" &&
                                 valueSets.length > 1) {
-                                expression_1 += " FROM dummy UNION ALL ";
+                                expression += " FROM dummy UNION ALL ";
                             }
                             else {
-                                expression_1 += "), ";
+                                expression += "), ";
                             }
                         }
                     }
                     else {
-                        expression_1 += ", ";
+                        expression += ", ";
                     }
                 });
             });
-            if (expression_1 === "()")
+            if (expression === "()")
                 return "";
-            return expression_1;
+            return expression;
         }
         else {
             // for tables without metadata
             // get values needs to be inserted
-            var expression_2 = "";
-            valueSets.forEach(function (valueSet, insertionIndex) {
-                var columns = Object.keys(valueSet);
-                columns.forEach(function (columnName, columnIndex) {
+            let expression = "";
+            valueSets.forEach((valueSet, insertionIndex) => {
+                const columns = Object.keys(valueSet);
+                columns.forEach((columnName, columnIndex) => {
                     if (columnIndex === 0) {
-                        expression_2 += "(";
+                        expression += "(";
                     }
-                    var value = valueSet[columnName];
+                    const value = valueSet[columnName];
                     // support for SQL expressions in queries
                     if (typeof value === "function") {
-                        expression_2 += value();
+                        expression += value();
                         // if value for this column was not provided then insert default value
                     }
                     else if (value === undefined) {
-                        if ((_this.connection.driver.options.type === "oracle" &&
+                        if ((this.connection.driver.options.type === "oracle" &&
                             valueSets.length > 1) ||
-                            DriverUtils_1.DriverUtils.isSQLiteFamily(_this.connection.driver) ||
-                            _this.connection.driver.options.type === "sap" ||
-                            _this.connection.driver.options.type === "spanner") {
-                            expression_2 += "NULL";
+                            DriverUtils_1.DriverUtils.isSQLiteFamily(this.connection.driver) ||
+                            this.connection.driver.options.type === "sap" ||
+                            this.connection.driver.options.type === "spanner") {
+                            expression += "NULL";
                         }
                         else {
-                            expression_2 += "DEFAULT";
+                            expression += "DEFAULT";
                         }
                     }
                     else if (value === null &&
-                        _this.connection.driver.options.type === "spanner") {
+                        this.connection.driver.options.type === "spanner") {
                         // just any other regular value
                     }
                     else {
-                        expression_2 += _this.createParameter(value);
+                        expression += this.createParameter(value);
                     }
                     if (columnIndex === Object.keys(valueSet).length - 1) {
                         if (insertionIndex === valueSets.length - 1) {
-                            expression_2 += ")";
+                            expression += ")";
                         }
                         else {
-                            expression_2 += "), ";
+                            expression += "), ";
                         }
                     }
                     else {
-                        expression_2 += ", ";
+                        expression += ", ";
                     }
                 });
             });
-            if (expression_2 === "()")
+            if (expression === "()")
                 return "";
-            return expression_2;
+            return expression;
         }
-    };
+    }
     /**
      * Gets array of values need to be inserted into the target table.
      */
-    InsertQueryBuilder.prototype.getValueSets = function () {
+    getValueSets() {
         if (Array.isArray(this.expressionMap.valuesSet))
             return this.expressionMap.valuesSet;
         if (ObjectUtils_1.ObjectUtils.isObject(this.expressionMap.valuesSet))
             return [this.expressionMap.valuesSet];
         throw new InsertValuesMissingError_1.InsertValuesMissingError();
-    };
+    }
     /**
      * Checks if column is an auto-generated primary key, but the current insertion specifies a value for it.
      *
      * @param column
      */
-    InsertQueryBuilder.prototype.isOverridingAutoIncrementBehavior = function (column) {
+    isOverridingAutoIncrementBehavior(column) {
         return (column.isPrimary &&
             column.isGenerated &&
             column.generationStrategy === "increment" &&
-            this.getValueSets().some(function (valueSet) {
-                return column.getEntityValue(valueSet) !== undefined &&
-                    column.getEntityValue(valueSet) !== null;
-            }));
-    };
-    InsertQueryBuilder = tslib_1.__decorate([
-        typescript_class_helpers_1.CLASS.NAME('InsertQueryBuilder')
-    ], InsertQueryBuilder);
-    return InsertQueryBuilder;
-}(QueryBuilder_1.QueryBuilder));
+            this.getValueSets().some((valueSet) => column.getEntityValue(valueSet) !== undefined &&
+                column.getEntityValue(valueSet) !== null));
+    }
+};
 exports.InsertQueryBuilder = InsertQueryBuilder;
+exports.InsertQueryBuilder = InsertQueryBuilder = __decorate([
+    typescript_class_helpers_1.CLASS.NAME('InsertQueryBuilder')
+], InsertQueryBuilder);
 //# sourceMappingURL=InsertQueryBuilder.js.map