typeorm 1.0.0-beta.1 → 1.0.0-beta.2

package/browser/query-builder/SelectQueryBuilder.js

@@ -83,12 +83,16 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     /**
      * Creates SELECT query and selects given data.
      * Replaces all previous selections if they exist.
+     *
      * @param selection
      * @param selectionAliasName
      */
     select(selection, selectionAliasName) {
         this.expressionMap.queryType = "select";
         if (Array.isArray(selection)) {
+            for (const s of selection) {
+                this.assertNoSemicolon(s, "select");
+            }
             this.expressionMap.selects = selection.map((selection) => ({
                 selection: selection,
             }));
@@ -102,6 +106,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
             });
         }
         else if (selection) {
+            this.assertNoSemicolon(selection, "select");
             this.expressionMap.selects = [
                 { selection: selection, aliasName: selectionAliasName },
             ];
@@ -110,6 +115,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Adds new selection to the SELECT query.
+     *
      * @param selection
      * @param selectionAliasName
      */
@@ -117,6 +123,9 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
         if (!selection)
             return this;
         if (Array.isArray(selection)) {
+            for (const s of selection) {
+                this.assertNoSemicolon(s, "addSelect");
+            }
             this.expressionMap.selects = this.expressionMap.selects.concat(selection.map((selection) => ({ selection: selection })));
         }
         else if (typeof selection === "function") {
@@ -128,6 +137,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
             });
         }
         else if (selection) {
+            this.assertNoSemicolon(selection, "addSelect");
             this.expressionMap.selects.push({
                 selection: selection,
                 aliasName: selectionAliasName,
@@ -137,6 +147,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Set max execution time.
+     *
      * @param milliseconds
      */
     maxExecutionTime(milliseconds) {
@@ -145,6 +156,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Sets whether the selection is DISTINCT.
+     *
      * @param distinct
      */
     distinct(distinct = true) {
@@ -153,6 +165,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Sets the distinct on clause for Postgres.
+     *
      * @param distinctOn
      */
     distinctOn(distinctOn) {
@@ -167,6 +180,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * Specifies FROM which entity's table select/update/delete will be executed.
      * Also sets a main string alias of the selection data.
      * Removes all previously set from-s.
+     *
      * @param entityTarget
      * @param aliasName
      */
@@ -178,6 +192,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     /**
      * Specifies FROM which entity's table select/update/delete will be executed.
      * Also sets a main string alias of the selection data.
+     *
      * @param entityTarget
      * @param aliasName
      */
@@ -191,6 +206,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * INNER JOINs (without selection).
      * You also need to specify an alias of the joined data.
      * Optionally, you can add condition and parameters used in condition.
+     *
      * @param entityOrProperty
      * @param alias
      * @param condition
@@ -204,6 +220,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * LEFT JOINs (without selection).
      * You also need to specify an alias of the joined data.
      * Optionally, you can add condition and parameters used in condition.
+     *
      * @param entityOrProperty
      * @param alias
      * @param condition
@@ -217,6 +234,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * INNER JOINs and adds all selection properties to SELECT.
      * You also need to specify an alias of the joined data.
      * Optionally, you can add condition and parameters used in condition.
+     *
      * @param entityOrProperty
      * @param alias
      * @param condition
@@ -231,6 +249,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * LEFT JOINs and adds all selection properties to SELECT.
      * You also need to specify an alias of the joined data.
      * Optionally, you can add condition and parameters used in condition.
+     *
      * @param entityOrProperty
      * @param alias
      * @param condition
@@ -247,6 +266,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * It will assume that there are multiple rows of selecting data, and mapped result will be an array.
      * You also need to specify an alias of the joined data.
      * Optionally, you can add condition and parameters used in condition.
+     *
      * @param mapToProperty
      * @param entityOrProperty
      * @param alias
@@ -264,6 +284,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * It will assume that there is a single row of selecting data, and mapped result will be a single selected value.
      * You also need to specify an alias of the joined data.
      * Optionally, you can add condition and parameters used in condition.
+     *
      * @param mapToProperty
      * @param entityOrProperty
      * @param alias
@@ -282,6 +303,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * It will assume that there are multiple rows of selecting data, and mapped result will be an array.
      * You also need to specify an alias of the joined data.
      * Optionally, you can add condition and parameters used in condition.
+     *
      * @param mapToProperty
      * @param entityOrProperty
      * @param alias
@@ -299,6 +321,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * It will assume that there is a single row of selecting data, and mapped result will be a single selected value.
      * You also need to specify an alias of the joined data.
      * Optionally, you can add condition and parameters used in condition.
+     *
      * @param mapToProperty
      * @param entityOrProperty
      * @param alias
@@ -314,6 +337,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     /**
      * LEFT JOINs relation id and maps it into some entity's property.
      * Optionally, you can add condition and parameters used in condition.
+     *
      * @param mapToProperty
      * @param relationName
      * @param aliasNameOrOptions
@@ -343,6 +367,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * Loads all relation ids for all relations of the selected entity.
      * All relation ids will be mapped to relation property themself.
      * If array of strings is given then loads only relation ids of the given properties.
+     *
      * @param options
      * @param options.relations
      * @param options.disableMixedMap
@@ -350,9 +375,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     loadAllRelationIds(options) {
         // todo: add skip relations
         this.expressionMap.mainAlias.metadata.relations.forEach((relation) => {
-            if (options !== undefined &&
-                options.relations !== undefined &&
-                options.relations.indexOf(relation.propertyPath) === -1)
+            if (options?.relations?.indexOf(relation.propertyPath) === -1)
                 return;
             this.loadRelationIdAndMap(this.expressionMap.mainAlias.name +
                 "." +
@@ -367,6 +390,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * If you had previously WHERE expression defined,
      * calling this function will override previously set WHERE conditions.
      * Additionally you can add parameters used in where expression.
+     *
      * @param where
      * @param parameters
      */
@@ -385,6 +409,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     /**
      * Adds new AND WHERE condition in the query builder.
      * Additionally you can add parameters used in where expression.
+     *
      * @param where
      * @param parameters
      */
@@ -400,6 +425,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     /**
      * Adds new OR WHERE condition in the query builder.
      * Additionally you can add parameters used in where expression.
+     *
      * @param where
      * @param parameters
      */
@@ -414,6 +440,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Sets a new where EXISTS clause
+     *
      * @param subQuery
      */
     whereExists(subQuery) {
@@ -421,6 +448,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Adds a new AND where EXISTS clause
+     *
      * @param subQuery
      */
     andWhereExists(subQuery) {
@@ -428,6 +456,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Adds a new OR where EXISTS clause
+     *
      * @param subQuery
      */
     orWhereExists(subQuery) {
@@ -440,6 +469,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * It means if you have single primary key you can pass a simple id values, for example [1, 2, 3].
      * If you have multiple primary keys you need to pass object with property names and values specified,
      * for example [{ firstId: 1, secondId: 2 }, { firstId: 2, secondId: 3 }, ...]
+     *
      * @param ids
      */
     whereInIds(ids) {
@@ -452,6 +482,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * It means if you have single primary key you can pass a simple id values, for example [1, 2, 3].
      * If you have multiple primary keys you need to pass object with property names and values specified,
      * for example [{ firstId: 1, secondId: 2 }, { firstId: 2, secondId: 3 }, ...]
+     *
      * @param ids
      */
     andWhereInIds(ids) {
@@ -464,6 +495,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * It means if you have single primary key you can pass a simple id values, for example [1, 2, 3].
      * If you have multiple primary keys you need to pass object with property names and values specified,
      * for example [{ firstId: 1, secondId: 2 }, { firstId: 2, secondId: 3 }, ...]
+     *
      * @param ids
      */
     orWhereInIds(ids) {
@@ -474,6 +506,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * If you had previously HAVING expression defined,
      * calling this function will override previously set HAVING conditions.
      * Additionally you can add parameters used in where expression.
+     *
      * @param having
      * @param parameters
      */
@@ -486,6 +519,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     /**
      * Adds new AND HAVING condition in the query builder.
      * Additionally you can add parameters used in where expression.
+     *
      * @param having
      * @param parameters
      */
@@ -498,6 +532,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     /**
      * Adds new OR HAVING condition in the query builder.
      * Additionally you can add parameters used in where expression.
+     *
      * @param having
      * @param parameters
      */
@@ -511,10 +546,12 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * Sets GROUP BY condition in the query builder.
      * If you had previously GROUP BY expression defined,
      * calling this function will override previously set GROUP BY conditions.
+     *
      * @param groupBy
      */
     groupBy(groupBy) {
         if (groupBy) {
+            this.assertNoSemicolon(groupBy, "groupBy");
             this.expressionMap.groupBys = [groupBy];
         }
         else {
@@ -524,14 +561,17 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Adds GROUP BY condition in the query builder.
+     *
      * @param groupBy
      */
     addGroupBy(groupBy) {
+        this.assertNoSemicolon(groupBy, "addGroupBy");
         this.expressionMap.groupBys.push(groupBy);
         return this;
     }
     /**
      * Enables time travelling for the current query (only supported by cockroach currently)
+     *
      * @param timeTravelFn
      */
     timeTravelQuery(timeTravelFn) {
@@ -549,6 +589,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * Sets ORDER BY condition in the query builder.
      * If you had previously ORDER BY expression defined,
      * calling this function will override previously set ORDER BY conditions.
+     *
      * @param sort
      * @param order
      * @param nulls
@@ -560,28 +601,24 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
             nulls !== "NULLS FIRST" &&
             nulls !== "NULLS LAST")
             throw new error_1.TypeORMError(`SelectQueryBuilder.addOrderBy "nulls" can accept only "NULLS FIRST" and "NULLS LAST" values.`);
-        if (sort) {
-            if (typeof sort === "object") {
-                this.expressionMap.orderBys = sort;
-            }
-            else {
-                if (nulls) {
-                    this.expressionMap.orderBys = {
-                        [sort]: { order, nulls },
-                    };
-                }
-                else {
-                    this.expressionMap.orderBys = { [sort]: order };
-                }
-            }
-        }
-        else {
+        if (!sort) {
             this.expressionMap.orderBys = {};
+            return this;
         }
+        if (typeof sort === "object") {
+            this.validateOrderByCondition(sort);
+            this.expressionMap.orderBys = sort;
+            return this;
+        }
+        this.assertNoSemicolon(sort, "orderBy sort key");
+        this.expressionMap.orderBys = nulls
+            ? { [sort]: { order, nulls } }
+            : { [sort]: order };
         return this;
     }
     /**
      * Adds ORDER BY condition in the query builder.
+     *
      * @param sort
      * @param order
      * @param nulls
@@ -593,6 +630,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
             nulls !== "NULLS FIRST" &&
             nulls !== "NULLS LAST")
             throw new error_1.TypeORMError(`SelectQueryBuilder.addOrderBy "nulls" can accept only "NULLS FIRST" and "NULLS LAST" values.`);
+        this.assertNoSemicolon(sort, "orderBy sort key");
         if (nulls) {
             this.expressionMap.orderBys[sort] = { order, nulls };
         }
@@ -605,6 +643,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * Sets LIMIT - maximum number of rows to be selected.
      * When joins are present, a two-query distinct-id strategy is used
      * so that LIMIT applies to root entities rather than raw joined rows.
+     *
      * @param limit
      */
     limit(limit) {
@@ -618,6 +657,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * Sets OFFSET - selection offset.
      * When joins are present, a two-query distinct-id strategy is used
      * so that OFFSET applies to root entities rather than raw joined rows.
+     *
      * @param offset
      */
     offset(offset) {
@@ -629,6 +669,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Sets maximal number of entities to take.
+     *
      * @param take
      */
     take(take) {
@@ -640,6 +681,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Sets number of entities to skip.
+     *
      * @param skip
      */
     skip(skip) {
@@ -651,6 +693,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Set certain index to be used by the query.
+     *
      * @param index Name of index to be used.
      */
     useIndex(index) {
@@ -659,6 +702,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Sets locking mode.
+     *
      * @param lockMode
      * @param lockVersion
      * @param lockTables
@@ -671,6 +715,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Sets lock handling by adding NO WAIT or SKIP LOCKED.
+     *
      * @param onLocked
      */
     setOnLocked(onLocked) {
@@ -1024,6 +1069,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Enables or disables query result caching.
+     *
      * @param enabledOrMillisecondsOrId
      * @param maybeMilliseconds
      */
@@ -1047,6 +1093,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Sets extra options that can be used to configure how query builder works.
+     *
      * @param option
      */
     setOption(option) {
@@ -1101,8 +1148,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
                 metadata: joinAttributeMetadata,
                 subQuery: isSubQuery ? subQuery : undefined,
             });
-            if (joinAttribute.relation &&
-                joinAttribute.relation.junctionEntityMetadata) {
+            if (joinAttribute.relation?.junctionEntityMetadata) {
                 this.expressionMap.createAlias({
                     type: "join",
                     name: joinAttribute.junctionAlias,
@@ -1172,7 +1218,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
         // create a selection query
         const froms = this.expressionMap.aliases
             .filter((alias) => alias.type === "from" &&
-            (alias.tablePath || alias.subQuery))
+            (alias.tablePath ?? alias.subQuery))
             .map((alias) => {
             if (alias.subQuery)
                 return alias.subQuery + " " + this.escape(alias.name);
@@ -1238,9 +1284,8 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
             // if join was build without relation (e.g. without "post.category") then it means that we have direct
             // table to join, without junction table involved. This means we simply join direct table.
             if (!parentAlias || !relation) {
-                const destinationJoin = joinAttr.alias.subQuery
-                    ? joinAttr.alias.subQuery
-                    : this.getTableName(destinationTableName);
+                const destinationJoin = joinAttr.alias.subQuery ??
+                    this.getTableName(destinationTableName);
                 return (" " +
                     joinAttr.direction +
                     " JOIN " +
@@ -1403,7 +1448,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * Creates "GROUP BY" part of SQL query.
      */
     createGroupByExpression() {
-        if (!this.expressionMap.groupBys || !this.expressionMap.groupBys.length)
+        if (!this.expressionMap.groupBys?.length)
             return "";
         return " GROUP BY " + this.expressionMap.groupBys.join(", ");
     }
@@ -1422,6 +1467,8 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
                     : orderBys[columnName].order +
                         " " +
                         orderBys[columnName].nulls;
+                if (/[;'"\\]/.test(orderValue))
+                    throw new error_1.TypeORMError(`Unsafe order-by value "${orderValue}" for "${columnName}".`);
                 const selectionByAlias = this.expressionMap.selects.find((s) => s.aliasName === columnName);
                 if (selectionByAlias) {
                     return this.escape(columnName) + " " + orderValue;
@@ -1643,7 +1690,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * Creates "HAVING" part of SQL query.
      */
     createHavingExpression() {
-        if (!this.expressionMap.havings || !this.expressionMap.havings.length)
+        if (!this.expressionMap.havings?.length)
             return "";
         const conditions = this.expressionMap.havings
             .map((having, index) => {
@@ -1717,9 +1764,8 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
                 selections.forEach((selection) => {
                     finalSelects.push({
                         selection: selectionPath,
-                        aliasName: selection.aliasName
-                            ? selection.aliasName
-                            : DriverUtils_1.DriverUtils.buildAlias(this.dataSource.driver, undefined, aliasName, column.databaseName),
+                        aliasName: selection.aliasName ??
+                            DriverUtils_1.DriverUtils.buildAlias(this.dataSource.driver, undefined, aliasName, column.databaseName),
                         // todo: need to keep in mind that custom selection.aliasName breaks hydrator. fix it later!
                         virtual: selection.virtual,
                     });
@@ -1779,7 +1825,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
             // However, If it's exactly 1 column we can omit the `CONCAT` for better performance.
             const columnsExpression = primaryColumns
                 .map((primaryColumn) => `${distinctAlias}.${this.escape(primaryColumn.databaseName)}`)
-                .join(", '|;|', ");
+                .join(", '|:|', ");
             if (primaryColumns.length === 1) {
                 return `COUNT(DISTINCT(${columnsExpression}))`;
             }
@@ -1793,7 +1839,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
             }
             const columnsExpression = primaryColumns
                 .map((primaryColumn) => `CAST(${distinctAlias}.${this.escape(primaryColumn.databaseName)} AS STRING)`)
-                .join(", '|;|', ");
+                .join(", '|:|', ");
             return `COUNT(DISTINCT(CONCAT(${columnsExpression})))`;
         }
         // If all else fails, fall back to a `COUNT` and `DISTINCT` across all the primary columns concatenated.
@@ -1804,7 +1850,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
         return (`COUNT(DISTINCT(` +
             primaryColumns
                 .map((c) => `${distinctAlias}.${this.escape(c.databaseName)}`)
-                .join(" || '|;|' || ") +
+                .join(" || '|:|' || ") +
             "))");
     }
     async executeCountQuery(queryRunner) {
@@ -1819,7 +1865,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
             .select(countSql, "cnt")
             .setOption("disable-global-order")
             .loadRawResults(queryRunner);
-        if (!results || !results[0] || !results[0]["cnt"])
+        if (!results?.[0]?.["cnt"])
             return 0;
         return parseInt(results[0]["cnt"]);
     }
@@ -1982,25 +2028,13 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
             if (this.findOptions.transaction === true) {
                 this.expressionMap.useTransaction = true;
             }
-            // if (this.orderBys.length) {
-            //     this.orderBys.forEach(orderBy => {
-            //         this.addOrderBy(orderBy.alias, orderBy.direction, orderBy.nulls);
-            //     });
-            // }
-            // todo
-            // if (this.options.options && this.options.options.eagerRelations) {
-            //     this.queryBuilder
-            // }
-            // todo
-            // if (this.findOptions.options && this.findOptions.listeners === false) {
-            //     this.callListeners(false);
-            // }
         }
     }
     /**
      * Registers relation metadata for loading via separate queries when using
      * the "query" relation load strategy. Duplicates (by propertyPath) are
      * silently skipped.
+     *
      * @param relationMetadata - one or more relation metadata entries to register
      */
     concatRelationMetadata(...relationMetadata) {
@@ -2009,6 +2043,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Executes sql generated by query builder and returns object with raw results and entities created from them.
+     *
      * @param queryRunner
      */
     async executeEntitiesAndRawResults(queryRunner) {
@@ -2025,7 +2060,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
             if (!metadata.versionColumn && !metadata.updateDateColumn)
                 throw new NoVersionOrUpdateDateColumnError_1.NoVersionOrUpdateDateColumnError(metadata.name);
         }
-        const relationIdLoader = new RelationIdLoader_1.RelationIdLoader(this.dataSource, queryRunner, this.expressionMap.relationIdAttributes);
+        const relationIdLoader = new RelationIdLoader_1.RelationIdLoader(this.dataSource, queryRunner, this.expressionMap.relationIdAttributes, this.expressionMap.withDeleted);
         const relationIdMetadataTransformer = new RelationIdMetadataToAttributeTransformer_1.RelationIdMetadataToAttributeTransformer(this.expressionMap);
         relationIdMetadataTransformer.transform();
         let rawResults, entities = [];
@@ -2140,7 +2175,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
                 // chains (e.g. A→B→C→A). Each branch maintains its
                 // own visited set so parallel branches don't interfere.
                 if (relation.isEager) {
-                    const targetEntity = relation.inverseEntityMetadata.name;
+                    const targetEntity = relation.inverseEntityMetadata.tablePath;
                     if (this.eagerLoadChain.has(targetEntity))
                         return;
                 }
@@ -2153,7 +2188,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
                 // added, so the child detects cycles in its branch
                 if (relation.isEager) {
                     queryBuilder.eagerLoadChain = new Set(this.eagerLoadChain);
-                    queryBuilder.eagerLoadChain.add(relation.entityMetadata.name);
+                    queryBuilder.eagerLoadChain.add(relation.entityMetadata.tablePath);
                 }
                 queryBuilder.setFindOptions({
                     select: this.findOptions.select
@@ -2247,6 +2282,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Loads raw results from the database.
+     *
      * @param queryRunner
      */
     async loadRawResults(queryRunner) {
@@ -2258,12 +2294,9 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
             ? this.dataSource.options.cache
             : {};
         let savedQueryResultCacheOptions = undefined;
-        const isCachingEnabled = 
-        // Caching is enabled globally and isn't disabled locally.
-        (cacheOptions.alwaysEnabled &&
-            this.expressionMap.cache !== false) ||
-            // ...or it's enabled locally explicitly.
-            this.expressionMap.cache === true;
+        const isCachingEnabled = cacheOptions.alwaysEnabled
+            ? this.expressionMap.cache !== false
+            : this.expressionMap.cache === true;
         let cacheError = false;
         if (this.dataSource.queryResultCache && isCachingEnabled) {
             try {
@@ -2272,8 +2305,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
                         identifier: this.expressionMap.cacheId,
                         query: queryId,
                         duration: this.expressionMap.cacheDuration ||
-                            cacheOptions.duration ||
-                            1000,
+                            (cacheOptions.duration ?? 1000),
                     }, queryRunner);
                 if (savedQueryResultCacheOptions &&
                     !this.dataSource.queryResultCache.isExpired(savedQueryResultCacheOptions)) {
@@ -2297,8 +2329,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
                     query: queryId,
                     time: Date.now(),
                     duration: this.expressionMap.cacheDuration ||
-                        cacheOptions.duration ||
-                        1000,
+                        (cacheOptions.duration ?? 1000),
                     result: JSON.stringify(results.records),
                 }, savedQueryResultCacheOptions, queryRunner);
             }
@@ -2312,6 +2343,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Merges into expression map given expression map properties.
+     *
      * @param expressionMap
      */
     mergeExpressionMap(expressionMap) {
@@ -2320,6 +2352,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     }
     /**
      * Normalizes a give number - converts to int if possible.
+     *
      * @param num
      */
     normalizeNumber(num) {
@@ -2331,7 +2364,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * Creates a query builder used to execute sql queries inside this query builder.
      */
     obtainQueryRunner() {
-        return (this.queryRunner ||
+        return (this.queryRunner ??
             this.dataSource.createQueryRunner(this.dataSource.defaultReplicationModeForReads()));
     }
     buildSelect(select, metadata, alias, embedPrefix) {
@@ -2537,9 +2570,6 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
             else if (relation) {
                 let joinAlias = alias + "_" + propertyPath.replace(".", "_");
                 joinAlias = DriverUtils_1.DriverUtils.buildAlias(this.dataSource.driver, { joiner: "__" }, alias, joinAlias);
-                // console.log("joinAlias", joinAlias, joinAlias.length, this.dataSource.driver.maxAliasLength)
-                // todo: use expressionMap.joinAttributes, and create a new one using
-                //  const joinAttribute = new JoinAttribute(this.dataSource, this.expressionMap);
                 const existJoin = this.joins.find((join) => join.alias === joinAlias);
                 if (!existJoin) {
                     const parentJoin = this.joins.find((j) => j.alias === alias);
@@ -2582,7 +2612,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
                 }
                 if (parameterValue === undefined) {
                     const undefinedBehavior = this.dataSource.options.invalidWhereValuesBehavior
-                        ?.undefined || "throw";
+                        ?.undefined ?? "throw";
                     if (undefinedBehavior === "throw") {
                         throw new error_1.TypeORMError(`Undefined value encountered in property '${alias}.${key}' of a where condition. ` +
                             `Set 'invalidWhereValuesBehavior.undefined' to 'ignore' in connection options to skip properties with undefined values.`);
@@ -2591,7 +2621,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
                 }
                 if (parameterValue === null) {
                     const nullBehavior = this.dataSource.options.invalidWhereValuesBehavior
-                        ?.null || "throw";
+                        ?.null ?? "throw";
                     if (nullBehavior === "ignore") {
                         continue;
                     }
@@ -2624,8 +2654,6 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
                         parameterValue = this.dataSource.driver.parametrizeValues(column, parameterValue);
                     }
                     andConditions.push(this.createWhereConditionExpression(this.getWherePredicateCondition(aliasPath, parameterValue)));
-                    // this.conditions.push(`${alias}.${propertyPath} = :${paramName}`);
-                    // this.expressionMap.parameters[paramName] = where[key]; // todo: handle functions and other edge cases
                 }
                 else if (embed) {
                     const condition = this.buildWhere(where[key], metadata, alias, propertyPath);
@@ -2635,7 +2663,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
                 else if (relation) {
                     if (where[key] === null) {
                         const nullBehavior = this.dataSource.options.invalidWhereValuesBehavior
-                            ?.null || "throw";
+                            ?.null ?? "throw";
                         if (nullBehavior === "sql-null") {
                             andConditions.push(`${alias}.${propertyPath} IS NULL`);
                         }
@@ -2657,7 +2685,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
                         const allUndefined = whereKeys.every((k) => where[key][k] === undefined);
                         if (allUndefined) {
                             const undefinedBehavior = this.dataSource.options
-                                .invalidWhereValuesBehavior?.undefined ||
+                                .invalidWhereValuesBehavior?.undefined ??
                                 "throw";
                             if (undefinedBehavior === "throw") {
                                 throw new error_1.TypeORMError(`Undefined value encountered in nested relation '${alias}.${key}' of a where condition. ` +