updating the manifest files
authorBoris Villazon-Terrazas <bvillazon@fi.upm.es>
Wed, 31 Aug 2011 22:08:04 +0100
changeset 24 a0f5032eac93
parent 23 4bab3a20d770
child 25 d0f34c909395
updating the manifest files
D000-1table0rows/manifest.ttl
D001-1table1row/manifest.ttl
D002-1table2columns1row/directGraph.nt
D002-1table2columns1row/manifest.ttl
D003-1table3columns1row/manifest.ttl
D004-1table2columnsprojection/manifest.ttl
D004-1table2columnsprojection/r2rmlb.ttl
D009-2tables1primarykey1foreingkey/manifest.ttl
D009-2tables1primarykey1foreingkey/mapped.nq
D009-2tables1primarykey1foreingkey/r2rml.ttl
D011-M2MRelations/manifest.ttl
D011-M2MRelations/mappeda.nq
D011-M2MRelations/r2rmlb.ttl
D012-2tables2duplicates0nulls/create.sql
D012-2tables2duplicates0nulls/manifest.ttl
D012-2tables2duplicates0nulls/r2rmla.ttl
D012-2tables2duplicates0nulls/r2rmlb.ttl
D013-1table3columns2rows1nullvalue/directGraph.nt
D014-3tablesExample/create.sql
D014-3tablesExample/manifest.ttl
D014-3tablesExample/mappedb.nq
D014-3tablesExample/r2rmla.ttl
D014-3tablesExample/r2rmlb.ttl
--- a/D000-1table0rows/manifest.ttl	Mon Aug 29 22:45:00 2011 +0100
+++ b/D000-1table0rows/manifest.ttl	Wed Aug 31 22:08:04 2011 +0100
@@ -7,8 +7,7 @@
 	dcterms:title "Empty table" ;
 	dcterms:identifier "D000-1table0rows" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
-	rdb2rdftest:relatedTestCase <dg0000> ;
-	rdb2rdftest:relatedTestCase <tc0000> ;
+	rdb2rdftest:relatedTestCase <dg0000>, <tc0000>;
 .
 
 <dg0000> a rdb2rdftest:DirectMapping;	
--- a/D001-1table1row/manifest.ttl	Mon Aug 29 22:45:00 2011 +0100
+++ b/D001-1table1row/manifest.ttl	Wed Aug 31 22:08:04 2011 +0100
@@ -7,9 +7,7 @@
 	dcterms:title "One table, one row" ;
 	dcterms:identifier "D001-1table1row" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
-	rdb2rdftest:relatedTestCase <dg0001> ;
-	rdb2rdftest:relatedTestCase <tc0001a> ;
-	rdb2rdftest:relatedTestCase <tc0001b> ;
+	rdb2rdftest:relatedTestCase <dg0001>, <tc0001a>, <tc0001b> ;
 .
 
 <dg0001> a rdb2rdftest:DirectMapping;	
--- a/D002-1table2columns1row/directGraph.nt	Mon Aug 29 22:45:00 2011 +0100
+++ b/D002-1table2columns1row/directGraph.nt	Wed Aug 31 22:08:04 2011 +0100
@@ -1,3 +1,3 @@
 _:a a <Student> .
-_:a <Student#ID> 10 .
-_:a <Student#Name> "Venus" .
+_:a <Student#id> 10 .
+_:a <Student#name> "Venus" .
--- a/D002-1table2columns1row/manifest.ttl	Mon Aug 29 22:45:00 2011 +0100
+++ b/D002-1table2columns1row/manifest.ttl	Wed Aug 31 22:08:04 2011 +0100
@@ -7,9 +7,7 @@
 	dcterms:title "One table, two columns, one row" ;
 	dcterms:identifier "D002-1table2columns1row" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
