typeorm 0.3.6-dev.9d331b1 → 0.3.6

package/browser/query-builder/SelectQueryBuilder.js

@@ -1262,7 +1262,8 @@ export class SelectQueryBuilder extends QueryBuilder {
         }
         else if (DriverUtils.isMySQLFamily(this.connection.driver) ||
             this.connection.driver.options.type === "aurora-mysql" ||
-            this.connection.driver.options.type === "sap") {
+            this.connection.driver.options.type === "sap" ||
+            this.connection.driver.options.type === "spanner") {
             if (limit && offset)
                 return " LIMIT " + limit + " OFFSET " + offset;
             if (limit)
@@ -1400,6 +1401,13 @@ export class SelectQueryBuilder extends QueryBuilder {
                 else {
                     throw new LockNotSupportedOnGivenDriverError();
                 }
+            case "for_key_share":
+                if (driver.options.type === "postgres") {
+                    return " FOR KEY SHARE" + lockTablesClause;
+                }
+                else {
+                    throw new LockNotSupportedOnGivenDriverError();
+                }
             default:
                 return "";
         }
@@ -1546,6 +1554,17 @@ export class SelectQueryBuilder extends QueryBuilder {
             }
             return `COUNT(DISTINCT(CONCAT(${columnsExpression})))`;
         }
+        if (this.connection.driver.options.type === "spanner") {
+            // spanner also has gotta be different from everyone else.
+            // they do not support concatenation of different column types without casting them to string
+            if (primaryColumns.length === 1) {
+                return `COUNT(DISTINCT(${distinctAlias}.${this.escape(primaryColumns[0].databaseName)}))`;
+            }
+            const columnsExpression = primaryColumns
+                .map((primaryColumn) => `CAST(${distinctAlias}.${this.escape(primaryColumn.databaseName)} AS STRING)`)
+                .join(", '|;|', ");
+            return `COUNT(DISTINCT(CONCAT(${columnsExpression})))`;
+        }
         // If all else fails, fall back to a `COUNT` and `DISTINCT` across all the primary columns concatenated.
         // Per the SQL spec, this is the canonical string concatenation mechanism which is most
         // likely to work across servers implementing the SQL standard.
@@ -1717,7 +1736,8 @@ export class SelectQueryBuilder extends QueryBuilder {
                         "pessimistic_partial_write" ||
                     this.findOptions.lock.mode ===
                         "pessimistic_write_or_fail" ||
-                    this.findOptions.lock.mode === "for_no_key_update") {
+                    this.findOptions.lock.mode === "for_no_key_update" ||
+                    this.findOptions.lock.mode === "for_key_share") {
                     const tableNames = this.findOptions.lock.tables
                         ? this.findOptions.lock.tables.map((table) => {
                             const tableAlias = this.expressionMap.aliases.find((alias) => {
@@ -1770,7 +1790,8 @@ export class SelectQueryBuilder extends QueryBuilder {
             this.expressionMap.lockMode === "pessimistic_write" ||
             this.expressionMap.lockMode === "pessimistic_partial_write" ||
             this.expressionMap.lockMode === "pessimistic_write_or_fail" ||
-            this.expressionMap.lockMode === "for_no_key_update") &&
+            this.expressionMap.lockMode === "for_no_key_update" ||
+            this.expressionMap.lockMode === "for_key_share") &&
             !queryRunner.isTransactionActive)
             throw new PessimisticLockTransactionRequiredError();
         if (this.expressionMap.lockMode === "optimistic") {
@@ -1803,7 +1824,7 @@ export class SelectQueryBuilder extends QueryBuilder {
                     // make sure we aren't overriding user-defined order in inverse direction
                     orderBys[columnAlias] = "ASC";
                 const alias = DriverUtils.buildAlias(this.connection.driver, "ids_" + mainAliasName, primaryColumn.databaseName);
-                return `${distinctAlias}.${columnAlias} as "${alias}"`;
+                return `${distinctAlias}.${columnAlias} AS ${this.escape(alias)}`;
             });
             rawResults = await new SelectQueryBuilder(this.connection, queryRunner)
                 .select(`DISTINCT ${querySelects.join(", ")}`)