typeorm 0.3.29-dev.cc07c90 → 1.0.0-beta.1

package/query-builder/InsertQueryBuilder.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InsertQueryBuilder = void 0;
-const uuid_1 = require("uuid");
 const DriverUtils_1 = require("../driver/DriverUtils");
 const error_1 = require("../error");
 const InsertValuesMissingError_1 = require("../error/InsertValuesMissingError");
@@ -9,6 +8,7 @@ const ReturningStatementNotSupportedError_1 = require("../error/ReturningStateme
 const BroadcasterResult_1 = require("../subscriber/BroadcasterResult");
 const InstanceChecker_1 = require("../util/InstanceChecker");
 const ObjectUtils_1 = require("../util/ObjectUtils");
+const RandomGenerator_1 = require("../util/RandomGenerator");
 const QueryBuilder_1 = require("./QueryBuilder");
 const InsertResult_1 = require("./result/InsertResult");
 const ReturningResultsEntityUpdator_1 = require("./ReturningResultsEntityUpdator");
@@ -36,9 +36,8 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * Executes sql generated by query builder and returns raw database results.
      */
     async execute() {
-        // console.time(".value sets");
-        const valueSets = this.getValueSets();
         // console.timeEnd(".value sets");
+        const valueSets = this.getValueSets();
         // If user passed empty array of entities then we don't need to do
         // anything.
         //
@@ -46,7 +45,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
         // 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)
+        if (valueSets.length === 0 && !this.expressionMap.insertFromSelect)
             return new InsertResult_1.InsertResult();
         // console.time("QueryBuilder.execute");
         // console.time(".database stuff");
@@ -61,7 +60,9 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
             }
             // console.timeEnd(".database stuff");
             // call before insertion methods in listeners and subscribers
-            if (this.expressionMap.callListeners === true &&
+            // Skip for INSERT FROM SELECT as there are no individual value sets
+            if (!this.expressionMap.insertFromSelect &&
+                this.expressionMap.callListeners === true &&
                 this.expressionMap.mainAlias.hasMetadata) {
                 const broadcastResult = new BroadcasterResult_1.BroadcasterResult();
                 valueSets.forEach((valueSet) => {
@@ -84,15 +85,15 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
             if (this.expressionMap.updateEntity === true &&
                 this.expressionMap.mainAlias.hasMetadata) {
                 if (!(valueSets.length > 1 &&
-                    this.connection.driver.options.type === "oracle")) {
+                    this.dataSource.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 = this.connection.driver.buildTableVariableDeclaration("@OutputTable", returningColumns);
+                this.dataSource.driver.options.type === "mssql") {
+                declareSql = this.dataSource.driver.buildTableVariableDeclaration("@OutputTable", returningColumns);
                 selectOutputSql = `SELECT * FROM @OutputTable`;
             }
             // console.timeEnd(".prepare returning statement");
@@ -107,14 +108,18 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
             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 &&
+            // Skip for INSERT FROM SELECT as there are no entities to update
+            if (!this.expressionMap.insertFromSelect &&
+                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 &&
+            // Skip for INSERT FROM SELECT as there are no individual value sets
+            if (!this.expressionMap.insertFromSelect &&
+                this.expressionMap.callListeners === true &&
                 this.expressionMap.mainAlias.hasMetadata) {
                 const broadcastResult = new BroadcasterResult_1.BroadcasterResult();
                 valueSets.forEach((valueSet) => {
@@ -155,6 +160,8 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
     // -------------------------------------------------------------------------
     /**
      * Specifies INTO which entity's table insertion will be executed.
+     * @param entityTarget
+     * @param columns
      */
     into(entityTarget, columns) {
         entityTarget = InstanceChecker_1.InstanceChecker.isEntitySchema(entityTarget)
@@ -167,23 +174,44 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Values needs to be inserted into table.
+     * @param values
      */
     values(values) {
         this.expressionMap.valuesSet = values;
         return this;
     }
+    /**
+     * Specifies a SELECT query to use as the source of values for the INSERT.
+     * This creates an INSERT INTO ... SELECT FROM statement.
+     * @param queryBuilderOrFactory
+     */
+    valuesFromSelect(queryBuilderOrFactory) {
+        let selectQueryBuilder;
+        if (typeof queryBuilderOrFactory === "function") {
+            const subQuery = this.createQueryBuilder().select();
+            selectQueryBuilder = queryBuilderOrFactory(subQuery);
+        }
+        else {
+            selectQueryBuilder = queryBuilderOrFactory;
+        }
+        this.setParameters(selectQueryBuilder.getParameters());
+        this.expressionMap.insertFromSelect = selectQueryBuilder;
+        return this;
+    }
     /**
      * Optional returning/output clause.
+     * @param output
      */
     output(output) {
         return this.returning(output);
     }
     /**
      * Optional returning/output clause.
+     * @param returning
      */
     returning(returning) {
         // not all databases support returning/output cause
-        if (!this.connection.driver.isReturningSqlSupported("insert")) {
+        if (!this.dataSource.driver.isReturningSqlSupported("insert")) {
             throw new ReturningStatementNotSupportedError_1.ReturningStatementNotSupportedError();
         }
         this.expressionMap.returning = returning;
@@ -193,31 +221,31 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * 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.
+     * @param enabled
      */
     updateEntity(enabled) {
         this.expressionMap.updateEntity = enabled;
         return this;
     }
-    /**
-     * Adds additional ON CONFLICT statement supported in postgres and cockroach.
-     *
-     * @deprecated Use `orIgnore` or `orUpdate`
-     */
-    onConflict(statement) {
-        this.expressionMap.onConflict = statement;
-        return this;
-    }
     /**
      * Adds additional ignore statement supported in databases.
+     * @param statement
      */
     orIgnore(statement = true) {
         this.expressionMap.onIgnore = !!statement;
         return this;
     }
     /**
-     * Adds additional update statement supported in databases.
+     * Adds an "upsert" clause to the insert query — when a row with the same
+     * conflict target already exists the listed columns are updated instead.
+     * @param overwrite - Column names to overwrite on conflict.
+     * @param conflictTarget - Column name(s) or constraint name used to detect
+     *   conflicts. When an array is given the columns form a composite key;
+     *   when a string is given it is treated as a constraint name.
+     * @param orUpdateOptions - Additional options such as `skipUpdateIfNoValuesChanged`,
+     *   `indexPredicate`, `upsertType`, or `overwriteCondition`.
      */
-    orUpdate(statementOrOverwrite, conflictTarget, orUpdateOptions) {
+    orUpdate(overwrite, conflictTarget, orUpdateOptions) {
         const { where, parameters } = orUpdateOptions?.overwriteCondition ?? {};
         let wheres;
         if (where) {
@@ -227,19 +255,8 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
         }
         if (parameters)
             this.setParameters(parameters);
-        if (!Array.isArray(statementOrOverwrite)) {
-            this.expressionMap.onUpdate = {
-                conflict: statementOrOverwrite?.conflict_target,
-                columns: statementOrOverwrite?.columns,
-                overwrite: statementOrOverwrite?.overwrite,
-                skipUpdateIfNoValuesChanged: orUpdateOptions?.skipUpdateIfNoValuesChanged,
-                upsertType: orUpdateOptions?.upsertType,
-                overwriteCondition: wheres,
-            };
-            return this;
-        }
         this.expressionMap.onUpdate = {
-            overwrite: statementOrOverwrite,
+            overwrite: overwrite,
             conflict: conflictTarget,
             skipUpdateIfNoValuesChanged: orUpdateOptions?.skipUpdateIfNoValuesChanged,
             indexPredicate: orUpdateOptions?.indexPredicate,
@@ -258,7 +275,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
         if (this.expressionMap.onUpdate || this.expressionMap.onIgnore) {
             if ((this.expressionMap.onUpdate?.upsertType ?? "merge-into") ===
                 "merge-into" &&
-                this.connection.driver.supportedUpsertTypes.includes("merge-into"))
+                this.dataSource.driver.supportedUpsertTypes.includes("merge-into"))
                 return this.createMergeExpression();
         }
         const tableName = this.getTableName(this.getMainTableName());
@@ -266,7 +283,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
             ? this.escape(this.alias)
             : tableName;
         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" &&
+        const returningExpression = this.dataSource.driver.options.type === "oracle" &&
             this.getValueSets().length > 1
             ? null
             : this.createReturningExpression("insert"); // oracle doesnt support returning with multi-row insert
@@ -275,13 +292,13 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
         if (this.expressionMap.onUpdate?.upsertType === "primary-key") {
             query = "UPSERT ";
         }
-        if (DriverUtils_1.DriverUtils.isMySQLFamily(this.connection.driver) ||
-            this.connection.driver.options.type === "aurora-mysql") {
+        if (DriverUtils_1.DriverUtils.isMySQLFamily(this.dataSource.driver) ||
+            this.dataSource.driver.options.type === "aurora-mysql") {
             query += `${this.expressionMap.onIgnore ? " IGNORE " : ""}`;
         }
         query += `INTO ${tableName}`;
         if (this.alias !== this.getMainTableName() &&
-            DriverUtils_1.DriverUtils.isPostgresFamily(this.connection.driver)) {
+            DriverUtils_1.DriverUtils.isPostgresFamily(this.dataSource.driver)) {
             query += ` AS "${this.alias}"`;
         }
         // add columns expression
@@ -290,45 +307,46 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
         }
         else {
             if (!valuesExpression &&
-                (DriverUtils_1.DriverUtils.isMySQLFamily(this.connection.driver) ||
-                    this.connection.driver.options.type === "aurora-mysql"))
+                (DriverUtils_1.DriverUtils.isMySQLFamily(this.dataSource.driver) ||
+                    this.dataSource.driver.options.type === "aurora-mysql"))
                 // special syntax for mysql DEFAULT VALUES insertion
                 query += "()";
         }
-        // add OUTPUT expression
-        if (returningExpression &&
-            this.connection.driver.options.type === "mssql") {
-            query += ` OUTPUT ${returningExpression}`;
-        }
-        // add VALUES expression
-        if (valuesExpression) {
-            if ((this.connection.driver.options.type === "oracle" ||
-                this.connection.driver.options.type === "sap") &&
-                this.getValueSets().length > 1) {
-                query += ` ${valuesExpression}`;
-            }
-            else {
-                query += ` VALUES ${valuesExpression}`;
-            }
-        }
+        if (this.expressionMap.insertFromSelect)
+            query += ` ${this.expressionMap.insertFromSelect.getQuery()}`;
         else {
-            if (DriverUtils_1.DriverUtils.isMySQLFamily(this.connection.driver) ||
-                this.connection.driver.options.type === "aurora-mysql") {
-                // special syntax for mysql DEFAULT VALUES insertion
-                query += " VALUES ()";
+            // add OUTPUT expression
+            if (returningExpression &&
+                this.dataSource.driver.options.type === "mssql") {
+                query += ` OUTPUT ${returningExpression}`;
+            }
+            // add VALUES expression
+            if (valuesExpression) {
+                if ((this.dataSource.driver.options.type === "oracle" ||
+                    this.dataSource.driver.options.type === "sap") &&
+                    this.getValueSets().length > 1) {
+                    query += ` ${valuesExpression}`;
+                }
+                else {
+                    query += ` VALUES ${valuesExpression}`;
+                }
             }
             else {
-                query += ` DEFAULT VALUES`;
+                if (DriverUtils_1.DriverUtils.isMySQLFamily(this.dataSource.driver) ||
+                    this.dataSource.driver.options.type === "aurora-mysql") {
+                    // special syntax for mysql DEFAULT VALUES insertion
+                    query += " VALUES ()";
+                }
+                else {
+                    query += ` DEFAULT VALUES`;
+                }
             }
         }
         if (this.expressionMap.onUpdate?.upsertType !== "primary-key") {
-            if (this.connection.driver.supportedUpsertTypes.includes("on-conflict-do-update")) {
+            if (this.dataSource.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";
@@ -337,11 +355,11 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
                             .map((column) => this.escape(column))
                             .join(", ")} )`;
                         if (indexPredicate &&
-                            !DriverUtils_1.DriverUtils.isPostgresFamily(this.connection.driver)) {
+                            !DriverUtils_1.DriverUtils.isPostgresFamily(this.dataSource.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)) {
+                            DriverUtils_1.DriverUtils.isPostgresFamily(this.dataSource.driver)) {
                             conflictTarget += ` WHERE ( ${indexPredicate} )`;
                         }
                     }
@@ -353,26 +371,40 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
                         updatePart.push(...overwrite.map((column) => `${this.escape(column)} = EXCLUDED.${this.escape(column)}`));
                     }
                     else if (columns) {
-                        updatePart.push(...columns.map((column) => `${this.escape(column)} = :${column}`));
+                        updatePart.push(...columns.map((column) => {
+                            let expression = `:${column}`;
+                            if (this.expressionMap.mainAlias.hasMetadata &&
+                                DriverUtils_1.DriverUtils.isSQLiteFamily(this.dataSource.driver)) {
+                                const col = this.expressionMap.mainAlias?.metadata.findColumnWithDatabaseName(column);
+                                if (col) {
+                                    expression = this.dataSource.driver.wrapWithJsonFunction(expression, col, true);
+                                }
+                            }
+                            return `${this.escape(column)} = ${expression}`;
+                        }));
                     }
-                    if (updatePart.length > 0) {
+                    if (updatePart.length === 0) {
+                        query += ` ${conflictTarget} DO NOTHING `;
+                    }
+                    else {
                         query += ` ${conflictTarget} DO UPDATE SET `;
                         updatePart.push(...this.expressionMap
                             .mainAlias.metadata.columns.filter((column) => column.isUpdateDate &&
                             !overwrite?.includes(column.databaseName) &&
-                            !((this.connection.driver.options
+                            !((this.dataSource.driver.options
                                 .type === "oracle" &&
                                 this.getValueSets().length >
                                     1) ||
-                                DriverUtils_1.DriverUtils.isSQLiteFamily(this.connection.driver) ||
-                                this.connection.driver.options
+                                DriverUtils_1.DriverUtils.isSQLiteFamily(this.dataSource.driver) ||
+                                this.dataSource.driver.options
                                     .type === "sap" ||
-                                this.connection.driver.options
+                                this.dataSource.driver.options
                                     .type === "spanner"))
                             .map((column) => `${this.escape(column.databaseName)} = DEFAULT`));
                         query += updatePart.join(", ");
                     }
                     if (Array.isArray(overwrite) &&
+                        overwrite.length > 0 &&
                         skipUpdateIfNoValuesChanged) {
                         this.expressionMap.onUpdate.overwriteCondition ??= [];
                         const wheres = overwrite.map((column) => ({
@@ -384,18 +416,24 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
                             condition: wheres,
                         });
                     }
-                    if (DriverUtils_1.DriverUtils.isPostgresFamily(this.connection.driver) &&
+                    if (DriverUtils_1.DriverUtils.isPostgresFamily(this.dataSource.driver) &&
                         this.expressionMap.onUpdate.overwriteCondition &&
                         this.expressionMap.onUpdate.overwriteCondition.length >
                             0) {
-                        query += ` WHERE ${this.createUpsertConditionExpression()}`;
+                        query += ` WHERE ${this.createUpsertConditionExpression(tableOrAliasName)}`;
                     }
                 }
             }
-            else if (this.connection.driver.supportedUpsertTypes.includes("on-duplicate-key-update")) {
+            else if (this.dataSource.driver.supportedUpsertTypes.includes("on-duplicate-key-update")) {
                 if (this.expressionMap.onUpdate) {
                     const { overwrite, columns } = this.expressionMap.onUpdate;
-                    if (Array.isArray(overwrite)) {
+                    if (Array.isArray(overwrite) && overwrite.length === 0) {
+                        // No columns to update — degrade to INSERT IGNORE
+                        // The IGNORE keyword was not added above, so we
+                        // rewrite the query to include it.
+                        query = query.replace(/^INSERT INTO/, "INSERT IGNORE INTO");
+                    }
+                    else if (Array.isArray(overwrite)) {
                         query += " ON DUPLICATE KEY UPDATE ";
                         query += overwrite
                             .map((column) => `${this.escape(column)} = VALUES(${this.escape(column)})`)
@@ -418,20 +456,23 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
             }
         }
         // add RETURNING expression
+        // Note: Oracle does not support RETURNING with INSERT ... SELECT (insertFromSelect),
+        // so we skip RETURNING for Oracle when inserting from a select.
         if (returningExpression &&
-            (DriverUtils_1.DriverUtils.isPostgresFamily(this.connection.driver) ||
-                this.connection.driver.options.type === "oracle" ||
-                this.connection.driver.options.type === "cockroachdb" ||
-                DriverUtils_1.DriverUtils.isMySQLFamily(this.connection.driver))) {
+            (DriverUtils_1.DriverUtils.isPostgresFamily(this.dataSource.driver) ||
+                this.dataSource.driver.options.type === "cockroachdb" ||
+                DriverUtils_1.DriverUtils.isMySQLFamily(this.dataSource.driver) ||
+                (this.dataSource.driver.options.type === "oracle" &&
+                    !this.expressionMap.insertFromSelect))) {
             query += ` RETURNING ${returningExpression}`;
         }
         if (returningExpression &&
-            this.connection.driver.options.type === "spanner") {
+            this.dataSource.driver.options.type === "spanner") {
             query += ` THEN RETURN ${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" &&
+        if (this.dataSource.driver.options.type === "mssql" &&
             this.expressionMap.mainAlias.hasMetadata &&
             this.expressionMap
                 .mainAlias.metadata.columns.filter((column) => this.expressionMap.insertColumns.length > 0
@@ -456,16 +497,25 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
             if (!column.isInsert) {
                 return false;
             }
+            // Skip generated columns if we are inserting from select, if not explicitly specified
+            if (column.isGenerated &&
+                this.expressionMap.insertFromSelect &&
+                (DriverUtils_1.DriverUtils.isSQLiteFamily(this.dataSource.driver) ||
+                    DriverUtils_1.DriverUtils.isMySQLFamily(this.dataSource.driver) ||
+                    this.dataSource.driver.options.type ===
+                        "aurora-mysql" ||
+                    this.dataSource.driver.options.type === "oracle"))
+                return false;
             // if user did not specified such list then return all columns except auto-increment one
             // 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.dataSource.driver.options.type === "spanner") &&
+                !(this.dataSource.driver.options.type === "oracle") &&
+                !DriverUtils_1.DriverUtils.isSQLiteFamily(this.dataSource.driver) &&
+                !DriverUtils_1.DriverUtils.isMySQLFamily(this.dataSource.driver) &&
+                !(this.dataSource.driver.options.type === "aurora-mysql") &&
+                !(this.dataSource.driver.options.type === "mssql" &&
                     this.isOverridingAutoIncrementBehavior(column)))
                 return false;
             return true;
@@ -507,11 +557,11 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
             valueSets.forEach((valueSet, valueSetIndex) => {
                 columns.forEach((column, columnIndex) => {
                     if (columnIndex === 0) {
-                        if (this.connection.driver.options.type === "oracle" &&
+                        if (this.dataSource.driver.options.type === "oracle" &&
                             valueSets.length > 1) {
                             expression += " SELECT ";
                         }
-                        else if (this.connection.driver.options.type === "sap" &&
+                        else if (this.dataSource.driver.options.type === "sap" &&
                             valueSets.length > 1) {
                             expression += " SELECT ";
                         }
@@ -522,22 +572,22 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
                     expression += this.createColumnValueExpression(valueSets, valueSetIndex, column);
                     if (columnIndex === columns.length - 1) {
                         if (valueSetIndex === valueSets.length - 1) {
-                            if (["oracle", "sap"].includes(this.connection.driver.options.type) &&
+                            if (["oracle", "sap"].includes(this.dataSource.driver.options.type) &&
                                 valueSets.length > 1) {
                                 expression +=
                                     " FROM " +
-                                        this.connection.driver.dummyTableName;
+                                        this.dataSource.driver.dummyTableName;
                             }
                             else {
                                 expression += ")";
                             }
                         }
                         else {
-                            if (["oracle", "sap"].includes(this.connection.driver.options.type) &&
+                            if (["oracle", "sap"].includes(this.dataSource.driver.options.type) &&
                                 valueSets.length > 1) {
                                 expression +=
                                     " FROM " +
-                                        this.connection.driver.dummyTableName +
+                                        this.dataSource.driver.dummyTableName +
                                         " UNION ALL ";
                             }
                             else {
@@ -571,11 +621,11 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
                         // 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.dataSource.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.dataSource.driver) ||
+                            this.dataSource.driver.options.type === "sap" ||
+                            this.dataSource.driver.options.type === "spanner") {
                             expression += "NULL";
                         }
                         else {
@@ -583,7 +633,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
                         }
                     }
                     else if (value === null &&
-                        this.connection.driver.options.type === "spanner") {
+                        this.dataSource.driver.options.type === "spanner") {
                         // just any other regular value
                     }
                     else {
@@ -611,6 +661,9 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * Gets array of values need to be inserted into the target table.
      */
     getValueSets() {
+        if (this.expressionMap.insertFromSelect) {
+            return [];
+        }
         if (Array.isArray(this.expressionMap.valuesSet))
             return this.expressionMap.valuesSet;
         if (ObjectUtils_1.ObjectUtils.isObject(this.expressionMap.valuesSet))
@@ -619,7 +672,6 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Checks if column is an auto-generated primary key, but the current insertion specifies a value for it.
-     *
      * @param column
      */
     isOverridingAutoIncrementBehavior(column) {
@@ -633,7 +685,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * Creates MERGE express used to perform insert query.
      */
     createMergeExpression() {
-        if (!this.connection.driver.supportedUpsertTypes.includes("merge-into"))
+        if (!this.dataSource.driver.supportedUpsertTypes.includes("merge-into"))
             throw new error_1.TypeORMError(`Upsert type "merge-into" is not supported by current database driver`);
         if (this.expressionMap.onUpdate?.upsertType &&
             this.expressionMap.onUpdate.upsertType !== "merge-into") {
@@ -655,15 +707,41 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
                 query += ` ON (${tableAlias}.${this.escape(primaryKey.databaseName)} = ${mergeSourceAlias}.${this.escape(primaryKey.databaseName)})`;
             }
             else {
-                query += `ON (${this.expressionMap
-                    .mainAlias.metadata.uniques.map((unique) => {
-                    return `(${unique.columns
+                // Get unique constraints from metadata.uniques
+                const uniqueConstraints = this.expressionMap.mainAlias.metadata.uniques;
+                // Get unique indices from metadata.indices
+                const uniqueIndices = this.expressionMap.mainAlias.metadata.indices.filter((index) => index.isUnique);
+                const allUniqueConditions = [];
+                // Add conditions from unique constraints
+                uniqueConstraints.forEach((unique) => {
+                    const condition = unique.columns
                         .map((column) => {
                         return `${tableAlias}.${this.escape(column.databaseName)} = ${mergeSourceAlias}.${this.escape(column.databaseName)}`;
                     })
-                        .join(" AND ")})`;
-                })
-                    .join(" OR ")})`;
+                        .join(" AND ");
+                    allUniqueConditions.push(`(${condition})`);
+                });
+                // Add conditions from unique indices
+                uniqueIndices.forEach((index) => {
+                    const condition = index.columns
+                        .map((column) => {
+                        return `${tableAlias}.${this.escape(column.databaseName)} = ${mergeSourceAlias}.${this.escape(column.databaseName)}`;
+                    })
+                        .join(" AND ");
+                    allUniqueConditions.push(`(${condition})`);
+                });
+                if (allUniqueConditions.length > 0) {
+                    query += ` ON (${allUniqueConditions.join(" OR ")})`;
+                }
+                else {
+                    // Fallback: use all columns being inserted as the match condition
+                    const columnConditions = columns
+                        .map((column) => {
+                        return `${tableAlias}.${this.escape(column.databaseName)} = ${mergeSourceAlias}.${this.escape(column.databaseName)}`;
+                    })
+                        .join(" AND ");
+                    query += ` ON (${columnConditions})`;
+                }
             }
         }
         else if (this.expressionMap.onUpdate) {
@@ -717,10 +795,10 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
                     condition: wheres,
                 });
             }
-            const mergeCondition = this.createUpsertConditionExpression();
+            const mergeCondition = this.createUpsertConditionExpression(tableAlias);
             if (updateExpression.trim()) {
-                if ((this.connection.driver.options.type === "mssql" ||
-                    this.connection.driver.options.type === "sap") &&
+                if ((this.dataSource.driver.options.type === "mssql" ||
+                    this.dataSource.driver.options.type === "sap") &&
                     mergeCondition != "") {
                     query += ` WHEN MATCHED AND ${mergeCondition} THEN UPDATE SET ${updateExpression}`;
                 }
@@ -733,7 +811,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
             }
         }
         const valuesExpression = this.createMergeIntoInsertValuesExpression(mergeSourceAlias);
-        const returningExpression = this.connection.driver.options.type === "mssql"
+        const returningExpression = this.dataSource.driver.options.type === "mssql"
             ? this.createReturningExpression("insert")
             : null;
         query += " WHEN NOT MATCHED THEN INSERT";
@@ -747,30 +825,77 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
         }
         // add OUTPUT expression
         if (returningExpression &&
-            this.connection.driver.options.type === "mssql") {
+            this.dataSource.driver.options.type === "mssql") {
             query += ` OUTPUT ${returningExpression}`;
         }
-        if (this.connection.driver.options.type === "mssql") {
+        if (this.dataSource.driver.options.type === "mssql") {
             query += `;`;
         }
         return query;
     }
     /**
      * Creates list of values needs to be inserted in the VALUES expression.
+     * @param mergeSourceAlias
      */
     createMergeIntoSourceExpression(mergeSourceAlias) {
-        const valueSets = this.getValueSets();
         const columns = this.getInsertedColumns();
         let expression = "USING (";
+        // Handle INSERT FROM SELECT case
+        if (this.expressionMap.insertFromSelect) {
+            // For MERGE source we need the SELECT's output columns to match
+            // the target column names referenced as `mergeIntoSource.<col>`.
+            // MSSQL supports providing a column list after the alias, so
+            // in that case we can keep the original SELECT. For other
+            // drivers (e.g. Oracle, SAP HANA) we clone the select and set
+            // the select aliases to the target column database names so
+            // references like `mergeIntoSource.email` resolve correctly.
+            if (this.dataSource.driver.options.type === "mssql") {
+                expression += this.expressionMap.insertFromSelect.getQuery();
+            }
+            else {
+                // Clone the SelectQueryBuilder and modify its select expressions
+                const selectQb = this.expressionMap.insertFromSelect.clone();
+                const targetColumns = this.getInsertedColumns();
+                // Clear existing selects and add new ones with proper aliases
+                selectQb.expressionMap.selects = [];
+                // Get the original select expressions
+                const originalSelects = this.expressionMap.insertFromSelect.expressionMap.selects;
+                originalSelects.forEach((select, index) => {
+                    const targetColumn = targetColumns[index];
+                    if (targetColumn) {
+                        // Add select with target column name as alias
+                        selectQb.expressionMap.selects.push({
+                            selection: select.selection,
+                            aliasName: targetColumn.databaseName,
+                            virtual: select.virtual,
+                        });
+                    }
+                    else {
+                        selectQb.expressionMap.selects.push(select);
+                    }
+                });
+                expression += selectQb.getQuery();
+            }
+            expression += `) ${mergeSourceAlias}`;
+            // MSSQL requires column list after the alias
+            if (this.dataSource.driver.options.type === "mssql") {
+                expression += ` (${columns
+                    .map((column) => this.escape(column.databaseName))
+                    .join(", ")})`;
+            }
+            return expression;
+        }
+        // Handle VALUES case
+        const valueSets = this.getValueSets();
         // if column metadatas are given then apply all necessary operations with values
         if (columns.length > 0) {
-            if (this.connection.driver.options.type === "mssql") {
+            if (this.dataSource.driver.options.type === "mssql") {
                 expression += "VALUES ";
             }
             valueSets.forEach((valueSet, valueSetIndex) => {
                 columns.forEach((column, columnIndex) => {
                     if (columnIndex === 0) {
-                        if (this.connection.driver.options.type === "mssql") {
+                        if (this.dataSource.driver.options.type === "mssql") {
                             expression += "(";
                         }
                         else {
@@ -781,12 +906,12 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
                     if (value === undefined &&
                         !(column.isGenerated &&
                             column.generationStrategy === "uuid" &&
-                            !this.connection.driver.isUUIDGenerationSupported())) {
+                            !this.dataSource.driver.isUUIDGenerationSupported())) {
                         if (column.default !== undefined &&
                             column.default !== null) {
                             // try to use default defined in the column
                             expression +=
-                                this.connection.driver.normalizeDefault(column);
+                                this.dataSource.driver.normalizeDefault(column);
                         }
                         else {
                             expression += "NULL"; // otherwise simply use NULL and pray if column is nullable
@@ -798,28 +923,28 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
                     else {
                         expression += this.createColumnValueExpression(valueSets, valueSetIndex, column);
                     }
-                    if (this.connection.driver.options.type !== "mssql")
+                    if (this.dataSource.driver.options.type !== "mssql")
                         expression += ` AS ${this.escape(column.databaseName)}`;
                     if (columnIndex === columns.length - 1) {
                         if (valueSetIndex === valueSets.length - 1) {
-                            if (["oracle", "sap"].includes(this.connection.driver.options.type)) {
+                            if (["oracle", "sap"].includes(this.dataSource.driver.options.type)) {
                                 expression +=
                                     " FROM " +
-                                        this.connection.driver.dummyTableName;
+                                        this.dataSource.driver.dummyTableName;
                             }
-                            else if (this.connection.driver.options.type === "mssql") {
+                            else if (this.dataSource.driver.options.type === "mssql") {
                                 expression += ")";
                             }
                         }
                         else {
-                            if (["oracle", "sap"].includes(this.connection.driver.options.type) &&
+                            if (["oracle", "sap"].includes(this.dataSource.driver.options.type) &&
                                 valueSets.length > 1) {
                                 expression +=
                                     " FROM " +
-                                        this.connection.driver.dummyTableName +
+                                        this.dataSource.driver.dummyTableName +
                                         " UNION ALL ";
                             }
-                            else if (this.connection.driver.options.type === "mssql") {
+                            else if (this.dataSource.driver.options.type === "mssql") {
                                 expression += "), ";
                             }
                             else {
@@ -838,7 +963,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
             throw new error_1.TypeORMError('Upsert type "merge-into" is not supported without metadata tables');
         }
         expression += `) ${mergeSourceAlias}`;
-        if (this.connection.driver.options.type === "mssql")
+        if (this.dataSource.driver.options.type === "mssql")
             expression += ` (${columns
                 .map((column) => this.escape(column.databaseName))
                 .join(", ")})`;
@@ -846,6 +971,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Creates list of values needs to be inserted in the VALUES expression.
+     * @param mergeSourceAlias
      */
     createMergeIntoInsertValuesExpression(mergeSourceAlias) {
         const columns = this.getInsertedColumns();
@@ -858,7 +984,7 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
                 }
                 if ((column.isGenerated &&
                     column.generationStrategy === "uuid" &&
-                    this.connection.driver.isUUIDGenerationSupported()) ||
+                    this.dataSource.driver.isUUIDGenerationSupported()) ||
                     (column.isGenerated && column.generationStrategy !== "uuid")) {
                     expression += `DEFAULT`;
                 }
@@ -883,8 +1009,9 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Create upsert search condition expression.
+     * @param mainTableOrAlias
      */
-    createUpsertConditionExpression() {
+    createUpsertConditionExpression(mainTableOrAlias) {
         if (!this.expressionMap.onUpdate.overwriteCondition)
             return "";
         const conditionsArray = [];
@@ -908,10 +1035,10 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
             }
             if (metadata.discriminatorColumn && metadata.parentEntityMetadata) {
                 const column = this.expressionMap.aliasNamePrefixingEnabled
-                    ? this.expressionMap.mainAlias.name +
+                    ? mainTableOrAlias +
                         "." +
-                        metadata.discriminatorColumn.databaseName
-                    : metadata.discriminatorColumn.databaseName;
+                        this.escape(metadata.discriminatorColumn.databaseName)
+                    : this.escape(metadata.discriminatorColumn.databaseName);
                 const condition = `${column} IN (:...discriminatorColumnValues)`;
                 conditionsArray.push(condition);
             }
@@ -945,21 +1072,21 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
         }*/
         if (!(typeof value === "function")) {
             // make sure our value is normalized by a driver
-            value = this.connection.driver.preparePersistentValue(value, column);
+            value = this.dataSource.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";
             // } else if (column.isNestedSetLeft) {
-            //     const tableName = this.connection.driver.escape(column.entityMetadata.tablePath);
-            //     const rightColumnName = this.connection.driver.escape(column.entityMetadata.nestedSetRightColumn!.databaseName);
+            //     const tableName = this.dataSource.driver.escape(column.entityMetadata.tablePath);
+            //     const rightColumnName = this.dataSource.driver.escape(column.entityMetadata.nestedSetRightColumn!.databaseName);
             //     const subQuery = `(SELECT c.max + 1 FROM (SELECT MAX(${rightColumnName}) as max from ${tableName}) c)`;
             //     expression += subQuery;
             //
             // } else if (column.isNestedSetRight) {
-            //     const tableName = this.connection.driver.escape(column.entityMetadata.tablePath);
-            //     const rightColumnName = this.connection.driver.escape(column.entityMetadata.nestedSetRightColumn!.databaseName);
+            //     const tableName = this.dataSource.driver.escape(column.entityMetadata.tablePath);
+            //     const rightColumnName = this.dataSource.driver.escape(column.entityMetadata.nestedSetRightColumn!.databaseName);
             //     const subQuery = `(SELECT c.max + 2 FROM (SELECT MAX(${rightColumnName}) as max from ${tableName}) c)`;
             //     expression += subQuery;
         }
@@ -975,9 +1102,9 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
         }
         else if (column.isGenerated &&
             column.generationStrategy === "uuid" &&
-            !this.connection.driver.isUUIDGenerationSupported() &&
+            !this.dataSource.driver.isUUIDGenerationSupported() &&
             value === undefined) {
-            value = (0, uuid_1.v4)();
+            value = RandomGenerator_1.RandomGenerator.uuidv4();
             expression += this.createParameter(value);
             if (!(valueSetIndex in this.expressionMap.locallyGenerated)) {
                 this.expressionMap.locallyGenerated[valueSetIndex] = {};
@@ -986,18 +1113,18 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
             // 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.dataSource.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.dataSource.driver) ||
+                this.dataSource.driver.options.type === "sap" ||
+                this.dataSource.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 +=
-                        this.connection.driver.normalizeDefault(column);
+                        this.dataSource.driver.normalizeDefault(column);
                 }
-                else if (this.connection.driver.options.type === "spanner" &&
+                else if (this.dataSource.driver.options.type === "spanner" &&
                     column.isGenerated &&
                     column.generationStrategy === "uuid") {
                     expression += "GENERATE_UUID()"; // Produces a random universally unique identifier (UUID) as a STRING value.
@@ -1011,8 +1138,8 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
             }
         }
         else if (value === null &&
-            (this.connection.driver.options.type === "spanner" ||
-                this.connection.driver.options.type === "oracle")) {
+            (this.dataSource.driver.options.type === "spanner" ||
+                this.dataSource.driver.options.type === "oracle")) {
             expression += "NULL";
             // support for SQL expressions in queries
         }
@@ -1021,16 +1148,16 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
             // just any other regular value
         }
         else {
-            if (this.connection.driver.options.type === "mssql")
-                value = this.connection.driver.parametrizeValue(column, value);
+            if (this.dataSource.driver.options.type === "mssql")
+                value = this.dataSource.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);
             const paramName = this.createParameter(value);
-            if ((DriverUtils_1.DriverUtils.isMySQLFamily(this.connection.driver) ||
-                this.connection.driver.options.type === "aurora-mysql") &&
-                this.connection.driver.spatialTypes.includes(column.type)) {
-                const useLegacy = this.connection.driver.options.legacySpatialSupport;
+            if ((DriverUtils_1.DriverUtils.isMySQLFamily(this.dataSource.driver) ||
+                this.dataSource.driver.options.type === "aurora-mysql") &&
+                this.dataSource.driver.spatialTypes.includes(column.type)) {
+                const useLegacy = this.dataSource.driver.options.legacySpatialSupport;
                 const geomFromText = useLegacy
                     ? "GeomFromText"
                     : "ST_GeomFromText";
@@ -1041,8 +1168,8 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
                     expression += `${geomFromText}(${paramName})`;
                 }
             }
-            else if (DriverUtils_1.DriverUtils.isPostgresFamily(this.connection.driver) &&
-                this.connection.driver.spatialTypes.includes(column.type)) {
+            else if (DriverUtils_1.DriverUtils.isPostgresFamily(this.dataSource.driver) &&
+                this.dataSource.driver.spatialTypes.includes(column.type)) {
                 if (column.srid != null) {
                     expression += `ST_SetSRID(ST_GeomFromGeoJSON(${paramName}), ${column.srid})::${column.type}`;
                 }
@@ -1050,8 +1177,8 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
                     expression += `ST_GeomFromGeoJSON(${paramName})::${column.type}`;
                 }
             }
-            else if (this.connection.driver.options.type === "mssql" &&
-                this.connection.driver.spatialTypes.includes(column.type)) {
+            else if (this.dataSource.driver.options.type === "mssql" &&
+                this.dataSource.driver.spatialTypes.includes(column.type)) {
                 expression +=
                     column.type +
                         "::STGeomFromText(" +
@@ -1060,6 +1187,9 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
                         (column.srid || "0") +
                         ")";
             }
+            else if (DriverUtils_1.DriverUtils.isSQLiteFamily(this.dataSource.driver)) {
+                expression = this.dataSource.driver.wrapWithJsonFunction(paramName, column, true);
+            }
             else {
                 expression += paramName;
             }
@@ -1068,5 +1198,4 @@ class InsertQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
 }
 exports.InsertQueryBuilder = InsertQueryBuilder;
-
-//# sourceMappingURL=InsertQueryBuilder.js.map
+//# sourceMappingURL=InsertQueryBuilder.js.map