-	rdb2rdftest:relatedTestCase <dg0002> ;
-	rdb2rdftest:relatedTestCase <tc0002a> ;
-	rdb2rdftest:relatedTestCase <tc0002b> ;
+	rdb2rdftest:relatedTestCase <dg0002>, <tc0002a>, <tc0002b> ;
 .
 
 <dg0002> a rdb2rdftest:DirectMapping ;	
--- a/D003-1table3columns1row/manifest.ttl	Mon Aug 29 22:45:00 2011 +0100
+++ b/D003-1table3columns1row/manifest.ttl	Wed Aug 31 22:08:04 2011 +0100
@@ -7,43 +7,39 @@
 	dcterms:title "One table, two columns, one row" ;
 	dcterms:identifier "D003-1table3columns1row" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
-	rdb2rdftest:relatedTestCase <dg0003> ;
-	rdb2rdftest:relatedTestCase <tc0003a> ;
-	rdb2rdftest:relatedTestCase <tc0003b> ;
-	rdb2rdftest:relatedTestCase <tc0003c> ;
-	rdb2rdftest:relatedTestCase <tc0003d> ;
+	rdb2rdftest:relatedTestCase <dg0003>, <tc0003a>, <tc0003b>;
 .
 
-<dg0002> a rdb2rdftest:DirectMapping ;	
+<dg0003> a rdb2rdftest:DirectMapping ;	
 	dcterms:title "Two columns mapping" ; 
-	dcterms:identifier "Direct Graph TC0002" ;
+	dcterms:identifier "Direct Graph TC0003" ;
 	test:purpose "Tests: (1) two columns mapping, no primary key; (2) generation of a \"BlankNode\" subject; (3) one column to one property" ;
 	test:specificationReference "#rules_table_triples" ;
 	test:reviewStatus test:accepted ;
-	rdb2rdftest:database <d002> ;
+	rdb2rdftest:database <d003> ;
 	rdb2rdftest:hasExpectedOutput true ;	
 	rdb2rdftest:output "directGraph.nt" ;
 .
 
-<tc0002a> a rdb2rdftest:R2RML ;	
+<tc0003a> a rdb2rdftest:R2RML ;	
 	dcterms:title "Two columns mapping" ; 
-	dcterms:identifier "R2RMLTC0002a" ;
+	dcterms:identifier "R2RMLTC0003a" ;
 	test:purpose "Tests: (1) two column mapping, no primary key; (2) subject URI generated by concatenation of two column values; (3) one column to one property" ;
 	test:specificationReference "#dfn-output-dataset" ;
 	test:reviewStatus test:accepted ;
-	rdb2rdftest:database <d002> ;
+	rdb2rdftest:database <d003> ;
 	rdb2rdftest:output "mappeda.nq" ;
 	rdb2rdftest:hasExpectedOutput true ;	
 	rdb2rdftest:mappingDocument "r2rmla.ttl" ;
 .
 
-<tc0002b> a rdb2rdftest:R2RML ;	
+<tc0003b> a rdb2rdftest:R2RML ;	
 	dcterms:title "Two columns mapping" ; 
-	dcterms:identifier "R2RMLTC0002b" ;
+	dcterms:identifier "R2RMLTC0003b" ;
 	test:purpose "Tests: (1) two column mapping, no primary key; (2) generation of a \"BlankNode\" subject; (3) one column to one property" ;
 	test:specificationReference "#dfn-output-dataset" ;
 	test:reviewStatus test:accepted ;
-	rdb2rdftest:database <d002> ;
+	rdb2rdftest:database <d003> ;
 	rdb2rdftest:output "mappedb.nq" ;
 	rdb2rdftest:hasExpectedOutput true ;
 	rdb2rdftest:mappingDocument "r2rmlb.ttl" ;
--- a/D004-1table2columnsprojection/manifest.ttl	Mon Aug 29 22:45:00 2011 +0100
+++ b/D004-1table2columnsprojection/manifest.ttl	Wed Aug 31 22:08:04 2011 +0100
@@ -7,9 +7,7 @@
 	dcterms:title "One table, two columns, projection" ;
 	dcterms:identifier "D004-1table2columnsprojection" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
