typeorm 0.2.41-dev.c895680 → 0.2.42-dev.1446e02

package/driver/aurora-data-api/AuroraDataApiQueryRunner.js

@@ -17,6 +17,7 @@ var TableUnique_1 = require("../../schema-builder/table/TableUnique");
 var BaseQueryRunner_1 = require("../../query-runner/BaseQueryRunner");
 var Broadcaster_1 = require("../../subscriber/Broadcaster");
 var error_1 = require("../../error");
+var MetadataTableType_1 = require("../types/MetadataTableType");
 /**
  * Runs queries on a single mysql database connection.
  */
@@ -1511,7 +1512,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                         table = _a;
                         index = indexOrName instanceof TableIndex_1.TableIndex ? indexOrName : table.indices.find(function (i) { return i.name === indexOrName; });
                         if (!index)
-                            throw new error_1.TypeORMError("Supplied index was not found in table " + table.name);
+                            throw new error_1.TypeORMError("Supplied index " + indexOrName + " was not found in table " + table.name);
                         up = this.dropIndexSql(table, index);
                         down = this.createIndexSql(table, index);
                         return [4 /*yield*/, this.executeQueries(up, down)];
@@ -1658,7 +1659,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                             return "(`t`.`schema` = '" + database + "' AND `t`.`name` = '" + name + "')";
                         }).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_1.MetadataTableType.VIEW + "' " + (viewsCondition ? "AND (" + viewsCondition + ")" : ""));
                         return [4 /*yield*/, this.query(query)];
                     case 3:
                         dbViews = _a.sent();
