typeorm 0.2.41-dev.98d5f39 → 0.2.41-dev.b2c8168

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

@@ -14,6 +14,7 @@ import { TableUnique } from "../../schema-builder/table/TableUnique";
 import { BaseQueryRunner } from "../../query-runner/BaseQueryRunner";
 import { Broadcaster } from "../../subscriber/Broadcaster";
 import { TypeORMError } from "../../error";
+import { MetadataTableType } from "../types/MetadataTableType";
 /**
  * Runs queries on a single mysql database connection.
  */
@@ -1655,7 +1656,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.VIEW + "' " + (viewsCondition ? "AND (" + viewsCondition + ")" : ""));
                         return [4 /*yield*/, this.query(query)];
                     case 3:
                         dbViews = _a.sent();
@@ -1986,19 +1987,19 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
     };
     AuroraDataApiQueryRunner.prototype.insertViewDefinitionSql = function (view) {
         return __awaiter(this, void 0, void 0, function () {
-            var currentDatabase, expression, _a, query, parameters;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var currentDatabase, expression;
+            return __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 = __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(query, parameters)];
+                        return [2 /*return*/, this.insertTypeormMetadataSql({
+                                type: MetadataTableType.VIEW,
+                                schema: currentDatabase,
+                                name: view.name,
+                                value: expression
+                            })];
                 }
             });
         });
@@ -2014,21 +2015,14 @@ var AuroraDataApiQueryRunner = /** @class */ (function (_super) {
      */
     AuroraDataApiQueryRunner.prototype.deleteViewDefinitionSql = function (viewOrPath) {
         return __awaiter(this, void 0, void 0, function () {
-            var currentDatabase, viewName, qb, _a, query, parameters;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var currentDatabase, viewName;
+            return __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 ? viewOrPath.name : viewOrPath;
-                        qb = this.connection.createQueryBuilder();
-                        _a = __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(query, parameters)];
+                        return [2 /*return*/, this.deleteTypeormMetadataSql({ type: MetadataTableType.VIEW, schema: currentDatabase, name: viewName })];
                 }
             });
         });