typeorm 0.2.40-dev.e80f97d → 0.2.41-dev.2d0abe7

package/browser/driver/cockroachdb/CockroachQueryRunner.js

@@ -17,6 +17,7 @@ import { OrmUtils } from "../../util/OrmUtils";
 import { TableCheck } from "../../schema-builder/table/TableCheck";
 import { TableExclusion } from "../../schema-builder/table/TableExclusion";
 import { TypeORMError } from "../../error";
+import { MetadataTableType } from "../types/MetadataTableType";
 /**
  * Runs queries on a single postgres database connection.
  */
@@ -2111,7 +2112,7 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
                             return "(\"t\".\"schema\" = '" + (schema || currentSchema) + "' AND \"t\".\"name\" = '" + tableName + "')";
                         }).join(" OR ");
                         query = "SELECT \"t\".*, \"v\".\"check_option\" FROM " + this.escapePath(this.getTypeormMetadataTableName()) + " \"t\" " +
-                            ("INNER JOIN \"information_schema\".\"views\" \"v\" ON \"v\".\"table_schema\" = \"t\".\"schema\" AND \"v\".\"table_name\" = \"t\".\"name\" WHERE \"t\".\"type\" = 'VIEW' " + (viewsCondition ? "AND (" + viewsCondition + ")" : ""));
+                            ("INNER JOIN \"information_schema\".\"views\" \"v\" ON \"v\".\"table_schema\" = \"t\".\"schema\" AND \"v\".\"table_name\" = \"t\".\"name\" WHERE \"t\".\"type\" = '" + MetadataTableType.VIEW + "' " + (viewsCondition ? "AND (" + viewsCondition + ")" : ""));
                         return [4 /*yield*/, this.query(query)];
                     case 4:
                         dbViews = _a.sent();
@@ -2254,7 +2255,7 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
                                             return [4 /*yield*/, Promise.all(dbColumns
                                                     .filter(function (dbColumn) { return dbColumn["table_name"] === dbTable["table_name"] && dbColumn["table_schema"] === dbTable["table_schema"]; })
                                                     .map(function (dbColumn) { return __awaiter(_this, void 0, void 0, function () {
-                                                    var columnConstraints, tableColumn, type, length_1, uniqueConstraint, isConstraintComposite;
+                                                    var columnConstraints, tableColumn, type, length_1, uniqueConstraints, isConstraintComposite;
                                                     return __generator(this, function (_a) {
                                                         columnConstraints = dbConstraints.filter(function (dbConstraint) {
                                                             return (dbConstraint["table_name"] === dbColumn["table_name"] &&
@@ -2296,13 +2297,13 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
                                                         }
                                                         tableColumn.isNullable = dbColumn["is_nullable"] === "YES";
                                                         tableColumn.isPrimary = !!columnConstraints.find(function (constraint) { return constraint["constraint_type"] === "PRIMARY"; });
-                                                        uniqueConstraint = columnConstraints.find(function (constraint) { return constraint["constraint_type"] === "UNIQUE"; });
-                                                        isConstraintComposite = uniqueConstraint
-                                                            ? !!dbConstraints.find(function (dbConstraint) { return dbConstraint["constraint_type"] === "UNIQUE"
+                                                        uniqueConstraints = columnConstraints.filter(function (constraint) { return constraint["constraint_type"] === "UNIQUE"; });
+                                                        isConstraintComposite = uniqueConstraints.every(function (uniqueConstraint) {
+                                                            return dbConstraints.some(function (dbConstraint) { return dbConstraint["constraint_type"] === "UNIQUE"
                                                                 && dbConstraint["constraint_name"] === uniqueConstraint["constraint_name"]
-                                                                && dbConstraint["column_name"] !== dbColumn["column_name"]; })
-                                                            : false;
-                                                        tableColumn.isUnique = !!uniqueConstraint && !isConstraintComposite;
+                                                                && dbConstraint["column_name"] !== dbColumn["column_name"]; });
+                                                        });
+                                                        tableColumn.isUnique = uniqueConstraints.length > 0 && !isConstraintComposite;
                                                         if (dbColumn["column_default"] !== null && dbColumn["column_default"] !== undefined) {
                                                             if (dbColumn["column_default"] === "unique_rowid()") {
                                                                 tableColumn.isGenerated = true;
@@ -2492,23 +2493,23 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
     };
     CockroachQueryRunner.prototype.insertViewDefinitionSql = function (view) {
         return __awaiter(this, void 0, void 0, function () {
-            var currentSchema, _a, schema, name, expression, _b, query, parameters;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var currentSchema, _a, schema, name, expression;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0: return [4 /*yield*/, this.getCurrentSchema()];
                     case 1:
-                        currentSchema = _c.sent();
+                        currentSchema = _b.sent();
                         _a = this.driver.parseTableName(view), schema = _a.schema, name = _a.tableName;
                         if (!schema) {
                             schema = currentSchema;
                         }
                         expression = typeof view.expression === "string" ? view.expression.trim() : view.expression(this.connection).getQuery();
-                        _b = __read(this.connection.createQueryBuilder()
-                            .insert()
-                            .into(this.getTypeormMetadataTableName())
-                            .values({ type: "VIEW", schema: schema, name: name, value: expression })
-                            .getQueryAndParameters(), 2), query = _b[0], parameters = _b[1];
-                        return [2 /*return*/, new Query(query, parameters)];
+                        return [2 /*return*/, this.insertTypeormMetadataSql({
+                                type: MetadataTableType.VIEW,
+                                schema: schema,
+                                name: name,
+                                value: expression
+                            })];
                 }
             });
         });
@@ -2524,24 +2525,17 @@ var CockroachQueryRunner = /** @class */ (function (_super) {
      */
     CockroachQueryRunner.prototype.deleteViewDefinitionSql = function (viewOrPath) {
         return __awaiter(this, void 0, void 0, function () {
-            var currentSchema, _a, schema, name, qb, _b, query, parameters;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var currentSchema, _a, schema, name;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0: return [4 /*yield*/, this.getCurrentSchema()];
                     case 1:
-                        currentSchema = _c.sent();
+                        currentSchema = _b.sent();
                         _a = this.driver.parseTableName(viewOrPath), schema = _a.schema, name = _a.tableName;
                         if (!schema) {
                             schema = currentSchema;
                         }
-                        qb = this.connection.createQueryBuilder();
-                        _b = __read(qb.delete()
-                            .from(this.getTypeormMetadataTableName())
-                            .where(qb.escape("type") + " = 'VIEW'")
-                            .andWhere(qb.escape("schema") + " = :schema", { schema: schema })
-                            .andWhere(qb.escape("name") + " = :name", { name: name })
-                            .getQueryAndParameters(), 2), query = _b[0], parameters = _b[1];
-                        return [2 /*return*/, new Query(query, parameters)];
+                        return [2 /*return*/, this.deleteTypeormMetadataSql({ type: MetadataTableType.VIEW, schema: schema, name: name })];
                 }
             });
         });