typeorm 0.2.40 → 0.2.41-dev.b2c8168

package/driver/oracle/OracleQueryRunner.js

@@ -19,6 +19,7 @@ var OrmUtils_1 = require("../../util/OrmUtils");
 var TableCheck_1 = require("../../schema-builder/table/TableCheck");
 var error_1 = require("../../error");
 var QueryResult_1 = require("../../query-runner/QueryResult");
+var MetadataTableType_1 = require("../types/MetadataTableType");
 /**
  * Runs queries on a single oracle database connection.
  */
@@ -1822,7 +1823,7 @@ var OracleQueryRunner = /** @class */ (function (_super) {
                         viewNamesString = viewNames.map(function (name) { return "'" + name + "'"; }).join(", ");
                         query = "SELECT \"T\".* FROM " + this.escapePath(this.getTypeormMetadataTableName()) + " \"T\" " +
                             "INNER JOIN \"USER_OBJECTS\" \"O\" ON \"O\".\"OBJECT_NAME\" = \"T\".\"name\" AND \"O\".\"OBJECT_TYPE\" IN ( 'MATERIALIZED VIEW', 'VIEW' ) " +
-                            "WHERE \"T\".\"type\" IN ( 'MATERIALIZED_VIEW', 'VIEW' )";
+                            ("WHERE \"T\".\"type\" IN ( '" + MetadataTableType_1.MetadataTableType.MATERIALIZED_VIEW + "', '" + MetadataTableType_1.MetadataTableType.VIEW + "' )");
                         if (viewNamesString.length > 0)
                             query += " AND \"T\".\"name\" IN (" + viewNamesString + ")";
                         return [4 /*yield*/, this.query(query)];
@@ -1835,7 +1836,7 @@ var OracleQueryRunner = /** @class */ (function (_super) {
                                 view.schema = parsedName.schema || dbView["schema"] || currentSchema;
                                 view.name = parsedName.tableName;
                                 view.expression = dbView["value"];
-                                view.materialized = dbView["type"] === "MATERIALIZED_VIEW";
+                                view.materialized = dbView["type"] === MetadataTableType_1.MetadataTableType.MATERIALIZED_VIEW;
                                 return view;
                             })];
                 }
@@ -2128,13 +2129,8 @@ var OracleQueryRunner = /** @class */ (function (_super) {
     };
     OracleQueryRunner.prototype.insertViewDefinitionSql = function (view) {
         var expression = typeof view.expression === "string" ? view.expression.trim() : view.expression(this.connection).getQuery();
-        var type = view.materialized ? "MATERIALIZED_VIEW" : "VIEW";
-        var _a = (0, tslib_1.__read)(this.connection.createQueryBuilder()
-            .insert()
-            .into(this.getTypeormMetadataTableName())
-            .values({ type: type, name: view.name, value: expression })
-            .getQueryAndParameters(), 2), query = _a[0], parameters = _a[1];
-        return new Query_1.Query(query, parameters);
+        var type = view.materialized ? MetadataTableType_1.MetadataTableType.MATERIALIZED_VIEW : MetadataTableType_1.MetadataTableType.VIEW;
+        return this.insertTypeormMetadataSql({ type: type, name: view.name, value: expression });
     };
     /**
      * Builds drop view sql.
@@ -2147,14 +2143,8 @@ var OracleQueryRunner = /** @class */ (function (_super) {
      * Builds remove view sql.
      */
     OracleQueryRunner.prototype.deleteViewDefinitionSql = function (view) {
-        var qb = this.connection.createQueryBuilder();
-        var type = view.materialized ? "MATERIALIZED_VIEW" : "VIEW";
-        var _a = (0, tslib_1.__read)(qb.delete()
-            .from(this.getTypeormMetadataTableName())
-            .where(qb.escape("type") + " = :type", { type: type })
-            .andWhere(qb.escape("name") + " = :name", { name: view.name })
-            .getQueryAndParameters(), 2), query = _a[0], parameters = _a[1];
-        return new Query_1.Query(query, parameters);
+        var type = view.materialized ? MetadataTableType_1.MetadataTableType.MATERIALIZED_VIEW : MetadataTableType_1.MetadataTableType.VIEW;
+        return this.deleteTypeormMetadataSql({ type: type, name: view.name });
     };
     /**
      * Builds create index sql.