Merge pull request #401 from vyarmolovich/#400

#400 Fixed. Used objRelationship.getReverseDbRelationshipPath(). Rena…
agrestio · Mar 4, 2019 · 3b80ee2 · 3b80ee2
2 parents 67eca99 + 864c600
commit 3b80ee2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/agrest/src/main/java/io/agrest/meta/cayenne/CayenneAgRelationship.java b/agrest/src/main/java/io/agrest/meta/cayenne/CayenneAgRelationship.java
@@ -104,8 +104,8 @@ public Map<String, Object> extractId(JsonNode id) {
         }
     }
 
-    public String getReverseDbName() {
-        return getDbRelationship().getReverseRelationship().getName();
+    public String getReverseDbPath() {
+        return objRelationship.getReverseDbRelationshipPath();
     }
 
     public Expression translateExpressionToSource(Expression expression) {

diff --git a/...t/src/main/java/io/agrest/runtime/cayenne/processor/select/CayenneAssembleQueryStage.java b/...t/src/main/java/io/agrest/runtime/cayenne/processor/select/CayenneAssembleQueryStage.java
@@ -101,7 +101,7 @@ private void buildChildrenQuery(SelectContext context, ResourceEntity<?> entity,
             if (relationship instanceof CayenneAgRelationship) {
                 CayenneAgRelationship rel = (CayenneAgRelationship) relationship;
                 for (AgAttribute attribute : entity.getAgEntity().getIds()) {
-                    properties.add(Property.create(ExpressionFactory.dbPathExp(rel.getReverseDbName() + "." + attribute.getName()), (Class) attribute.getType()));
+                    properties.add(Property.create(ExpressionFactory.dbPathExp(rel.getReverseDbPath() + "." + attribute.getName()), (Class) attribute.getType()));
                 }
                 // transfer expression from parent
                 if (entity.getSelect().getQualifier() != null) {

diff --git a/.../main/java/io/agrest/runtime/cayenne/processor/update/CayenneIdempotentFullSyncStage.java b/.../main/java/io/agrest/runtime/cayenne/processor/update/CayenneIdempotentFullSyncStage.java
@@ -124,7 +124,7 @@ private void buildChildrenQuery(UpdateContext context, ResourceEntity<?> entity,
                 if (relationship != null && relationship instanceof CayenneAgRelationship) {
                     CayenneAgRelationship rel = (CayenneAgRelationship)relationship;
                     for (AgAttribute attribute : (Collection<AgAttribute>) entity.getAgEntity().getIds()) {
-                        properties.add(Property.create(ExpressionFactory.dbPathExp(rel.getReverseDbName() + "." + attribute.getName()), (Class) attribute.getType()));
+                        properties.add(Property.create(ExpressionFactory.dbPathExp(rel.getReverseDbPath() + "." + attribute.getName()), (Class) attribute.getType()));
                     }
                     // transfer expression from parent
                     if (entity.getSelect().getQualifier() != null) {