@@ -1770,23 +1771,23 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                                     table.columns = dbColumns
                                         .filter(function (dbColumn) { return dbColumn["TABLE_NAME"] === dbTable["TABLE_NAME"] && dbColumn["TABLE_SCHEMA"] === dbTable["TABLE_SCHEMA"]; })
                                         .map(function (dbColumn) {
-                                        var columnUniqueIndex = dbIndices.find(function (dbIndex) {
-                                            if (dbIndex["TABLE_NAME"] !== dbTable["TABLE_NAME"] || dbIndex["TABLE_SCHEMA"] !== dbTable["TABLE_SCHEMA"]) {
-                                                return false;
-                                            }
-                                            // Index is not for this column
-                                            if (dbIndex["COLUMN_NAME"] !== dbColumn["COLUMN_NAME"]) {
-                                                return false;
-                                            }
-                                            var nonUnique = parseInt(dbIndex["NON_UNIQUE"], 10);
-                                            return nonUnique === 0;
+                                        var columnUniqueIndices = dbIndices.filter(function (dbIndex) {
+                                            return dbIndex["TABLE_NAME"] === dbTable["TABLE_NAME"]
+                                                && dbIndex["TABLE_SCHEMA"] === dbTable["TABLE_SCHEMA"]
+                                                && dbIndex["COLUMN_NAME"] === dbColumn["COLUMN_NAME"]
+                                                && parseInt(dbIndex["NON_UNIQUE"], 10) === 0;
                                         });
                                         var tableMetadata = _this.connection.entityMetadatas.find(function (metadata) { return _this.getTablePath(table) === _this.getTablePath(metadata); });
-                                        var hasIgnoredIndex = columnUniqueIndex && tableMetadata && tableMetadata.indices
-                                            .some(function (index) { return index.name === columnUniqueIndex["INDEX_NAME"] && index.synchronize === false; });
-                                        var isConstraintComposite = columnUniqueIndex
-                                            ? !!dbIndices.find(function (dbIndex) { return dbIndex["INDEX_NAME"] === columnUniqueIndex["INDEX_NAME"] && dbIndex["COLUMN_NAME"] !== dbColumn["COLUMN_NAME"]; })
-                                            : false;
+                                        var hasIgnoredIndex = columnUniqueIndices.length > 0
+                                            && tableMetadata
+                                            && tableMetadata.indices.some(function (index) {
+                                                return columnUniqueIndices.some(function (uniqueIndex) {
+                                                    return index.name === uniqueIndex["INDEX_NAME"] && index.synchronize === false;
+                                                });
+                                            });
+                                        var isConstraintComposite = columnUniqueIndices.every(function (uniqueIndex) {
+                                            return dbIndices.some(function (dbIndex) { return dbIndex["INDEX_NAME"] === uniqueIndex["INDEX_NAME"] && dbIndex["COLUMN_NAME"] !== dbColumn["COLUMN_NAME"]; });
+                                        });
                                         var tableColumn = new TableColumn_1.TableColumn();
                                         tableColumn.name = dbColumn["COLUMN_NAME"];
                                         tableColumn.type = dbColumn["DATA_TYPE"].toLowerCase();
@@ -1808,7 +1809,7 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
                                             tableColumn.asExpression = dbColumn["GENERATION_EXPRESSION"];
                                             tableColumn.generatedType = dbColumn["EXTRA"].indexOf("VIRTUAL") !== -1 ? "VIRTUAL" : "STORED";
                                         }
-                                        tableColumn.isUnique = !!columnUniqueIndex && !hasIgnoredIndex && !isConstraintComposite;
+                                        tableColumn.isUnique = columnUniqueIndices.length > 0 && !hasIgnoredIndex && !isConstraintComposite;
                                         tableColumn.isNullable = dbColumn["IS_NULLABLE"] === "YES";
                                         tableColumn.isPrimary = dbPrimaryKeys.some(function (dbPrimaryKey) {
                                             return (dbPrimaryKey["TABLE_NAME"] === dbColumn["TABLE_NAME"] &&
@@ -1989,19 +1990,19 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
     };
     AuroraDataApiQueryRunner.prototype.insertViewDefinitionSql = function (view) {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var currentDatabase, expression, _a, query, parameters;
-            return (0, tslib_1.__generator)(this, function (_b) {
-                switch (_b.label) {
+            var currentDatabase, expression;
+            return (0, tslib_1.__generator)(this, function (_a) {
+                switch (_a.label) {
                     case 0: return [4 /*yield*/, this.getCurrentDatabase()];
                     case 1:
-                        currentDatabase = _b.sent();
+                        currentDatabase = _a.sent();
                         expression = typeof view.expression === "string" ? view.expression.trim() : view.expression(this.connection).getQuery();
-                        _a = (0, tslib_1.__read)(this.connection.createQueryBuilder()
-                            .insert()
-                            .into(this.getTypeormMetadataTableName())
-                            .values({ type: "VIEW", schema: currentDatabase, name: view.name, value: expression })
-                            .getQueryAndParameters(), 2), query = _a[0], parameters = _a[1];
-                        return [2 /*return*/, new Query_1.Query(query, parameters)];
+                        return [2 /*return*/, this.insertTypeormMetadataSql({
+                                type: MetadataTableType_1.MetadataTableType.VIEW,
+                                schema: currentDatabase,
+                                name: view.name,
+                                value: expression
+                            })];
                 }
             });
         });
@@ -2017,21 +2018,14 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
      */
     AuroraDataApiQueryRunner.prototype.deleteViewDefinitionSql = function (viewOrPath) {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var currentDatabase, viewName, qb, _a, query, parameters;
-            return (0, tslib_1.__generator)(this, function (_b) {
-                switch (_b.label) {
+            var currentDatabase, viewName;
+            return (0, tslib_1.__generator)(this, function (_a) {
+                switch (_a.label) {
                     case 0: return [4 /*yield*/, this.getCurrentDatabase()];
                     case 1:
-                        currentDatabase = _b.sent();
+                        currentDatabase = _a.sent();
                         viewName = viewOrPath instanceof View_1.View ? viewOrPath.name : viewOrPath;
-                        qb = this.connection.createQueryBuilder();
-                        _a = (0, tslib_1.__read)(qb.delete()
-                            .from(this.getTypeormMetadataTableName())
-                            .where(qb.escape("type") + " = 'VIEW'")
-                            .andWhere(qb.escape("schema") + " = :schema", { schema: currentDatabase })
-                            .andWhere(qb.escape("name") + " = :name", { name: viewName })
-                            .getQueryAndParameters(), 2), query = _a[0], parameters = _a[1];
-                        return [2 /*return*/, new Query_1.Query(query, parameters)];
+                        return [2 /*return*/, this.deleteTypeormMetadataSql({ type: MetadataTableType_1.MetadataTableType.VIEW, schema: currentDatabase, name: viewName })];
                 }
             });
         });