You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/03/10 07:27:24 UTC
[3/3] cayenne git commit: Revert fix for
https://issues.apache.org/jira/browse/CAY-2146
Revert fix for https://issues.apache.org/jira/browse/CAY-2146
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/cf9d83b4
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/cf9d83b4
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/cf9d83b4
Branch: refs/heads/master
Commit: cf9d83b4a3b5bda505f0021c971af6d1b8c6f4af
Parents: c90bc93
Author: Nikita Timofeev <st...@gmail.com>
Authored: Fri Mar 10 10:26:29 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Fri Mar 10 10:26:29 2017 +0300
----------------------------------------------------------------------
.../java/org/apache/cayenne/CayenneDataObject.java | 6 +-----
.../cayenne/testdo/inheritance_vertical/IvSub3.java | 8 ++++++++
.../testdo/inheritance_vertical/auto/_IvSub3.java | 2 ++
.../src/test/resources/inheritance-vertical.map.xml | 14 ++++----------
4 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cf9d83b4/cayenne-server/src/main/java/org/apache/cayenne/CayenneDataObject.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/CayenneDataObject.java b/cayenne-server/src/main/java/org/apache/cayenne/CayenneDataObject.java
index 5e929f3..0aca689 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/CayenneDataObject.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/CayenneDataObject.java
@@ -663,11 +663,7 @@ public class CayenneDataObject extends PersistentObject implements DataObject, V
// skip db relationships that we can't validate or that can't be invalid here
// can't handle paths longer than two db relationships
// see ObjRelationship.recalculateReadOnlyValue() for more info
- if (dbRels.size() == 1 && relationship.isSourceIndependentFromTargetChange()) {
- continue;
- }
-
- if (dbRels.size() > 1 && (!relationship.isToDependentEntity() || relationship.isReadOnly())) {
+ if (relationship.isSourceIndependentFromTargetChange()) {
continue;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cf9d83b4/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/IvSub3.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/IvSub3.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/IvSub3.java
index 8e3fb72..a801476 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/IvSub3.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/IvSub3.java
@@ -20,6 +20,7 @@
package org.apache.cayenne.testdo.inheritance_vertical;
import org.apache.cayenne.testdo.inheritance_vertical.auto._IvSub3;
+import org.apache.cayenne.validation.ValidationException;
public class IvSub3 extends _IvSub3 {
@@ -28,4 +29,11 @@ public class IvSub3 extends _IvSub3 {
public void setIvRoot(IvRoot ivRoot) {
setToOneTarget("ivRoot", ivRoot, true);
}
+
+ @Override
+ protected void onPrePersist() {
+ if(getIvRoot() == null) {
+ throw new ValidationException("ivRoot is null");
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cf9d83b4/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvSub3.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvSub3.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvSub3.java
index 0bab942..9c90d5e 100644
--- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvSub3.java
+++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance_vertical/auto/_IvSub3.java
@@ -23,4 +23,6 @@ public abstract class _IvSub3 extends IvRoot {
}
+ protected abstract void onPrePersist();
+
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/cf9d83b4/cayenne-server/src/test/resources/inheritance-vertical.map.xml
----------------------------------------------------------------------
diff --git a/cayenne-server/src/test/resources/inheritance-vertical.map.xml b/cayenne-server/src/test/resources/inheritance-vertical.map.xml
index 694dc11..89e41ac 100644
--- a/cayenne-server/src/test/resources/inheritance-vertical.map.xml
+++ b/cayenne-server/src/test/resources/inheritance-vertical.map.xml
@@ -43,7 +43,7 @@
<db-attribute name="ATTR2" type="VARCHAR" isMandatory="true" length="100"/>
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
<db-attribute name="OTHER1_ID" type="INTEGER" isMandatory="true"/>
- <db-attribute name="OTHER2_ID" type="INTEGER" isMandatory="true"/>
+ <db-attribute name="OTHER2_ID" type="INTEGER" isMandatory="true"/>
</db-entity>
<db-entity name="IV_OTHER">
<db-attribute name="ID" type="INTEGER" isPrimaryKey="true" isMandatory="true"/>
@@ -69,7 +69,6 @@
</db-entity>
<db-entity name="IV_SUB3">
<db-attribute name="ID" type="BIGINT" isPrimaryKey="true" isMandatory="true"/>
- <!--db-attribute name="SUB3_ATTR" type="INTEGER"/-->
<db-attribute name="IV_ROOT_ID" type="INTEGER" isMandatory="true"/>
</db-entity>
<obj-entity name="Iv1Root" className="org.apache.cayenne.testdo.inheritance_vertical.Iv1Root" dbEntityName="IV1_ROOT">
@@ -131,8 +130,7 @@
</obj-entity>
<obj-entity name="IvSub3" superEntityName="IvRoot" className="org.apache.cayenne.testdo.inheritance_vertical.IvSub3">
<qualifier><![CDATA[discriminator = "IvSub3"]]></qualifier>
- <!--obj-attribute name="sub3Attr" type="int" db-attribute-path="sub3.SUB3_ATTR"/-->
- <!--pre-persist method-name="onPrePersist"/-->
+ <pre-persist method-name="onPrePersist"/>
</obj-entity>
<db-relationship name="sub1" source="IV1_ROOT" target="IV1_SUB1" toDependentPK="true" toMany="false">
<db-attribute-pair source="ID" target="ID"/>
@@ -173,8 +171,8 @@
<db-relationship name="other1" source="IV_IMPL" target="IV_OTHER" toMany="false">
<db-attribute-pair source="OTHER1_ID" target="ID"/>
</db-relationship>
- <db-relationship name="other2" source="IV_IMPL" target="IV_OTHER" toMany="false">
- <db-attribute-pair source="OTHER2_ID" target="ID"/>
+ <db-relationship name="other2" source="IV_IMPL" target="IV_OTHER" toMany="false">
+ <db-attribute-pair source="OTHER2_ID" target="ID"/>
</db-relationship>
<db-relationship name="impls" source="IV_OTHER" target="IV_IMPL" toMany="true">
<db-attribute-pair source="ID" target="OTHER_ID"/>
@@ -200,9 +198,6 @@
<db-relationship name="master" source="IV_SUB1_SUB1" target="IV_SUB1" toMany="false">
<db-attribute-pair source="ID" target="ID"/>
</db-relationship>
- <!--db-relationship name="ivSub3s1" source="IV_SUB2" target="IV_SUB3" toMany="true">
- <db-attribute-pair source="ID" target="IV_ROOT_ID"/>
- </db-relationship-->
<db-relationship name="master" source="IV_SUB2" target="IV_ROOT" toMany="false">
<db-attribute-pair source="ID" target="ID"/>
</db-relationship>
@@ -216,5 +211,4 @@
<obj-relationship name="other2" source="IvImpl" target="IvOther" deleteRule="Nullify" db-relationship-path="impl.other2"/>
<obj-relationship name="impls" source="IvOther" target="IvImpl" deleteRule="Deny" db-relationship-path="impls.base"/>
<obj-relationship name="ivRoot" source="IvSub3" target="IvRoot" deleteRule="Nullify" db-relationship-path="sub3.ivRoot1"/>
- <!--obj-relationship name="ivSub3ToRoot" source="IvSub3" target="IvRoot" deleteRule="Nullify" db-relationship-path="sub3"/-->
</data-map>