typeorm 0.2.41-dev.c895680 → 0.2.42-dev.1cfd7b9

package/browser/driver/sap/SapQueryRunner.js

@@ -16,6 +16,7 @@ import { Query } from "../Query";
 import { QueryFailedError, TypeORMError } from "../../error";
 import { QueryResult } from "../../query-runner/QueryResult";
 import { QueryLock } from "../../query-runner/QueryLock";
+import { MetadataTableType } from "../types/MetadataTableType";
 /**
  * Runs queries on a single SQL Server database connection.
  */
@@ -1889,7 +1890,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
                         table = _a;
                         index = indexOrName instanceof TableIndex ? indexOrName : table.indices.find(function (i) { return i.name === indexOrName; });
                         if (!index)
-                            throw new TypeORMError("Supplied index was not found in table " + table.name);
+                            throw new 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)];
@@ -2024,7 +2025,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
                             }
                             return "(\"t\".\"schema\" = '" + schema + "' AND \"t\".\"name\" = '" + name + "')";
                         }).join(" OR ");
-                        query = "SELECT \"t\".* FROM " + this.escapePath(this.getTypeormMetadataTableName()) + " \"t\" WHERE \"t\".\"type\" = 'VIEW' " + (viewsCondition ? "AND (" + viewsCondition + ")" : "");
+                        query = "SELECT \"t\".* FROM " + this.escapePath(this.getTypeormMetadataTableName()) + " \"t\" WHERE \"t\".\"type\" = '" + MetadataTableType.VIEW + "' " + (viewsCondition ? "AND (" + viewsCondition + ")" : "");
                         return [4 /*yield*/, this.query(query)];
                     case 4:
                         dbViews = _a.sent();