-	rdb2rdftest:relatedTestCase <dg0004> ;
-	rdb2rdftest:relatedTestCase <tc0004a> ;
-	rdb2rdftest:relatedTestCase <tc0004b> ;
+	rdb2rdftest:relatedTestCase <dg0004>, <tc0004a>, <tc0004b>  ;
 .
 
 <dg0004> a rdb2rdftest:DirectMapping ;	
--- a/D004-1table2columnsprojection/r2rmlb.ttl	Mon Aug 29 22:45:00 2011 +0100
+++ b/D004-1table2columnsprojection/r2rmlb.ttl	Wed Aug 31 22:08:04 2011 +0100
@@ -8,12 +8,12 @@
     a rr:TriplesMap;
 
       rr:logicalTable [ rr:SQLQuery """
-       Select ('Student' || Student) AS StudentId, Student
+       Select ('Student' || Student) AS StudentId
          from Student_Sport
        """;
 	   ] ;
 
-    rr:subjectMap [ rr:column "StudentId"; rr:termType rr:BlankNode;
+    rr:subjectMap [ rr:column "StudentId"; rr:termtype rr:BlankNode;
                     rr:class ex:Student ];
 	
     rr:predicateObjectMap
@@ -27,11 +27,11 @@
     a rr:TriplesMap;
 
       rr:SQLQuery """
-       Select ('Sport' || Sport) AS SportId, Sport
+       Select ('Sport' || Sport) AS SportId
          from Student_Sport
        """;
 
-    rr:subjectMap [ rr:column "SportId"; rr:termType rr:BlankNode;
+    rr:subjectMap [ rr:column "SportId"; rr:termtype rr:BlankNode;
                     rr:class ex:Sport  ];
 	
     rr:predicateObjectMap
--- a/D009-2tables1primarykey1foreingkey/manifest.ttl	Mon Aug 29 22:45:00 2011 +0100
+++ b/D009-2tables1primarykey1foreingkey/manifest.ttl	Wed Aug 31 22:08:04 2011 +0100
@@ -7,8 +7,7 @@
 	dcterms:title "Two tables 1 primary key 1 foreing key" ;
 	dcterms:identifier "D009-2tables1primarykey1foreingkey" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
-	rdb2rdftest:relatedTestCase <dg0009> ;
-	rdb2rdftest:relatedTestCase <tc0009> ;
+	rdb2rdftest:relatedTestCase <dg0009>, <tc0009>;
 .
 
 <dg0009> a rdb2rdftest:DirectMapping ;	
--- a/D009-2tables1primarykey1foreingkey/mapped.nq	Mon Aug 29 22:45:00 2011 +0100
+++ b/D009-2tables1primarykey1foreingkey/mapped.nq	Wed Aug 31 22:08:04 2011 +0100
@@ -1,6 +1,6 @@
 <http://example.com/resource/student_10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/ontology/Student> <http://example.org/graph/students> .
 <http://example.com/resource/student_10> <http://xmlns.com/foaf/0.1/name> "Venus Williams" <http://example.org/graph/students> .
-<http://example.com/resource/student_20> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/ontology/Student> <http://example.org/graph/students>.
+<http://example.com/resource/student_20> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/ontology/Student> <http://example.org/graph/students> .
 <http://example.com/resource/student_20> <http://xmlns.com/foaf/0.1/name> "Demi Moore" <http://example.org/graph/students> .
 <http://example.com/resource/sport_100> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/ontology/Sport> <http://example.org/graph/sports> .
 <http://example.com/resource/sport_100> <http://www.w3.org/2000/01/rdf-schema#label> "Tennis" <http://example.org/graph/sports> .
--- a/D009-2tables1primarykey1foreingkey/r2rml.ttl	Mon Aug 29 22:45:00 2011 +0100
+++ b/D009-2tables1primarykey1foreingkey/r2rml.ttl	Wed Aug 31 22:08:04 2011 +0100
@@ -28,9 +28,9 @@
       rr:graphMap [ rr:graph <http://example.com/graph/students> ];
     ];
 
-    rr:predicateObjectMap
+    rr:refPredicateObjectMap
     [ 
-      rr:predicateMap [ rr:predicate <http://example.com/ontology/practises> ]; 
+      rr:refPredicateMap [ rr:predicate <http://example.com/ontology/practises> ]; 
       rr:refObjectMap    [ 
            rr:parentTriplesMap <TriplesMap2>;
            rr:joinCondition [
@@ -43,7 +43,7 @@
     .
 
 <TriplesMap2>
-    a rr:TriplesMap;
+    a rr:TriplesMapClass;
         
 		
 	rr:logicalTable [ rr:tableName  "Sport" ];
--- a/D011-M2MRelations/manifest.ttl	Mon Aug 29 22:45:00 2011 +0100
+++ b/D011-M2MRelations/manifest.ttl	Wed Aug 31 22:08:04 2011 +0100
@@ -7,9 +7,7 @@
 	dcterms:title "Many to Many relations" ;
 	dcterms:identifier "D011-M2MRelations" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
-	rdb2rdftest:relatedTestCase <dg0011> ;
-	rdb2rdftest:relatedTestCase <tc0011a> ;	
-	rdb2rdftest:relatedTestCase <tc0011b> ;		
+	rdb2rdftest:relatedTestCase <dg0011>, <tc0011a>, <tc0011b>;
 .
 
 <dg0011> a rdb2rdftest:DirectMapping ;	
--- a/D011-M2MRelations/mappeda.nq	Mon Aug 29 22:45:00 2011 +0100
+++ b/D011-M2MRelations/mappeda.nq	Wed Aug 31 22:08:04 2011 +0100
@@ -1,20 +1,17 @@
 <http://example.com/110Tennis> <http://example.com/description> "Tennis" .
 <http://example.com/110Tennis> <http://example.com/id> "110"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<http://example.com/110Tennis> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Sport> .
 <http://example.com/10VenusWilliams> <http://example.com/plays> <http://example.com/110Tennis> .
 <http://example.com/10VenusWilliams> <http://xmlns.com/foaf/0.1/lastName> "Williams" .
 <http://example.com/10VenusWilliams> <http://xmlns.com/foaf/0.1/firstName> "Venus" .
 <http://example.com/10VenusWilliams> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
 <http://example.com/111Football> <http://example.com/description> "Football" .
 <http://example.com/111Football> <http://example.com/id> "111"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<http://example.com/111Football> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Sport> .
 <http://example.com/12DavidVilla> <http://example.com/plays> <http://example.com/111Football> .
 <http://example.com/12DavidVilla> <http://xmlns.com/foaf/0.1/lastName> "Villa" .
 <http://example.com/12DavidVilla> <http://xmlns.com/foaf/0.1/firstName> "David" .
 <http://example.com/12DavidVilla> <http://example.com/id> "12"^^<http://www.w3.org/2001/XMLSchema#integer> .
 <http://example.com/112Formula1> <http://example.com/description> "Formula1" .
 <http://example.com/112Formula1> <http://example.com/id> "112"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<http://example.com/112Formula1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Sport> .
 <http://example.com/11FernandoAlonso> <http://example.com/plays> <http://example.com/112Formula1> .
 <http://example.com/11FernandoAlonso> <http://example.com/plays> <http://example.com/111Football> .
 <http://example.com/11FernandoAlonso> <http://xmlns.com/foaf/0.1/lastName> "Alonso" .
--- a/D011-M2MRelations/r2rmlb.ttl	Mon Aug 29 22:45:00 2011 +0100
+++ b/D011-M2MRelations/r2rmlb.ttl	Wed Aug 31 22:08:04 2011 +0100
@@ -5,8 +5,7 @@
 @base <http://mappingpedia.org/rdb2rdf/r2rml/tc/> .
 
 <TriplesMap1>
-	a rr:TriplesMap;
-    rr:logicalTable [ rr:tableName "Student"; ] ;
+    rr:logicalTable [ rr:tableName "Student"; ]
     rr:subjectMap [
         rr:template "http://example.com/student/{ID}";
         rr:class ex:Student;
@@ -25,8 +24,7 @@
 	.	
     
 <TriplesMap2>
-	a rr:TriplesMap;
-    rr:logicalTable [ rr:tableName "Sport"; ] ;
+    rr:logicalTable [ rr:tableName "Sport"; ]
     rr:subjectMap [
         rr:template "http://example.com/sport/{ID}";
         rr:class ex:Sport;
@@ -45,7 +43,7 @@
 	.
 
 <LinkMap_1_2>
-   a rr:TriplesMap; 
+   
    rr:logicalTable [ rr:tableName "Student_Sport" ];
    
    rr:subjectMap [ rr:template "http://example.com/student/{ID_Student}" ];
--- a/D012-2tables2duplicates0nulls/create.sql	Mon Aug 29 22:45:00 2011 +0100
+++ b/D012-2tables2duplicates0nulls/create.sql	Wed Aug 31 22:08:04 2011 +0100
@@ -5,11 +5,10 @@
 INSERT INTO IOUs (fname, lname, amount) VALUES ('Bob', 'Smith', 30);
 INSERT INTO IOUs (fname, lname, amount) VALUES ('Sue', 'Jones', 20);
 INSERT INTO IOUs (fname, lname, amount) VALUES ('Bob', 'Smith', 30);
-
 CREATE TABLE Lives (
       fname CHAR(20),
       lname CHAR(20),
       city CHAR(20));
 INSERT INTO Lives (fname, lname, city) VALUES ('Bob', 'Smith', 'London');
 INSERT INTO Lives (fname, lname, city) VALUES ('Sue', 'Jones', 'Madrid');
-INSERT INTO Lives (fname, lname, city) VALUES ('Bob', 'Smith', 'London');
+INSERT INTO Lives (fname, lname, city) VALUES ('Bob', 'Smith', 'London');
\ No newline at end of file
--- a/D012-2tables2duplicates0nulls/manifest.ttl	Mon Aug 29 22:45:00 2011 +0100
+++ b/D012-2tables2duplicates0nulls/manifest.ttl	Wed Aug 31 22:08:04 2011 +0100
@@ -8,10 +8,7 @@
 	dcterms:title "Two tables two duplicates zero nulls" ;
 	dcterms:identifier "D012-2tables2duplicates0nulls" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
-	rdb2rdftest:relatedTestCase <tc0012a> ;
-	rdb2rdftest:relatedTestCase <tc0012b> ;
-	rdb2rdftest:relatedTestCase <tc0012c> ;	
-	rdb2rdftest:relatedTestCase <tc0012d> ;		
+	rdb2rdftest:relatedTestCase <tc0012a>, <tc0012b>, <tc0012c>, <tc0012d> ;
 .
 
 <tc0012a> a rdb2rdftest:R2RML ;	
--- a/D012-2tables2duplicates0nulls/r2rmla.ttl	Mon Aug 29 22:45:00 2011 +0100
+++ b/D012-2tables2duplicates0nulls/r2rmla.ttl	Wed Aug 31 22:08:04 2011 +0100
@@ -11,7 +11,7 @@
 	
     rr:subjectMap [
             rr:template "{fname}_{lname}_{amount}"; 
-            rr:termType rr:BlankNode;
+            rr:termtype rr:BlankNode;
             rr:class ex:IOU; 
       ];
 	
@@ -20,7 +20,7 @@
       rr:predicateMap [ rr:predicate foaf:name ]; 
       rr:objectMap    [ 
             rr:template "{fname} {lname}";
-            rr:termType rr:Literal ;
+            rr:termtype rr:Literal ;
       ]
     ];
     
@@ -29,7 +29,7 @@
       rr:predicateMap [ rr:predicate ex:amount ]; 
       rr:objectMap    [ 
             rr:column "amount";
-            rr:termType rr:Literal ;
+            rr:termtype rr:Literal ;
             rr:datatype xsd:float ;
       ]
     ];
--- a/D012-2tables2duplicates0nulls/r2rmlb.ttl	Mon Aug 29 22:45:00 2011 +0100
+++ b/D012-2tables2duplicates0nulls/r2rmlb.ttl	Wed Aug 31 22:08:04 2011 +0100
@@ -11,7 +11,7 @@
 	
     rr:subjectMap [
             rr:template "{fname}_{lname}"; 
-            rr:termType rr:BlankNode ;
+            rr:termtype rr:BlankNode ;
             rr:class ex:IOU; 
       ];
 	
@@ -20,7 +20,7 @@
       rr:predicateMap [ rr:predicate foaf:name ]; 
       rr:objectMap    [ 
             rr:template "{fname} {lname}";
-            rr:termType rr:Literal ;
+            rr:termtype rr:Literal ;
       ]
     ];
     .
@@ -31,8 +31,8 @@
 
     rr:subjectMap [
             rr:template "{fname}_{lname}"; 
-            rr:termType rr:BlankNode;
-            rr:class ex:Lives; 
+            rr:termtype rr:BlankNode;
+            rr:class ex:IOU; 
       ];
 	
     rr:predicateObjectMap
@@ -40,7 +40,7 @@
       rr:predicateMap [ rr:predicate ex:city ]; 
       rr:objectMap    [ 
             rr:column "city";
-            rr:termType rr:Literal ; 
+            rr:termtype rr:Literal ; 
       ]
     ];
 	.
\ No newline at end of file
--- a/D013-1table3columns2rows1nullvalue/directGraph.nt	Mon Aug 29 22:45:00 2011 +0100
+++ b/D013-1table3columns2rows1nullvalue/directGraph.nt	Wed Aug 31 22:08:04 2011 +0100
@@ -3,10 +3,8 @@
 <Person#DateOfBirth> rdfs:domain <Person> .
 
 <Person/ID=1> a <Person> .
-<Person/ID=1> <Person#ID> 1 .
 <Person/ID=1> <Person#Name> "Alice" .
 
 <Person/ID=2> a <Person> .
-<Person/ID=2> <Person#ID> 2 .
 <Person/ID=2> <Person#Name> "Bob" .
 <Person/ID=2> <Person#DateOfBirth> "September, 2010" .
\ No newline at end of file
--- a/D014-3tablesExample/create.sql	Mon Aug 29 22:45:00 2011 +0100
+++ b/D014-3tablesExample/create.sql	Wed Aug 31 22:08:04 2011 +0100
@@ -17,5 +17,4 @@
       likeType VARCHAR(30),
       likedObj VARCHAR(100));
 INSERT INTO LIKES (id, likeType, likedObj) VALUES (7369, 'Playing', 'Soccer');
-INSERT INTO LIKES (id, likeType, likedObj) VALUES (7369, 'Watching', 'Basketball');
-
+INSERT INTO LIKES (id, likeType, likedObj) VALUES (7369, 'Watching', 'Basketball');
\ No newline at end of file
--- a/D014-3tablesExample/manifest.ttl	Mon Aug 29 22:45:00 2011 +0100
+++ b/D014-3tablesExample/manifest.ttl	Wed Aug 31 22:08:04 2011 +0100
@@ -8,11 +8,7 @@
 	dcterms:title "3 tables extended example" ;
 	dcterms:identifier "D014-3tablesExample" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
-	rdb2rdftest:relatedTestCase <tc0014a> ;
-	rdb2rdftest:relatedTestCase <tc0014b> ;
-	rdb2rdftest:relatedTestCase <tc0014c> ;	
-	rdb2rdftest:relatedTestCase <tc0014d> ;
-	rdb2rdftest:relatedTestCase <tc0014e> ;	
+	rdb2rdftest:relatedTestCase <tc0014a>, <tc0014b>, <tc0014c>, <tc0014d>, <tc0014e> ;
 .
 
 <tc0014a> a rdb2rdftest:R2RML ;	
--- a/D014-3tablesExample/mappedb.nq	Mon Aug 29 22:45:00 2011 +0100
+++ b/D014-3tablesExample/mappedb.nq	Wed Aug 31 22:08:04 2011 +0100
@@ -1,8 +1,8 @@
 <http://example.com/emp/7369> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/ns#emp> <http://example.com/graph/CLERK/PART_TIME> .
-<http://example.com/emp/7369> <http://example.com/emp#jobtype>	<http://example.com/emp/job/CLERK>	<http://example.com/graph/CLERK/PART_TIME> .
-<http://example.com/emp/7369> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/emp/job/CLERK>	<http://example.com/graph/CLERK/PART_TIME> .
-<http://example.com/emp/7369> <http://example.com/emp#emptype> <http://example.com/emp/etype/PART_TIME>	<http://example.com/graph/CLERK/PART_TIME> .
-<http://example.com/emp/7369> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/emp/etype/PART_TIME>  <http://example.com/graph/CLERK/PART_TIME> .
+<http://example.com/emp/7369> <http://example.com/emp#jobtype> <http://example.com/emp/job/CLERK> <http://example.com/graph/CLERK/PART_TIME> .
+<http://example.com/emp/7369> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/emp/job/CLERK> <http://example.com/graph/CLERK/PART_TIME> .
+<http://example.com/emp/7369> <http://example.com/emp#emptype> <http://example.com/emp/etype/PART_TIME> <http://example.com/graph/CLERK/PART_TIME> .
+<http://example.com/emp/7369> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/emp/etype/PART_TIME> <http://example.com/graph/CLERK/PART_TIME> .
 <http://example.com/emp/7369> <http://example.com/emp#empno> "7369"^^<http://www.w3.org/2001/XMLSchema#integer>	<http://example.com/graph/CLERK/PART_TIME> .
 <http://example.com/emp/7369> <http://example.com/emp#name> "SMITH"	<http://example.com/graph/CLERK/PART_TIME> .
 <http://example.com/emp/7369> <http://example.com/emp#job> "CLERK" <http://example.com/graph/CLERK/PART_TIME> .
--- a/D014-3tablesExample/r2rmla.ttl	Mon Aug 29 22:45:00 2011 +0100
+++ b/D014-3tablesExample/r2rmla.ttl	Wed Aug 31 22:08:04 2011 +0100
@@ -9,11 +9,11 @@
 <TriplesMap1>
     a rr:TriplesMap;
     rr:logicalTable [ rr:sqlQuery """
-       Select ('Department' || deptno) AS deptId
-            , deptno
-            , dname
-            , loc
-         from DEPT
+       Select ('Department' || "deptno") AS "deptId"
+            , "deptno"
+            , "dname"
+            , "loc"
+         from SCOTT.DEPT
        """ ];
 
     rr:subjectMap [ rr:column "deptId"; rr:termType rr:BlankNode;
--- a/D014-3tablesExample/r2rmlb.ttl	Mon Aug 29 22:45:00 2011 +0100
+++ b/D014-3tablesExample/r2rmlb.ttl	Wed Aug 31 22:08:04 2011 +0100
@@ -60,7 +60,7 @@
             , ('http://example.com/emp/etype/'|| etype) AS empTypeURI
             , etype
             , ('http://example.com/graph/'|| job || '/' || etype) AS graphURI
-       from EMP
+       from SCOTT.EMP
        """ ];
 
     rr:subjectMap [ rr:column "empURI";