npm - typeorm - Versions diffs - 0.2.41-dev.b2c8168 → 0.2.41-dev.c59ef29 - Mend

typeorm 0.2.41-dev.b2c8168 → 0.2.41-dev.c59ef29

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (53) hide show

package/driver/sap/SapQueryRunner.js CHANGED Viewed

@@ -2147,28 +2147,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 (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
-                                                    var columnConstraints, columnUniqueIndex, tableMetadata, hasIgnoredIndex, isConstraintComposite, tableColumn, length;
+                                                    var columnConstraints, columnUniqueIndices, tableMetadata, hasIgnoredIndex, isConstraintComposite, tableColumn, length;
                                                     var _this = this;
                                                     return (0, tslib_1.__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_1.TableColumn();
                                                         tableColumn.name = dbColumn["COLUMN_NAME"];
                                                         tableColumn.type = dbColumn["DATA_TYPE_NAME"].toLowerCase();
@@ -2197,7 +2198,7 @@ var SapQueryRunner = /** @class */ (function (_super) {
                                                             length = dbColumn["LENGTH"].toString();
                                                             tableColumn.length = !this.isDefaultColumnLength(table, tableColumn, length) ? length : "";
                                                         }
-                                                        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";