@@ -2143,28 +2144,29 @@ var SapQueryRunner = /** @class */ (function (_super) {
                                             return [4 /*yield*/, Promise.all(dbColumns
                                                     .filter(function (dbColumn) { return dbColumn["TABLE_NAME"] === dbTable["TABLE_NAME"] && dbColumn["SCHEMA_NAME"] === dbTable["SCHEMA_NAME"]; })
                                                     .map(function (dbColumn) { return __awaiter(_this, void 0, void 0, function () {
-                                                    var columnConstraints, columnUniqueIndex, tableMetadata, hasIgnoredIndex, isConstraintComposite, tableColumn, length_1;
+                                                    var columnConstraints, columnUniqueIndices, tableMetadata, hasIgnoredIndex, isConstraintComposite, tableColumn, length_1;
                                                     var _this = this;
                                                     return __generator(this, function (_a) {
                                                         columnConstraints = dbConstraints.filter(function (dbConstraint) { return (dbConstraint["TABLE_NAME"] === dbColumn["TABLE_NAME"] &&
                                                             dbConstraint["SCHEMA_NAME"] === dbColumn["SCHEMA_NAME"] &&
                                                             dbConstraint["COLUMN_NAME"] === dbColumn["COLUMN_NAME"]); });
-                                                        columnUniqueIndex = dbIndices.find(function (dbIndex) {
-                                                            if (dbIndex["TABLE_NAME"] !== dbTable["TABLE_NAME"] || dbIndex["SCHEMA_NAME"] !== dbTable["SCHEMA_NAME"]) {
-                                                                return false;
-                                                            }
-                                                            // Index is not for this column
-                                                            if (dbIndex["COLUMN_NAME"] !== dbColumn["COLUMN_NAME"]) {
-                                                                return false;
-                                                            }
-                                                            return dbIndex["CONSTRAINT"] && dbIndex["CONSTRAINT"].indexOf("UNIQUE") !== -1;
+                                                        columnUniqueIndices = dbIndices.filter(function (dbIndex) {
+                                                            return dbIndex["TABLE_NAME"] === dbTable["TABLE_NAME"]
+                                                                && dbIndex["SCHEMA_NAME"] === dbTable["SCHEMA_NAME"]
+                                                                && dbIndex["COLUMN_NAME"] === dbColumn["COLUMN_NAME"]
+                                                                && dbIndex["CONSTRAINT"] && dbIndex["CONSTRAINT"].indexOf("UNIQUE") !== -1;
                                                         });
                                                         tableMetadata = this.connection.entityMetadatas.find(function (metadata) { return _this.getTablePath(table) === _this.getTablePath(metadata); });
-                                                        hasIgnoredIndex = columnUniqueIndex && tableMetadata && tableMetadata.indices
-                                                            .some(function (index) { return index.name === columnUniqueIndex["INDEX_NAME"] && index.synchronize === false; });
-                                                        isConstraintComposite = columnUniqueIndex
-                                                            ? !!dbIndices.find(function (dbIndex) { return dbIndex["INDEX_NAME"] === columnUniqueIndex["INDEX_NAME"] && dbIndex["COLUMN_NAME"] !== dbColumn["COLUMN_NAME"]; })
-                                                            : false;
+                                                        hasIgnoredIndex = columnUniqueIndices.length > 0
+                                                            && tableMetadata
+                                                            && tableMetadata.indices.some(function (index) {
+                                                                return columnUniqueIndices.some(function (uniqueIndex) {
+                                                                    return index.name === uniqueIndex["INDEX_NAME"] && index.synchronize === false;
+                                                                });
+                                                            });
+                                                        isConstraintComposite = columnUniqueIndices.every(function (uniqueIndex) {
+                                                            return dbIndices.some(function (dbIndex) { return dbIndex["INDEX_NAME"] === uniqueIndex["INDEX_NAME"] && dbIndex["COLUMN_NAME"] !== dbColumn["COLUMN_NAME"]; });
+                                                        });
                                                         tableColumn = new TableColumn();
                                                         tableColumn.name = dbColumn["COLUMN_NAME"];
                                                         tableColumn.type = dbColumn["DATA_TYPE_NAME"].toLowerCase();
@@ -2193,7 +2195,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
                                                             length_1 = dbColumn["LENGTH"].toString();
                                                             tableColumn.length = !this.isDefaultColumnLength(table, tableColumn, length_1) ? length_1 : "";
                                                         }
-                                                        tableColumn.isUnique = !!columnUniqueIndex && !hasIgnoredIndex && !isConstraintComposite;
+                                                        tableColumn.isUnique = columnUniqueIndices.length > 0 && !hasIgnoredIndex && !isConstraintComposite;
                                                         tableColumn.isNullable = dbColumn["IS_NULLABLE"] === "TRUE";
                                                         tableColumn.isPrimary = !!columnConstraints.find(function (constraint) { return constraint["IS_PRIMARY_KEY"] === "TRUE"; });
                                                         tableColumn.isGenerated = dbColumn["GENERATION_TYPE"] === "ALWAYS AS IDENTITY";
@@ -2371,24 +2373,24 @@ var SapQueryRunner = /** @class */ (function (_super) {
     };
     SapQueryRunner.prototype.insertViewDefinitionSql = function (view) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, schema, name, expression, _b, query, parameters;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var _a, schema, name, expression;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         _a = this.driver.parseTableName(view), schema = _a.schema, name = _a.tableName;
                         if (!!schema) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.getCurrentSchema()];
                     case 1:
-                        schema = _c.sent();
-                        _c.label = 2;
+                        schema = _b.sent();
+                        _b.label = 2;
                     case 2:
                         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
+                            })];
                 }
             });
         });
@@ -2404,25 +2406,17 @@ var SapQueryRunner = /** @class */ (function (_super) {
      */
     SapQueryRunner.prototype.deleteViewDefinitionSql = function (viewOrPath) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, schema, name, qb, _b, query, parameters;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var _a, schema, name;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         _a = this.driver.parseTableName(viewOrPath), schema = _a.schema, name = _a.tableName;
                         if (!!schema) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.getCurrentSchema()];
                     case 1:
-                        schema = _c.sent();
-                        _c.label = 2;
-                    case 2:
-                        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)];
+                        schema = _b.sent();
+                        _b.label = 2;
+                    case 2: return [2 /*return*/, this.deleteTypeormMetadataSql({ type: MetadataTableType.VIEW, schema: schema, name: name })];
                 }
             });
         });