support rr:joinCondition #31

zazuko · Dec 13, 2023 · 23dce48 · 23dce48
1 parent bbd733d
commit 23dce48
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 0 deletions.
diff --git a/...pping.dsl.parent/com.zazuko.rdfmapping.dsl/src/com/zazuko/rdfmapping/dsl/RdfMapping.xtext b/...pping.dsl.parent/com.zazuko.rdfmapping.dsl/src/com/zazuko/rdfmapping/dsl/RdfMapping.xtext
@@ -200,6 +200,11 @@ TemplateValuedTerm:
 
 ParentTriplesMapTerm:
 	'parent-map' mapping=[Mapping]
+	(joinConditions+=ParentTriplesMapJoinCondition)*
+;
+
+ParentTriplesMapJoinCondition:
+    'join' child=[Referenceable] 'with' parent=[Referenceable]
 ;
 
 QualifiedName:

diff --git a/...zuko.rdfmapping.dsl/src/com/zazuko/rdfmapping/dsl/generator/rml/RmlDialectGenerator.xtend b/...zuko.rdfmapping.dsl/src/com/zazuko/rdfmapping/dsl/generator/rml/RmlDialectGenerator.xtend
@@ -156,6 +156,12 @@ class RmlDialectGenerator {
 
 	def dispatch objectTermMap(ParentTriplesMapTerm it, IJoinContext jc) '''
 		rr:parentTriplesMap  <«mapping.localId»>«jc.acquireMarker»
+		«FOR join : joinConditions»
+			rr:joinCondition [
+				rr:child "«join.child.valueResolved»"«jc.acquireMarker»
+				rr:parent "«join.parent.valueResolved»"«jc.acquireMarker»
+			]«jc.acquireMarker»
+		«ENDFOR»
 	'''
 
 	def termMapAnnex(ReferenceValuedTerm it, IJoinContext jc) {

diff --git a/....zazuko.rdfmapping.dsl/src/com/zazuko/rdfmapping/dsl/scoping/RdfMappingScopeProvider.java b/....zazuko.rdfmapping.dsl/src/com/zazuko/rdfmapping/dsl/scoping/RdfMappingScopeProvider.java
@@ -9,6 +9,8 @@
 
 import com.zazuko.rdfmapping.dsl.rdfMapping.Mapping;
 import com.zazuko.rdfmapping.dsl.rdfMapping.MultiReferenceValuedTerm;
+import com.zazuko.rdfmapping.dsl.rdfMapping.ParentTriplesMapJoinCondition;
+import com.zazuko.rdfmapping.dsl.rdfMapping.ParentTriplesMapTerm;
 import com.zazuko.rdfmapping.dsl.rdfMapping.RdfMappingPackage;
 import com.zazuko.rdfmapping.dsl.rdfMapping.ReferenceValuedTerm;
 import com.zazuko.rdfmapping.dsl.rdfMapping.TemplateValuedTerm;
@@ -40,6 +42,16 @@ public IScope getScope(EObject context, EReference reference) {
 				&& reference == RdfMappingPackage.Literals.TEMPLATE_VALUED_TERM__REFERENCES) {
 			return scopeForReferenceables(this.rootFinder.findRoot(context, Mapping.class));
 
+		} else if (context instanceof ParentTriplesMapJoinCondition
+				&& reference == RdfMappingPackage.Literals.PARENT_TRIPLES_MAP_JOIN_CONDITION__CHILD) {
+			return scopeForReferenceables(this.rootFinder.findRoot(context, Mapping.class));
+
+		} else if (context instanceof ParentTriplesMapJoinCondition
+				&& reference == RdfMappingPackage.Literals.PARENT_TRIPLES_MAP_JOIN_CONDITION__PARENT) {
+			final ParentTriplesMapTerm term = this.rootFinder.findRoot(context, ParentTriplesMapTerm.class);
+			if (term !=null && term.getMapping() != null && term.getMapping().getSource() != null) {
+				return scopeForReferenceables(term.getMapping());				
+			}
 		}
 		return super.getScope(context, reference);
 	}

diff --git a/runtime-EclipseXtext/editor-test/editortest.xrm b/runtime-EclipseXtext/editor-test/editortest.xrm
@@ -32,6 +32,7 @@ map EmployeeMapping from EMPLOYEE {
 		// TODO uncomment next line (error is fine), code completion at end of line offers keywords
 		// thing.size 
 		thing.color parent-map EmployeeMapping2; // ok for rml, r2rml
+		thing.color parent-map FooMapping join id with id join EMPNO with ^map;   // ok for rml, r2rml. multiple joinConditions supported
 		// TODO 'as' must be offered by code completion (this is r2rml)
 		keyword.^map template "{0}" with EMPNO as Literal; // ok for rml, r2rml 
 		// TODO uncomment next line --> error

diff --git a/runtime-EclipseXtext/editor-test/src-gen/editortest.rml.ttl b/runtime-EclipseXtext/editor-test/src-gen/editortest.rml.ttl
@@ -33,6 +33,21 @@ PREFIX thing: <http://foobar.com/things/thing/>
 		]
 	];
 
+	rr:predicateObjectMap [
+		rr:predicate thing:color;
+		rr:objectMap [
+			rr:parentTriplesMap  <#FooMapping>;
+			rr:joinCondition [
+				rr:child "id";
+				rr:parent "id";
+			];
+			rr:joinCondition [
+				rr:child "EMPNO";
+				rr:parent "map";
+			]
+		]
+	];
+
 	rr:predicateObjectMap [
 		rr:predicate employee:map;
 		rr:objectMap [