This is an automated email from the ASF dual-hosted git repository. ntimofeev pushed a commit to branch STABLE-4.1 in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 066ac8316b9632e08cd2d39714c7d40b5a1c3f12 Author: Nikita Timofeev <[email protected]> AuthorDate: Mon Oct 7 14:26:46 2019 +0300 CAY-2627 Modeler: ObjRelationship creation dialog ignores delete rule (cherry picked from commit d8680a4d7ee5d09f7cbcabba5e3a9cd0f90d6d09) --- RELEASE-NOTES.txt | 1 + .../apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index a713411..dc73327 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -43,6 +43,7 @@ CAY-2616 Modeler: Wrong handling of path with spaces CAY-2618 Unstable property ordering in generated classes CAY-2619 "to-dep PK" related dbimport delta confuses the Modeler CAY-2624 SelectQuery "having" qualifier is not considered when calculating cache key +CAY-2627 Modeler: ObjRelationship creation dialog ignores delete rule ---------------------------------- Release: 4.1.B2 diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java index d381f82..d1c33d0 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/objentity/ObjRelationshipInfo.java @@ -517,6 +517,7 @@ public class ObjRelationshipInfo extends CayenneController implements TreeSelect boolean hasChanges = false; boolean oldToMany = relationship.isToMany(); + boolean oldPathNotEmpty = !relationship.getDbRelationships().isEmpty(); String relationshipName = getRelationshipName(); if (!Util.nullSafeEquals(relationship.getName(), relationshipName)) { @@ -583,7 +584,7 @@ public class ObjRelationshipInfo extends CayenneController implements TreeSelect * As of CAY-436 here we check if to-many property has changed during * the editing, and if so, delete rule must be reset to default value */ - if (hasChanges && relationship.isToMany() != oldToMany) { + if (oldPathNotEmpty && hasChanges && relationship.isToMany() != oldToMany) { DeleteRuleUpdater.updateObjRelationship(relationship); }
