diff --git a/test-cases/RMLTC0000-CSV/mapping.ttl b/test-cases/RMLTC0000-CSV/mapping.ttl
index e9bfaa36..f8b542f6 100644
--- a/test-cases/RMLTC0000-CSV/mapping.ttl
+++ b/test-cases/RMLTC0000-CSV/mapping.ttl
@@ -1,14 +1,19 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:referenceFormulation rml:CSV ;
- rml:source _:b277322 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "http://example.com/{Name}" ] .
-
-_:b277322 a rml:RelativePathSource ;
- rml:path "student.csv" .
-
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:referenceFormulation rml:CSV;
+ rml:source [ a rml:RelativePathSource;
+ rml:path "student.csv"
+ ]
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{Name}"
+ ] .
diff --git a/test-cases/RMLTC0000-JSON/mapping.ttl b/test-cases/RMLTC0000-JSON/mapping.ttl
index 057ffd86..7bad7906 100644
--- a/test-cases/RMLTC0000-JSON/mapping.ttl
+++ b/test-cases/RMLTC0000-JSON/mapping.ttl
@@ -1,15 +1,20 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:iterator "$.students[*]" ;
- rml:referenceFormulation rml:JSONPath ;
- rml:source _:b820041 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "http://example.com/{Name}" ] .
-
-_:b820041 a rml:RelativePathSource ;
- rml:path "student.json" .
-
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:iterator "$.students[*]";
+ rml:referenceFormulation rml:JSONPath;
+ rml:source [ a rml:RelativePathSource;
+ rml:path "student.json"
+ ]
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{Name}"
+ ] .
diff --git a/test-cases/RMLTC0000-MySQL/mapping.ttl b/test-cases/RMLTC0000-MySQL/mapping.ttl
index 13556ebe..d0ae1084 100644
--- a/test-cases/RMLTC0000-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0000-MySQL/mapping.ttl
@@ -2,18 +2,24 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ rml:source ;
- rml:referenceFormulation rml:SQL2008TableName ;
- rml:sqlVersion rml:SQL2008 ;
- rml:tableName "student" ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "http://example.com/{Name}" ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "com.mysql.cj.jdbc.Driver" ;
- d2rq:password "" ;
- d2rq:username "root" .
+ a rml:TriplesMap;
+ rml:logicalSource [
+ rml:source ;
+ rml:referenceFormulation rml:SQL2008Table;
+ rml:iterator "student"
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{Name}"
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "com.mysql.cj.jdbc.Driver";
+ d2rq:password "";
+ d2rq:username "root" .
diff --git a/test-cases/RMLTC0000-PostgreSQL/mapping.ttl b/test-cases/RMLTC0000-PostgreSQL/mapping.ttl
index a4821a20..8de32762 100644
--- a/test-cases/RMLTC0000-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0000-PostgreSQL/mapping.ttl
@@ -2,18 +2,24 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ rml:source ;
- rml:referenceFormulation rml:SQL2008TableName ;
- rml:sqlVersion rml:SQL2008 ;
- rml:tableName "student" ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "http://example.com/{Name}" ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "org.postgresql.Driver" ;
- d2rq:password "" ;
- d2rq:username "postgres" .
+ a rml:TriplesMap;
+ rml:logicalSource [
+ rml:source ;
+ rml:referenceFormulation rml:SQL2008Table;
+ rml:iterator "student"
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{Name}"
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "org.postgresql.Driver";
+ d2rq:password "";
+ d2rq:username "postgres" .
diff --git a/test-cases/RMLTC0000-SPARQL/mapping.ttl b/test-cases/RMLTC0000-SPARQL/mapping.ttl
index 2430a003..9bef56d9 100644
--- a/test-cases/RMLTC0000-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0000-SPARQL/mapping.ttl
@@ -2,21 +2,28 @@
@prefix rml: .
@prefix sd: .
- rml:logicalSource [ rml:iterator "$.results.bindings[*]" ;
- rml:query """
+ rml:logicalSource [
+ rml:iterator "$.results.bindings[*]";
+ rml:iterator """
PREFIX rdfs:
SELECT ?name
WHERE {
?name a rdfs:Literal .
- } """ ;
- rml:referenceFormulation rml:JSONPath ;
- rml:source ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "name.value" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "http://example.com/{name.value}" ] .
-
- a sd:Service ;
- sd:endpoint ;
- sd:resultFormat ;
- sd:supportedLanguage sd:SPARQL11Query .
+ } """;
+ rml:referenceFormulation rml:JSONPath;
+ rml:source
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "name.value"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{name.value}"
+ ] .
+ a sd:Service;
+ sd:endpoint ;
+ sd:resultFormat ;
+ sd:supportedLanguage sd:SPARQL11Query .
diff --git a/test-cases/RMLTC0000-SQLServer/mapping.ttl b/test-cases/RMLTC0000-SQLServer/mapping.ttl
index 31d3ee16..058c5756 100644
--- a/test-cases/RMLTC0000-SQLServer/mapping.ttl
+++ b/test-cases/RMLTC0000-SQLServer/mapping.ttl
@@ -2,18 +2,24 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ rml:source ;
- rml:referenceFormulation rml:SQL2008TableName ;
- rml:sqlVersion rml:SQL2008 ;
- rml:tableName "student" ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "http://example.com/{Name}" ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "com.microsoft.sqlserver.jdbc.SQLServerDriver" ;
- d2rq:password "YourSTRONG!Passw0rd;" ;
- d2rq:username "sa" .
+ a rml:TriplesMap;
+ rml:logicalSource [
+ rml:source ;
+ rml:referenceFormulation rml:SQL2008Table;
+ rml:iterator "student"
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{Name}"
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "com.microsoft.sqlserver.jdbc.SQLServerDriver";
+ d2rq:password "YourSTRONG!Passw0rd;";
+ d2rq:username "sa" .
diff --git a/test-cases/RMLTC0000-XML/mapping.ttl b/test-cases/RMLTC0000-XML/mapping.ttl
index 7fd8f55a..371d18b6 100644
--- a/test-cases/RMLTC0000-XML/mapping.ttl
+++ b/test-cases/RMLTC0000-XML/mapping.ttl
@@ -1,15 +1,20 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:iterator "/students/student" ;
- rml:referenceFormulation rml:XPath ;
- rml:source _:b848099 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "http://example.com/{Name}" ] .
-
-_:b848099 a rml:RelativePathSource ;
- rml:path "student.xml" .
-
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:iterator "/students/student";
+ rml:referenceFormulation rml:XPath;
+ rml:source [ a rml:RelativePathSource;
+ rml:path "student.xml"
+ ]
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{Name}"
+ ] .
diff --git a/test-cases/RMLTC0001a-CSV/mapping.ttl b/test-cases/RMLTC0001a-CSV/mapping.ttl
index 8609dabf..f8b542f6 100644
--- a/test-cases/RMLTC0001a-CSV/mapping.ttl
+++ b/test-cases/RMLTC0001a-CSV/mapping.ttl
@@ -1,14 +1,19 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:referenceFormulation rml:CSV ;
- rml:source _:b408533 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "http://example.com/{Name}" ] .
-
-_:b408533 a rml:RelativePathSource ;
- rml:path "student.csv" .
-
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:referenceFormulation rml:CSV;
+ rml:source [ a rml:RelativePathSource;
+ rml:path "student.csv"
+ ]
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{Name}"
+ ] .
diff --git a/test-cases/RMLTC0001a-JSON/mapping.ttl b/test-cases/RMLTC0001a-JSON/mapping.ttl
index d97444cc..2f29c312 100644
--- a/test-cases/RMLTC0001a-JSON/mapping.ttl
+++ b/test-cases/RMLTC0001a-JSON/mapping.ttl
@@ -1,17 +1,20 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:iterator "$.students[*]" ;
- rml:referenceFormulation rml:JSONPath ;
- rml:source _:b738439 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap .
-
-_:b738439 a rml:RelativePathSource ;
- rml:path "student.json" .
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:iterator "$.students[*]";
+ rml:referenceFormulation rml:JSONPath;
+ rml:source [ a rml:RelativePathSource;
+ rml:path "student.json"
+ ]
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap .
rml:template "http://example.com/{Name}" .
-
diff --git a/test-cases/RMLTC0001a-MySQL/mapping.ttl b/test-cases/RMLTC0001a-MySQL/mapping.ttl
index 13556ebe..d0ae1084 100644
--- a/test-cases/RMLTC0001a-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0001a-MySQL/mapping.ttl
@@ -2,18 +2,24 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ rml:source ;
- rml:referenceFormulation rml:SQL2008TableName ;
- rml:sqlVersion rml:SQL2008 ;
- rml:tableName "student" ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "http://example.com/{Name}" ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "com.mysql.cj.jdbc.Driver" ;
- d2rq:password "" ;
- d2rq:username "root" .
+ a rml:TriplesMap;
+ rml:logicalSource [
+ rml:source ;
+ rml:referenceFormulation rml:SQL2008Table;
+ rml:iterator "student"
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{Name}"
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "com.mysql.cj.jdbc.Driver";
+ d2rq:password "";
+ d2rq:username "root" .
diff --git a/test-cases/RMLTC0001a-PostgreSQL/mapping.ttl b/test-cases/RMLTC0001a-PostgreSQL/mapping.ttl
index a4821a20..8de32762 100644
--- a/test-cases/RMLTC0001a-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0001a-PostgreSQL/mapping.ttl
@@ -2,18 +2,24 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ rml:source ;
- rml:referenceFormulation rml:SQL2008TableName ;
- rml:sqlVersion rml:SQL2008 ;
- rml:tableName "student" ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "http://example.com/{Name}" ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "org.postgresql.Driver" ;
- d2rq:password "" ;
- d2rq:username "postgres" .
+ a rml:TriplesMap;
+ rml:logicalSource [
+ rml:source ;
+ rml:referenceFormulation rml:SQL2008Table;
+ rml:iterator "student"
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{Name}"
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "org.postgresql.Driver";
+ d2rq:password "";
+ d2rq:username "postgres" .
diff --git a/test-cases/RMLTC0001a-SPARQL/mapping.ttl b/test-cases/RMLTC0001a-SPARQL/mapping.ttl
index e7b0ffbd..86bd32ac 100644
--- a/test-cases/RMLTC0001a-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0001a-SPARQL/mapping.ttl
@@ -2,22 +2,29 @@
@prefix rml: .
@prefix sd: .
- rml:logicalSource [ rml:iterator "$.results.bindings[*]" ;
- rml:query """
+ rml:logicalSource [
+ rml:iterator "$.results.bindings[*]";
+ rml:iterator """
PREFIX rdfs:
PREFIX foaf:
SELECT ?name
WHERE {
?x foaf:name ?name .
- } """ ;
- rml:referenceFormulation rml:JSONPath ;
- rml:source ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "name.value" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "http://example.com/{name.value}" ] .
-
- a sd:Service ;
- sd:endpoint ;
- sd:resultFormat ;
- sd:supportedLanguage sd:SPARQL11Query .
+ } """;
+ rml:referenceFormulation rml:JSONPath;
+ rml:source
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "name.value"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{name.value}"
+ ] .
+ a sd:Service;
+ sd:endpoint ;
+ sd:resultFormat ;
+ sd:supportedLanguage sd:SPARQL11Query .
diff --git a/test-cases/RMLTC0001a-SQLServer/mapping.ttl b/test-cases/RMLTC0001a-SQLServer/mapping.ttl
index 31d3ee16..058c5756 100644
--- a/test-cases/RMLTC0001a-SQLServer/mapping.ttl
+++ b/test-cases/RMLTC0001a-SQLServer/mapping.ttl
@@ -2,18 +2,24 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ rml:source ;
- rml:referenceFormulation rml:SQL2008TableName ;
- rml:sqlVersion rml:SQL2008 ;
- rml:tableName "student" ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "http://example.com/{Name}" ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "com.microsoft.sqlserver.jdbc.SQLServerDriver" ;
- d2rq:password "YourSTRONG!Passw0rd;" ;
- d2rq:username "sa" .
+ a rml:TriplesMap;
+ rml:logicalSource [
+ rml:source ;
+ rml:referenceFormulation rml:SQL2008Table;
+ rml:iterator "student"
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{Name}"
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "com.microsoft.sqlserver.jdbc.SQLServerDriver";
+ d2rq:password "YourSTRONG!Passw0rd;";
+ d2rq:username "sa" .
diff --git a/test-cases/RMLTC0001a-XML/mapping.ttl b/test-cases/RMLTC0001a-XML/mapping.ttl
index 87a0d681..371d18b6 100644
--- a/test-cases/RMLTC0001a-XML/mapping.ttl
+++ b/test-cases/RMLTC0001a-XML/mapping.ttl
@@ -1,15 +1,20 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:iterator "/students/student" ;
- rml:referenceFormulation rml:XPath ;
- rml:source _:b893000 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "http://example.com/{Name}" ] .
-
-_:b893000 a rml:RelativePathSource ;
- rml:path "student.xml" .
-
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:iterator "/students/student";
+ rml:referenceFormulation rml:XPath;
+ rml:source [ a rml:RelativePathSource;
+ rml:path "student.xml"
+ ]
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{Name}"
+ ] .
diff --git a/test-cases/RMLTC0001b-CSV/mapping.ttl b/test-cases/RMLTC0001b-CSV/mapping.ttl
index f73b7882..63789b9b 100644
--- a/test-cases/RMLTC0001b-CSV/mapping.ttl
+++ b/test-cases/RMLTC0001b-CSV/mapping.ttl
@@ -1,15 +1,20 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:referenceFormulation rml:CSV ;
- rml:source _:b679881 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "{Name}" ;
- rml:termType rml:BlankNode ] .
-
-_:b679881 a rml:RelativePathSource ;
- rml:path "student.csv" .
-
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:referenceFormulation rml:CSV;
+ rml:source [ a rml:RelativePathSource;
+ rml:path "student.csv"
+ ]
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "{Name}";
+ rml:termType rml:BlankNode
+ ] .
diff --git a/test-cases/RMLTC0001b-JSON/mapping.ttl b/test-cases/RMLTC0001b-JSON/mapping.ttl
index f4ad592f..5b3c9a89 100644
--- a/test-cases/RMLTC0001b-JSON/mapping.ttl
+++ b/test-cases/RMLTC0001b-JSON/mapping.ttl
@@ -1,16 +1,21 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:iterator "$.students[*]" ;
- rml:referenceFormulation rml:JSONPath ;
- rml:source _:b879138 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "{Name}" ;
- rml:termType rml:BlankNode ] .
-
-_:b879138 a rml:RelativePathSource ;
- rml:path "student.json" .
-
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:iterator "$.students[*]";
+ rml:referenceFormulation rml:JSONPath;
+ rml:source [ a rml:RelativePathSource;
+ rml:path "student.json"
+ ]
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "{Name}";
+ rml:termType rml:BlankNode
+ ] .
diff --git a/test-cases/RMLTC0001b-MySQL/mapping.ttl b/test-cases/RMLTC0001b-MySQL/mapping.ttl
index 84ca54ab..054eefd1 100644
--- a/test-cases/RMLTC0001b-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0001b-MySQL/mapping.ttl
@@ -2,19 +2,24 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:query "SELECT Name FROM student" ;
- rml:referenceFormulation rml:SQL2008Query ;
- rml:source ;
- rml:sqlVersion rml:SQL2008 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "http://example.com/{Name}" ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "com.mysql.cj.jdbc.Driver" ;
- d2rq:password "" ;
- d2rq:username "root" .
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:iterator "SELECT Name FROM student";
+ rml:referenceFormulation rml:SQL2008Query;
+ rml:source
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{Name}"
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "com.mysql.cj.jdbc.Driver";
+ d2rq:password "";
+ d2rq:username "root" .
diff --git a/test-cases/RMLTC0001b-PostgreSQL/mapping.ttl b/test-cases/RMLTC0001b-PostgreSQL/mapping.ttl
index 5f898c8c..43c823a3 100644
--- a/test-cases/RMLTC0001b-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0001b-PostgreSQL/mapping.ttl
@@ -2,19 +2,24 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:query "SELECT Name FROM student" ;
- rml:referenceFormulation rml:SQL2008Query ;
- rml:source ;
- rml:sqlVersion rml:SQL2008 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "http://example.com/{name}" ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "org.postgresql.Driver" ;
- d2rq:password "" ;
- d2rq:username "postgres" .
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:iterator "SELECT Name FROM student";
+ rml:referenceFormulation rml:SQL2008Query;
+ rml:source
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{name}"
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "org.postgresql.Driver";
+ d2rq:password "";
+ d2rq:username "postgres" .
diff --git a/test-cases/RMLTC0001b-SPARQL/mapping.ttl b/test-cases/RMLTC0001b-SPARQL/mapping.ttl
index e7b0ffbd..86bd32ac 100644
--- a/test-cases/RMLTC0001b-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0001b-SPARQL/mapping.ttl
@@ -2,22 +2,29 @@
@prefix rml: .
@prefix sd: .
- rml:logicalSource [ rml:iterator "$.results.bindings[*]" ;
- rml:query """
+ rml:logicalSource [
+ rml:iterator "$.results.bindings[*]";
+ rml:iterator """
PREFIX rdfs:
PREFIX foaf:
SELECT ?name
WHERE {
?x foaf:name ?name .
- } """ ;
- rml:referenceFormulation rml:JSONPath ;
- rml:source ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "name.value" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "http://example.com/{name.value}" ] .
-
- a sd:Service ;
- sd:endpoint ;
- sd:resultFormat ;
- sd:supportedLanguage sd:SPARQL11Query .
+ } """;
+ rml:referenceFormulation rml:JSONPath;
+ rml:source
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "name.value"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{name.value}"
+ ] .
+ a sd:Service;
+ sd:endpoint ;
+ sd:resultFormat ;
+ sd:supportedLanguage sd:SPARQL11Query .
diff --git a/test-cases/RMLTC0001b-SQLServer/mapping.ttl b/test-cases/RMLTC0001b-SQLServer/mapping.ttl
index dd8e6081..d790ebbc 100644
--- a/test-cases/RMLTC0001b-SQLServer/mapping.ttl
+++ b/test-cases/RMLTC0001b-SQLServer/mapping.ttl
@@ -2,19 +2,24 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:query "SELECT Name FROM student" ;
- rml:referenceFormulation rml:SQL2008Query ;
- rml:source ;
- rml:sqlVersion rml:SQL2008 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "http://example.com/{Name}" ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "com.microsoft.sqlserver.jdbc.SQLServerDriver" ;
- d2rq:password "YourSTRONG!Passw0rd;" ;
- d2rq:username "sa" .
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:iterator "SELECT Name FROM student";
+ rml:referenceFormulation rml:SQL2008Query;
+ rml:source
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{Name}"
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "com.microsoft.sqlserver.jdbc.SQLServerDriver";
+ d2rq:password "YourSTRONG!Passw0rd;";
+ d2rq:username "sa" .
diff --git a/test-cases/RMLTC0001b-XML/mapping.ttl b/test-cases/RMLTC0001b-XML/mapping.ttl
index 9e8cfcf3..f0480548 100644
--- a/test-cases/RMLTC0001b-XML/mapping.ttl
+++ b/test-cases/RMLTC0001b-XML/mapping.ttl
@@ -1,16 +1,21 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:iterator "/students/student" ;
- rml:referenceFormulation rml:XPath ;
- rml:source _:b598646 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "{Name}" ;
- rml:termType rml:BlankNode ] .
-
-_:b598646 a rml:RelativePathSource ;
- rml:path "student.xml" .
-
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:iterator "/students/student";
+ rml:referenceFormulation rml:XPath;
+ rml:source [ a rml:RelativePathSource;
+ rml:path "student.xml"
+ ]
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "{Name}";
+ rml:termType rml:BlankNode
+ ] .
diff --git a/test-cases/RMLTC0002a-CSV/mapping.ttl b/test-cases/RMLTC0002a-CSV/mapping.ttl
index 07bae7a0..d1feec4f 100644
--- a/test-cases/RMLTC0002a-CSV/mapping.ttl
+++ b/test-cases/RMLTC0002a-CSV/mapping.ttl
@@ -2,17 +2,25 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:referenceFormulation rml:CSV ;
- rml:source _:b967105 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "ID" ] ;
- rml:predicate ex:id ],
- [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:class foaf:Person ;
- rml:template "http://example.com/{ID}/{Name}" ] .
-
-_:b967105 a rml:RelativePathSource ;
- rml:path "student.csv" .
-
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:referenceFormulation rml:CSV;
+ rml:source [ a rml:RelativePathSource;
+ rml:path "student.csv"
+ ]
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "ID"
+ ];
+ rml:predicate ex:id
+ ], [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:class foaf:Person;
+ rml:template "http://example.com/{ID}/{Name}"
+ ] .
diff --git a/test-cases/RMLTC0002a-JSON/mapping.ttl b/test-cases/RMLTC0002a-JSON/mapping.ttl
index 0c98b837..febdc9f3 100644
--- a/test-cases/RMLTC0002a-JSON/mapping.ttl
+++ b/test-cases/RMLTC0002a-JSON/mapping.ttl
@@ -2,18 +2,26 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:iterator "$.students[*]" ;
- rml:referenceFormulation rml:JSONPath ;
- rml:source _:b917 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "ID" ] ;
- rml:predicate ex:id ],
- [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:class foaf:Person ;
- rml:template "http://example.com/{ID}/{Name}" ] .
-
-_:b917 a rml:RelativePathSource ;
- rml:path "student.json" .
-
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:iterator "$.students[*]";
+ rml:referenceFormulation rml:JSONPath;
+ rml:source [ a rml:RelativePathSource;
+ rml:path "student.json"
+ ]
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "ID"
+ ];
+ rml:predicate ex:id
+ ], [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:class foaf:Person;
+ rml:template "http://example.com/{ID}/{Name}"
+ ] .
diff --git a/test-cases/RMLTC0002a-MySQL/mapping.ttl b/test-cases/RMLTC0002a-MySQL/mapping.ttl
index 48954a6b..a858a413 100644
--- a/test-cases/RMLTC0002a-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0002a-MySQL/mapping.ttl
@@ -3,21 +3,30 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ rml:referenceFormulation rml:SQL2008TableName ;
- rml:source ;
- rml:sqlVersion rml:SQL2008 ;
- rml:tableName "student" ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "ID" ] ;
- rml:predicate ex:id ],
- [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:class foaf:Person ;
- rml:template "http://example.com/{ID}/{Name}" ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "com.mysql.cj.jdbc.Driver" ;
- d2rq:password "" ;
- d2rq:username "root" .
+ a rml:TriplesMap;
+ rml:logicalSource [
+ rml:referenceFormulation rml:SQL2008Table;
+ rml:source ;
+ rml:iterator "student"
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "ID"
+ ];
+ rml:predicate ex:id
+ ], [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:class foaf:Person;
+ rml:template "http://example.com/{ID}/{Name}"
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "com.mysql.cj.jdbc.Driver";
+ d2rq:password "";
+ d2rq:username "root" .
diff --git a/test-cases/RMLTC0002a-PostgreSQL/mapping.ttl b/test-cases/RMLTC0002a-PostgreSQL/mapping.ttl
index fd110e7b..7a5f9e9f 100644
--- a/test-cases/RMLTC0002a-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0002a-PostgreSQL/mapping.ttl
@@ -3,21 +3,30 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ rml:referenceFormulation rml:SQL2008TableName ;
- rml:source ;
- rml:sqlVersion rml:SQL2008 ;
- rml:tableName "student" ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "ID" ] ;
- rml:predicate ex:id ],
- [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:class foaf:Person ;
- rml:template "http://example.com/{ID}/{Name}" ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "org.postgresql.Driver" ;
- d2rq:password "" ;
- d2rq:username "postgres" .
+ a rml:TriplesMap;
+ rml:logicalSource [
+ rml:referenceFormulation rml:SQL2008Table;
+ rml:source ;
+ rml:iterator "student"
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "ID"
+ ];
+ rml:predicate ex:id
+ ], [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:class foaf:Person;
+ rml:template "http://example.com/{ID}/{Name}"
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "org.postgresql.Driver";
+ d2rq:password "";
+ d2rq:username "postgres" .
diff --git a/test-cases/RMLTC0002a-SPARQL/mapping.ttl b/test-cases/RMLTC0002a-SPARQL/mapping.ttl
index bca44fb2..92b9f022 100644
--- a/test-cases/RMLTC0002a-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0002a-SPARQL/mapping.ttl
@@ -3,8 +3,9 @@
@prefix rml: .
@prefix sd: .
- rml:logicalSource [ rml:iterator "$.results.bindings[*]" ;
- rml:query """
+ rml:logicalSource [
+ rml:iterator "$.results.bindings[*]";
+ rml:iterator """
PREFIX rdfs:
PREFIX foaf:
PREFIX rdf:
@@ -12,18 +13,27 @@
WHERE {
?x foaf:name ?Name ;
rdf:ID ?ID .
- } """ ;
- rml:referenceFormulation rml:JSONPath ;
- rml:source ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "ID.value" ] ;
- rml:predicate ex:id ],
- [ rml:objectMap [ rml:reference "Name.value" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:class foaf:Person ;
- rml:template "http://example.com/{ID.value}/{Name.value}" ] .
-
- a sd:Service ;
- sd:endpoint ;
- sd:resultFormat ;
- sd:supportedLanguage sd:SPARQL11Query .
+ } """;
+ rml:referenceFormulation rml:JSONPath;
+ rml:source
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "ID.value"
+ ];
+ rml:predicate ex:id
+ ], [
+ rml:objectMap [
+ rml:reference "Name.value"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:class foaf:Person;
+ rml:template "http://example.com/{ID.value}/{Name.value}"
+ ] .
+ a sd:Service;
+ sd:endpoint ;
+ sd:resultFormat ;
+ sd:supportedLanguage sd:SPARQL11Query .
diff --git a/test-cases/RMLTC0002a-SQLServer/mapping.ttl b/test-cases/RMLTC0002a-SQLServer/mapping.ttl
index bb5bd6f7..a54a2198 100644
--- a/test-cases/RMLTC0002a-SQLServer/mapping.ttl
+++ b/test-cases/RMLTC0002a-SQLServer/mapping.ttl
@@ -3,21 +3,30 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ rml:referenceFormulation rml:SQL2008TableName ;
- rml:source ;
- rml:sqlVersion rml:SQL2008 ;
- rml:tableName "student" ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "ID" ] ;
- rml:predicate ex:id ],
- [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:class foaf:Person ;
- rml:template "http://example.com/{ID}/{Name}" ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "com.microsoft.sqlserver.jdbc.SQLServerDriver" ;
- d2rq:password "YourSTRONG!Passw0rd;" ;
- d2rq:username "sa" .
+ a rml:TriplesMap;
+ rml:logicalSource [
+ rml:referenceFormulation rml:SQL2008Table;
+ rml:source ;
+ rml:iterator "student"
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "ID"
+ ];
+ rml:predicate ex:id
+ ], [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:class foaf:Person;
+ rml:template "http://example.com/{ID}/{Name}"
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "com.microsoft.sqlserver.jdbc.SQLServerDriver";
+ d2rq:password "YourSTRONG!Passw0rd;";
+ d2rq:username "sa" .
diff --git a/test-cases/RMLTC0002a-XML/mapping.ttl b/test-cases/RMLTC0002a-XML/mapping.ttl
index c74007c8..98b383d0 100644
--- a/test-cases/RMLTC0002a-XML/mapping.ttl
+++ b/test-cases/RMLTC0002a-XML/mapping.ttl
@@ -2,18 +2,26 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:iterator "/students/student" ;
- rml:referenceFormulation rml:XPath ;
- rml:source _:b273958 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "ID" ] ;
- rml:predicate ex:id ],
- [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:class foaf:Person ;
- rml:template "http://example.com/{ID}/{Name}" ] .
-
-_:b273958 a rml:RelativePathSource ;
- rml:path "student.xml" .
-
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:iterator "/students/student";
+ rml:referenceFormulation rml:XPath;
+ rml:source [ a rml:RelativePathSource;
+ rml:path "student.xml"
+ ]
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "ID"
+ ];
+ rml:predicate ex:id
+ ], [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:class foaf:Person;
+ rml:template "http://example.com/{ID}/{Name}"
+ ] .
diff --git a/test-cases/RMLTC0002b-CSV/mapping.ttl b/test-cases/RMLTC0002b-CSV/mapping.ttl
index 19090649..cdc783cd 100644
--- a/test-cases/RMLTC0002b-CSV/mapping.ttl
+++ b/test-cases/RMLTC0002b-CSV/mapping.ttl
@@ -1,15 +1,20 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:referenceFormulation rml:CSV ;
- rml:source _:b961651 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "students{ID}" ;
- rml:termType rml:BlankNode ] .
-
-_:b961651 a rml:RelativePathSource ;
- rml:path "student.csv" .
-
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:referenceFormulation rml:CSV;
+ rml:source [ a rml:RelativePathSource;
+ rml:path "student.csv"
+ ]
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "students{ID}";
+ rml:termType rml:BlankNode
+ ] .
diff --git a/test-cases/RMLTC0002b-JSON/mapping.ttl b/test-cases/RMLTC0002b-JSON/mapping.ttl
index d70e497b..573ffdbf 100644
--- a/test-cases/RMLTC0002b-JSON/mapping.ttl
+++ b/test-cases/RMLTC0002b-JSON/mapping.ttl
@@ -1,16 +1,21 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:iterator "$.students[*]" ;
- rml:referenceFormulation rml:JSONPath ;
- rml:source _:b640700 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "students{ID}" ;
- rml:termType rml:BlankNode ] .
-
-_:b640700 a rml:RelativePathSource ;
- rml:path "student.json" .
-
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:iterator "$.students[*]";
+ rml:referenceFormulation rml:JSONPath;
+ rml:source [ a rml:RelativePathSource;
+ rml:path "student.json"
+ ]
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "students{ID}";
+ rml:termType rml:BlankNode
+ ] .
diff --git a/test-cases/RMLTC0002b-MySQL/mapping.ttl b/test-cases/RMLTC0002b-MySQL/mapping.ttl
index 3e6e2059..e0c56e13 100644
--- a/test-cases/RMLTC0002b-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0002b-MySQL/mapping.ttl
@@ -2,19 +2,25 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ rml:referenceFormulation rml:SQL2008TableName ;
- rml:source ;
- rml:sqlVersion rml:SQL2008 ;
- rml:tableName "student" ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "students{ID}" ;
- rml:termType rml:BlankNode ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "com.mysql.cj.jdbc.Driver" ;
- d2rq:password "" ;
- d2rq:username "root" .
+ a rml:TriplesMap;
+ rml:logicalSource [
+ rml:referenceFormulation rml:SQL2008Table;
+ rml:source ;
+ rml:iterator "student"
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "students{ID}";
+ rml:termType rml:BlankNode
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "com.mysql.cj.jdbc.Driver";
+ d2rq:password "";
+ d2rq:username "root" .
diff --git a/test-cases/RMLTC0002b-PostgreSQL/mapping.ttl b/test-cases/RMLTC0002b-PostgreSQL/mapping.ttl
index 3b01f323..0cb45551 100644
--- a/test-cases/RMLTC0002b-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0002b-PostgreSQL/mapping.ttl
@@ -2,19 +2,25 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ rml:referenceFormulation rml:SQL2008TableName ;
- rml:source ;
- rml:sqlVersion rml:SQL2008 ;
- rml:tableName "student" ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "students{ID}" ;
- rml:termType rml:BlankNode ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "org.postgresql.Driver" ;
- d2rq:password "" ;
- d2rq:username "postgres" .
+ a rml:TriplesMap;
+ rml:logicalSource [
+ rml:referenceFormulation rml:SQL2008Table;
+ rml:source ;
+ rml:iterator "student"
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "students{ID}";
+ rml:termType rml:BlankNode
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "org.postgresql.Driver";
+ d2rq:password "";
+ d2rq:username "postgres" .
diff --git a/test-cases/RMLTC0002b-SPARQL/mapping.ttl b/test-cases/RMLTC0002b-SPARQL/mapping.ttl
index 9974e859..25a07f24 100644
--- a/test-cases/RMLTC0002b-SPARQL/mapping.ttl
+++ b/test-cases/RMLTC0002b-SPARQL/mapping.ttl
@@ -2,8 +2,9 @@
@prefix rml: .
@prefix sd: .
- rml:logicalSource [ rml:iterator "$.results.bindings[*]" ;
- rml:query """
+ rml:logicalSource [
+ rml:iterator "$.results.bindings[*]";
+ rml:iterator """
PREFIX rdfs:
PREFIX foaf:
PREFIX rdf:
@@ -11,16 +12,22 @@
WHERE {
?x foaf:name ?Name ;
rdf:ID ?ID .
- } """ ;
- rml:referenceFormulation rml:JSONPath ;
- rml:source ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name.value" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "students{ID.value}" ;
- rml:termType rml:BlankNode ] .
-
- a sd:Service ;
- sd:endpoint ;
- sd:resultFormat ;
- sd:supportedLanguage sd:SPARQL11Query .
+ } """;
+ rml:referenceFormulation rml:JSONPath;
+ rml:source
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name.value"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "students{ID.value}";
+ rml:termType rml:BlankNode
+ ] .
+ a sd:Service;
+ sd:endpoint ;
+ sd:resultFormat ;
+ sd:supportedLanguage sd:SPARQL11Query .
diff --git a/test-cases/RMLTC0002b-SQLServer/mapping.ttl b/test-cases/RMLTC0002b-SQLServer/mapping.ttl
index b51b328a..7e3c5e6e 100644
--- a/test-cases/RMLTC0002b-SQLServer/mapping.ttl
+++ b/test-cases/RMLTC0002b-SQLServer/mapping.ttl
@@ -2,19 +2,25 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ rml:referenceFormulation rml:SQL2008TableName ;
- rml:source ;
- rml:sqlVersion rml:SQL2008 ;
- rml:tableName "student" ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "students{ID}" ;
- rml:termType rml:BlankNode ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "com.microsoft.sqlserver.jdbc.SQLServerDriver" ;
- d2rq:password "YourSTRONG!Passw0rd;" ;
- d2rq:username "sa" .
+ a rml:TriplesMap;
+ rml:logicalSource [
+ rml:referenceFormulation rml:SQL2008Table;
+ rml:source ;
+ rml:iterator "student"
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "students{ID}";
+ rml:termType rml:BlankNode
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "com.microsoft.sqlserver.jdbc.SQLServerDriver";
+ d2rq:password "YourSTRONG!Passw0rd;";
+ d2rq:username "sa" .
diff --git a/test-cases/RMLTC0002b-XML/mapping.ttl b/test-cases/RMLTC0002b-XML/mapping.ttl
index f7828407..b300302f 100644
--- a/test-cases/RMLTC0002b-XML/mapping.ttl
+++ b/test-cases/RMLTC0002b-XML/mapping.ttl
@@ -1,16 +1,21 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:iterator "/students/student" ;
- rml:referenceFormulation rml:XPath ;
- rml:source _:b684296 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:template "students{ID}" ;
- rml:termType rml:BlankNode ] .
-
-_:b684296 a rml:RelativePathSource ;
- rml:path "student.xml" .
-
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:iterator "/students/student";
+ rml:referenceFormulation rml:XPath;
+ rml:source [ a rml:RelativePathSource;
+ rml:path "student.xml"
+ ]
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:template "students{ID}";
+ rml:termType rml:BlankNode
+ ] .
diff --git a/test-cases/RMLTC0002c-CSV/mapping.ttl b/test-cases/RMLTC0002c-CSV/mapping.ttl
index 84820e55..a0a3494b 100644
--- a/test-cases/RMLTC0002c-CSV/mapping.ttl
+++ b/test-cases/RMLTC0002c-CSV/mapping.ttl
@@ -1,14 +1,19 @@
@prefix ex: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:referenceFormulation rml:CSV ;
- rml:source _:b855455 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "IDs" ] ;
- rml:predicate ex:id ] ;
- rml:subjectMap [ rml:template "http://example.com/{ID}/{Name}" ] .
-
-_:b855455 a rml:RelativePathSource ;
- rml:path "student.csv" .
-
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:referenceFormulation rml:CSV;
+ rml:source [ a rml:RelativePathSource;
+ rml:path "student.csv"
+ ]
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "IDs"
+ ];
+ rml:predicate ex:id
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{ID}/{Name}"
+ ] .
diff --git a/test-cases/RMLTC0002c-MySQL/mapping.ttl b/test-cases/RMLTC0002c-MySQL/mapping.ttl
index edc94f01..3b0d881b 100644
--- a/test-cases/RMLTC0002c-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0002c-MySQL/mapping.ttl
@@ -2,17 +2,24 @@
@prefix ex: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ rml:referenceFormulation rml:SQL2008TableName ;
- rml:source ;
- rml:tableName "student" ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "IDs" ] ;
- rml:predicate ex:id ] ;
- rml:subjectMap [ rml:template "http://example.com/{ID}/{Name}" ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "com.mysql.cj.jdbc.Driver" ;
- d2rq:password "" ;
- d2rq:username "root" .
+ a rml:TriplesMap;
+ rml:logicalSource [
+ rml:referenceFormulation rml:SQL2008Table;
+ rml:source ;
+ rml:iterator "student"
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "IDs"
+ ];
+ rml:predicate ex:id
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{ID}/{Name}"
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "com.mysql.cj.jdbc.Driver";
+ d2rq:password "";
+ d2rq:username "root" .
diff --git a/test-cases/RMLTC0002c-PostgreSQL/mapping.ttl b/test-cases/RMLTC0002c-PostgreSQL/mapping.ttl
index 9f0d63bd..397c267d 100644
--- a/test-cases/RMLTC0002c-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0002c-PostgreSQL/mapping.ttl
@@ -2,17 +2,24 @@
@prefix ex: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ rml:referenceFormulation rml:SQL2008TableName ;
- rml:source ;
- rml:tableName "student" ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "IDs" ] ;
- rml:predicate ex:id ] ;
- rml:subjectMap [ rml:template "http://example.com/{ID}/{Name}" ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "org.postgresql.Driver" ;
- d2rq:password "" ;
- d2rq:username "postgres" .
+ a rml:TriplesMap;
+ rml:logicalSource [
+ rml:referenceFormulation rml:SQL2008Table;
+ rml:source ;
+ rml:iterator "student"
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "IDs"
+ ];
+ rml:predicate ex:id
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{ID}/{Name}"
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "org.postgresql.Driver";
+ d2rq:password "";
+ d2rq:username "postgres" .
diff --git a/test-cases/RMLTC0002c-SQLServer/mapping.ttl b/test-cases/RMLTC0002c-SQLServer/mapping.ttl
index b786d620..c3b656d0 100644
--- a/test-cases/RMLTC0002c-SQLServer/mapping.ttl
+++ b/test-cases/RMLTC0002c-SQLServer/mapping.ttl
@@ -2,17 +2,24 @@
@prefix ex: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ rml:referenceFormulation rml:SQL2008TableName ;
- rml:source ;
- rml:tableName "student" ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "IDs" ] ;
- rml:predicate ex:id ] ;
- rml:subjectMap [ rml:template "http://example.com/{ID}/{Name}" ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "com.microsoft.sqlserver.jdbc.SQLServerDriver" ;
- d2rq:password "YourSTRONG!Passw0rd;" ;
- d2rq:username "sa" .
+ a rml:TriplesMap;
+ rml:logicalSource [
+ rml:referenceFormulation rml:SQL2008Table;
+ rml:source ;
+ rml:iterator "student"
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "IDs"
+ ];
+ rml:predicate ex:id
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{ID}/{Name}"
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "com.microsoft.sqlserver.jdbc.SQLServerDriver";
+ d2rq:password "YourSTRONG!Passw0rd;";
+ d2rq:username "sa" .
diff --git a/test-cases/RMLTC0002d-MySQL/mapping.ttl b/test-cases/RMLTC0002d-MySQL/mapping.ttl
index 821f5a5f..d4a2bb0f 100644
--- a/test-cases/RMLTC0002d-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0002d-MySQL/mapping.ttl
@@ -2,20 +2,25 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:query "SELECT CONCAT('Student', ID) AS StudentId, ID, Name FROM student" ;
- rml:referenceFormulation rml:SQL2008Query ;
- rml:source ;
- rml:sqlVersion rml:SQL2008 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:reference "StudentId" ;
- rml:termType rml:BlankNode ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "com.mysql.cj.jdbc.Driver" ;
- d2rq:password "" ;
- d2rq:username "root" .
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:iterator "SELECT CONCAT('Student', ID) AS StudentId, ID, Name FROM student";
+ rml:referenceFormulation rml:SQL2008Query;
+ rml:source
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:reference "StudentId";
+ rml:termType rml:BlankNode
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "com.mysql.cj.jdbc.Driver";
+ d2rq:password "";
+ d2rq:username "root" .
diff --git a/test-cases/RMLTC0002d-PostgreSQL/mapping.ttl b/test-cases/RMLTC0002d-PostgreSQL/mapping.ttl
index feb701e5..2b20b148 100644
--- a/test-cases/RMLTC0002d-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0002d-PostgreSQL/mapping.ttl
@@ -2,20 +2,25 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:query "SELECT ('Student' || ID) AS StudentId, ID, Name FROM student" ;
- rml:referenceFormulation rml:SQL2008Query ;
- rml:source ;
- rml:sqlVersion rml:SQL2008 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:reference "studentid" ;
- rml:termType rml:BlankNode ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "org.postgresql.Driver" ;
- d2rq:password "" ;
- d2rq:username "postgres" .
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:iterator "SELECT ('Student' || ID) AS StudentId, ID, Name FROM student";
+ rml:referenceFormulation rml:SQL2008Query;
+ rml:source
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:reference "studentid";
+ rml:termType rml:BlankNode
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "org.postgresql.Driver";
+ d2rq:password "";
+ d2rq:username "postgres" .
diff --git a/test-cases/RMLTC0002d-SQLServer/mapping.ttl b/test-cases/RMLTC0002d-SQLServer/mapping.ttl
index 012ee9d8..e7355d78 100644
--- a/test-cases/RMLTC0002d-SQLServer/mapping.ttl
+++ b/test-cases/RMLTC0002d-SQLServer/mapping.ttl
@@ -2,20 +2,25 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:query "SELECT CONCAT('Student', ID) AS StudentId, ID, Name FROM student" ;
- rml:referenceFormulation rml:SQL2008Query ;
- rml:source ;
- rml:sqlVersion rml:SQL2008 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:reference "StudentId" ;
- rml:termType rml:BlankNode ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "com.microsoft.sqlserver.jdbc.SQLServerDriver" ;
- d2rq:password "YourSTRONG!Passw0rd;" ;
- d2rq:username "sa" .
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:iterator "SELECT CONCAT('Student', ID) AS StudentId, ID, Name FROM student";
+ rml:referenceFormulation rml:SQL2008Query;
+ rml:source
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "Name"
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:reference "StudentId";
+ rml:termType rml:BlankNode
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "com.microsoft.sqlserver.jdbc.SQLServerDriver";
+ d2rq:password "YourSTRONG!Passw0rd;";
+ d2rq:username "sa" .
diff --git a/test-cases/RMLTC0002e-CSV/mapping.ttl b/test-cases/RMLTC0002e-CSV/mapping.ttl
index 5b132995..bba99aa2 100644
--- a/test-cases/RMLTC0002e-CSV/mapping.ttl
+++ b/test-cases/RMLTC0002e-CSV/mapping.ttl
@@ -1,14 +1,19 @@
@prefix ex: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:referenceFormulation rml:CSV ;
- rml:source _:b756717 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "IDs" ] ;
- rml:predicate ex:id ] ;
- rml:subjectMap [ rml:template "http://example.com/{ID}/{Name}" ] .
-
-_:b756717 a rml:RelativePathSource ;
- rml:path "student2.csv" .
-
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:referenceFormulation rml:CSV;
+ rml:source [ a rml:RelativePathSource;
+ rml:path "student2.csv"
+ ]
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "IDs"
+ ];
+ rml:predicate ex:id
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{ID}/{Name}"
+ ] .
diff --git a/test-cases/RMLTC0002e-JSON/mapping.ttl b/test-cases/RMLTC0002e-JSON/mapping.ttl
index 85f0e17a..4f84e905 100644
--- a/test-cases/RMLTC0002e-JSON/mapping.ttl
+++ b/test-cases/RMLTC0002e-JSON/mapping.ttl
@@ -1,15 +1,20 @@
@prefix ex: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:iterator "$.students[*]" ;
- rml:referenceFormulation rml:JSONPath ;
- rml:source _:b528806 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "IDs" ] ;
- rml:predicate ex:id ] ;
- rml:subjectMap [ rml:template "http://example.com/{ID}/{Name}" ] .
-
-_:b528806 a rml:RelativePathSource ;
- rml:path "student2.json" .
-
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:iterator "$.students[*]";
+ rml:referenceFormulation rml:JSONPath;
+ rml:source [ a rml:RelativePathSource;
+ rml:path "student2.json"
+ ]
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "IDs"
+ ];
+ rml:predicate ex:id
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{ID}/{Name}"
+ ] .
diff --git a/test-cases/RMLTC0002e-MySQL/mapping.ttl b/test-cases/RMLTC0002e-MySQL/mapping.ttl
index e744fea0..3243ff11 100644
--- a/test-cases/RMLTC0002e-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0002e-MySQL/mapping.ttl
@@ -2,18 +2,24 @@
@prefix ex: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ rml:referenceFormulation rml:SQL2008TableName ;
- rml:source ;
- rml:sqlVersion rml:SQL2008 ;
- rml:tableName "\"Students\"" ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "IDs" ] ;
- rml:predicate ex:id ] ;
- rml:subjectMap [ rml:template "http://example.com/{ID}/{Name}" ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "com.mysql.cj.jdbc.Driver" ;
- d2rq:password "" ;
- d2rq:username "root" .
+ a rml:TriplesMap;
+ rml:logicalSource [
+ rml:referenceFormulation rml:SQL2008Table;
+ rml:source ;
+ rml:iterator "\"Students\""
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "IDs"
+ ];
+ rml:predicate ex:id
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{ID}/{Name}"
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "com.mysql.cj.jdbc.Driver";
+ d2rq:password "";
+ d2rq:username "root" .
diff --git a/test-cases/RMLTC0002e-PostgreSQL/mapping.ttl b/test-cases/RMLTC0002e-PostgreSQL/mapping.ttl
index 0561f191..8c5821d5 100644
--- a/test-cases/RMLTC0002e-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0002e-PostgreSQL/mapping.ttl
@@ -2,18 +2,24 @@
@prefix ex: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ rml:referenceFormulation rml:SQL2008TableName ;
- rml:source ;
- rml:sqlVersion rml:SQL2008 ;
- rml:tableName "\"Students\"" ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "IDs" ] ;
- rml:predicate ex:id ] ;
- rml:subjectMap [ rml:template "http://example.com/{ID}/{Name}" ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "org.postgresql.Driver" ;
- d2rq:password "" ;
- d2rq:username "postgres" .
+ a rml:TriplesMap;
+ rml:logicalSource [
+ rml:referenceFormulation rml:SQL2008Table;
+ rml:source ;
+ rml:iterator "\"Students\""
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "IDs"
+ ];
+ rml:predicate ex:id
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{ID}/{Name}"
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "org.postgresql.Driver";
+ d2rq:password "";
+ d2rq:username "postgres" .
diff --git a/test-cases/RMLTC0002e-SQLServer/mapping.ttl b/test-cases/RMLTC0002e-SQLServer/mapping.ttl
index 0b59a9a2..7cd1f338 100644
--- a/test-cases/RMLTC0002e-SQLServer/mapping.ttl
+++ b/test-cases/RMLTC0002e-SQLServer/mapping.ttl
@@ -2,18 +2,24 @@
@prefix ex: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ rml:referenceFormulation rml:SQL2008TableName ;
- rml:source ;
- rml:sqlVersion rml:SQL2008 ;
- rml:tableName "\"Students\"" ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "IDs" ] ;
- rml:predicate ex:id ] ;
- rml:subjectMap [ rml:template "http://example.com/{ID}/{Name}" ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "com.microsoft.sqlserver.jdbc.SQLServerDriver" ;
- d2rq:password "YourSTRONG!Passw0rd;" ;
- d2rq:username "sa" .
+ a rml:TriplesMap;
+ rml:logicalSource [
+ rml:referenceFormulation rml:SQL2008Table;
+ rml:source ;
+ rml:iterator "\"Students\""
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "IDs"
+ ];
+ rml:predicate ex:id
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{ID}/{Name}"
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "com.microsoft.sqlserver.jdbc.SQLServerDriver";
+ d2rq:password "YourSTRONG!Passw0rd;";
+ d2rq:username "sa" .
diff --git a/test-cases/RMLTC0002e-XML/mapping.ttl b/test-cases/RMLTC0002e-XML/mapping.ttl
index 06271829..c3b7f8c8 100644
--- a/test-cases/RMLTC0002e-XML/mapping.ttl
+++ b/test-cases/RMLTC0002e-XML/mapping.ttl
@@ -1,15 +1,20 @@
@prefix ex: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ a rml:LogicalSource ;
- rml:iterator "/students/student" ;
- rml:referenceFormulation rml:XPath ;
- rml:source _:b29658 ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "IDs" ] ;
- rml:predicate ex:id ] ;
- rml:subjectMap [ rml:template "http://example.com/{ID}/{Name}" ] .
-
-_:b29658 a rml:RelativePathSource ;
- rml:path "student2.xml" .
-
+ a rml:TriplesMap;
+ rml:logicalSource [ a rml:LogicalSource;
+ rml:iterator "/students/student";
+ rml:referenceFormulation rml:XPath;
+ rml:source [ a rml:RelativePathSource;
+ rml:path "student2.xml"
+ ]
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "IDs"
+ ];
+ rml:predicate ex:id
+ ];
+ rml:subjectMap [
+ rml:template "http://example.com/{ID}/{Name}"
+ ] .
diff --git a/test-cases/RMLTC0002f-MySQL/mapping.ttl b/test-cases/RMLTC0002f-MySQL/mapping.ttl
index 00c34823..49ef282d 100644
--- a/test-cases/RMLTC0002f-MySQL/mapping.ttl
+++ b/test-cases/RMLTC0002f-MySQL/mapping.ttl
@@ -3,21 +3,30 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ rml:referenceFormulation rml:SQL2008TableName ;
- rml:source ;
- rml:sqlVersion rml:SQL2008 ;
- rml:tableName "Student" ] ;
- rml:predicateObjectMap [ rml:objectMap [ rml:reference "ID" ] ;
- rml:predicate ex:id ],
- [ rml:objectMap [ rml:reference "Name" ] ;
- rml:predicate foaf:name ] ;
- rml:subjectMap [ rml:class foaf:Person ;
- rml:template "http://example.com/{ID}/{Name}" ] .
-
- a d2rq:Database ;
- d2rq:jdbcDSN "CONNECTIONDSN" ;
- d2rq:jdbcDriver "com.mysql.cj.jdbc.Driver" ;
- d2rq:password "" ;
- d2rq:username "root" .
+ a rml:TriplesMap;
+ rml:logicalSource [
+ rml:referenceFormulation rml:SQL2008Table;
+ rml:source ;
+ rml:iterator "\"Student\""
+ ];
+ rml:predicateObjectMap [
+ rml:objectMap [
+ rml:reference "\"ID\""
+ ];
+ rml:predicate ex:id
+ ], [
+ rml:objectMap [
+ rml:reference "\"Name\""
+ ];
+ rml:predicate foaf:name
+ ];
+ rml:subjectMap [
+ rml:class foaf:Person;
+ rml:template "http://example.com/{\"ID\"}/{\"Name\"}"
+ ] .
+ a d2rq:Database;
+ d2rq:jdbcDSN "CONNECTIONDSN";
+ d2rq:jdbcDriver "com.mysql.cj.jdbc.Driver";
+ d2rq:password "";
+ d2rq:username "root" .
diff --git a/test-cases/RMLTC0002f-PostgreSQL/mapping.ttl b/test-cases/RMLTC0002f-PostgreSQL/mapping.ttl
index 3b1377da..49ef282d 100644
--- a/test-cases/RMLTC0002f-PostgreSQL/mapping.ttl
+++ b/test-cases/RMLTC0002f-PostgreSQL/mapping.ttl
@@ -3,21 +3,30 @@
@prefix foaf: .
@prefix rml: .
- a rml:TriplesMap ;
- rml:logicalSource [ rml:referenceFormulation rml:SQL2008TableName ;
- rml:source