eclipse-rdf4jGH-2458 better fix

Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
HASMAC-AS · Aug 22, 2020 · 7995ba0 · 7995ba0
1 parent d2d5acf
commit 7995ba0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/AST/HasValueInPropertyShape.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/AST/HasValueInPropertyShape.java
@@ -98,6 +98,12 @@ public PlanNode getPlan(ConnectionsGroup connectionsGroup, boolean printPlans,
 			} else {
 
 				PlanNode addedTargets = nodeShape.getPlanAddedStatements(connectionsGroup, null);
+				PlanNode addedByPath = getPath().getPlanAddedStatements(connectionsGroup, null);
+				addedTargets = new UnionNode(new TrimTuple(addedByPath, 0, 1), addedTargets);
+				addedTargets = new Unique(addedTargets);
+
+				addedTargets = nodeShape.getTargetFilter(connectionsGroup, addedTargets);
+
 				if (overrideTargetNode != null) {
 					addedTargets = overrideTargetNode.getPlanNode();
 				}

diff --git a/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/AST/HasValuePropertyShape.java b/core/sail/shacl/src/main/java/org/eclipse/rdf4j/sail/shacl/AST/HasValuePropertyShape.java
@@ -104,6 +104,12 @@ public PlanNode getPlan(ConnectionsGroup connectionsGroup, boolean printPlans,
 			} else {
 
 				PlanNode addedTargets = nodeShape.getPlanAddedStatements(connectionsGroup, null);
+				PlanNode addedByPath = getPath().getPlanAddedStatements(connectionsGroup, null);
+				addedTargets = new UnionNode(new TrimTuple(addedByPath, 0, 1), addedTargets);
+				addedTargets = new Unique(addedTargets);
+
+				addedTargets = nodeShape.getTargetFilter(connectionsGroup, addedTargets);
+
 				if (overrideTargetNode != null) {
 					addedTargets = overrideTargetNode.getPlanNode();
 				}

diff --git a/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/AbstractShaclTest.java b/core/sail/shacl/src/test/java/org/eclipse/rdf4j/sail/shacl/AbstractShaclTest.java
@@ -69,7 +69,7 @@ abstract public class AbstractShaclTest {
 	// @formatter:off
 	// formatter doesn't understand that the trailing ) needs to be on a new line.
 	private static final List<String> testCasePaths = Stream.of(
-		/*"test-cases/and-or/datatypeNodeShape",
+		"test-cases/and-or/datatypeNodeShape",
 		"test-cases/class/allObjects",
 		"test-cases/class/allSubjects",
 		"test-cases/class/and",
@@ -180,7 +180,7 @@ abstract public class AbstractShaclTest {
 		"test-cases/hasValueIn/not",
 		"test-cases/hasValueIn/not2",
 		"test-cases/hasValueIn/targetNode",
-		"test-cases/hasValueIn/targetNode2",*/
+		"test-cases/hasValueIn/targetNode2",
 		"test-cases/hasValue/or",
 //		"test-cases/hasValue/targetShapeOr",
 //		"test-cases/hasValueIn/targetShapeOr",