typeorm 1.0.0-beta.2 → 1.0.0-beta.3

package/query-builder/SelectQueryBuilder.js

@@ -90,9 +90,6 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
     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,
             }));
@@ -106,7 +103,6 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
             });
         }
         else if (selection) {
-            this.assertNoSemicolon(selection, "select");
             this.expressionMap.selects = [
                 { selection: selection, aliasName: selectionAliasName },
             ];
@@ -123,9 +119,6 @@ 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") {
@@ -137,7 +130,6 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
             });
         }
         else if (selection) {
-            this.assertNoSemicolon(selection, "addSelect");
             this.expressionMap.selects.push({
                 selection: selection,
                 aliasName: selectionAliasName,
@@ -551,7 +543,6 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      */
     groupBy(groupBy) {
         if (groupBy) {
-            this.assertNoSemicolon(groupBy, "groupBy");
             this.expressionMap.groupBys = [groupBy];
         }
         else {
@@ -565,7 +556,6 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
      * @param groupBy
      */
     addGroupBy(groupBy) {
-        this.assertNoSemicolon(groupBy, "addGroupBy");
         this.expressionMap.groupBys.push(groupBy);
         return this;
     }
@@ -601,19 +591,25 @@ 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) {
-            this.expressionMap.orderBys = {};
-            return this;
+        if (sort) {
+            if (typeof sort === "object") {
+                this.validateOrderByCondition(sort);
+                this.expressionMap.orderBys = sort;
+            }
+            else {
+                if (nulls) {
+                    this.expressionMap.orderBys = {
+                        [sort]: { order, nulls },
+                    };
+                }
+                else {
+                    this.expressionMap.orderBys = { [sort]: order };
+                }
+            }
         }
-        if (typeof sort === "object") {
-            this.validateOrderByCondition(sort);
-            this.expressionMap.orderBys = sort;
-            return this;
+        else {
+            this.expressionMap.orderBys = {};
         }
-        this.assertNoSemicolon(sort, "orderBy sort key");
-        this.expressionMap.orderBys = nulls
-            ? { [sort]: { order, nulls } }
-            : { [sort]: order };
         return this;
     }
     /**
@@ -630,7 +626,6 @@ 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 };
         }
@@ -1825,7 +1820,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}))`;
             }
@@ -1839,7 +1834,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.
@@ -1850,7 +1845,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
         return (`COUNT(DISTINCT(` +
             primaryColumns
                 .map((c) => `${distinctAlias}.${this.escape(c.databaseName)}`)
-                .join(" || '|:|' || ") +
+                .join(" || '|;|' || ") +
             "))");
     }
     async executeCountQuery(queryRunner) {
@@ -2170,7 +2165,7 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
         }
         if (this.expressionMap.relationLoadStrategy === "query") {
             const queryStrategyRelationIdLoader = new RelationIdLoader_2.RelationIdLoader(this.dataSource, queryRunner, this.findOptions.loadEagerRelations);
-            await Promise.all(this.relationMetadatas.map(async (relation) => {
+            const loadRelation = async (relation) => {
                 // Prevent infinite recursion from circular eager
                 // chains (e.g. A→B→C→A). Each branch maintains its
                 // own visited set so parallel branches don't interfere.
@@ -2216,7 +2211,18 @@ class SelectQueryBuilder extends QueryBuilder_1.QueryBuilder {
                         }
                     });
                 }
-            }));
+            };
+            // Avoid concurrent queries on the same pg client; see #12238.
+            // CockroachDB uses the pg package over a single connection too.
+            const driverType = this.dataSource.options.type;
+            if (driverType === "postgres" || driverType === "cockroachdb") {
+                for (const relation of this.relationMetadatas) {
+                    await loadRelation(relation);
+                }
+            }
+            else {
+                await Promise.all(this.relationMetadatas.map(loadRelation));
+            }
         }
         return {
             raw: rawResults,