fixing some minor things on R2RML tcs
authorBoris Villazon-Terrazas <bvillazon@fi.upm.es>
Tue, 01 Nov 2011 02:46:29 +0100
changeset 33 c7e916bd1560
parent 32 a0d067996b1a
child 34 b65581772625
fixing some minor things on R2RML tcs
D000-1table0rows/manifest.ttl
D002-1table2columns1row/mappedd.nq
D002-1table2columns1row/r2rmlh.ttl
D002-1table2columns1row/r2rmli.ttl
D003-1table3columns1row/manifest.ttl
D003-1table3columns1row/mappedc.nq
D003-1table3columns1row/mappedd.nq
D004-1table2columnsprojection/r2rmlb.ttl
D007-1table1primarykey2columns1row/manifest.ttl
D008-1table1compositeprimarykey3columns1row/manifest.ttl
D008-1table1compositeprimarykey3columns1row/mappeda.nq
D009-2tables1primarykey1foreingkey/manifest.ttl
D009-2tables1primarykey1foreingkey/r2rmla.ttl
D010-SpecialChars/manifest.ttl
D011-M2MRelations/manifest.ttl
D012-2tables2duplicates0nulls/manifest.ttl
D013-1table3columns2rows1nullvalue/manifest.ttl
D014-3tablesExample/manifest.ttl
D014-3tablesExample/mappedd.nq
D014-3tablesExample/r2rmla.ttl
D014-3tablesExample/r2rmlb.ttl
D014-3tablesExample/r2rmlc.ttl
D014-3tablesExample/r2rmld.ttl
D014-3tablesExample/r2rmle.ttl
D015-1tableSeveralLanguages/manifest.ttl
D016-1tableSQLdatatypes/manifest.ttl
--- a/D000-1table0rows/manifest.ttl	Tue Oct 25 20:16:01 2011 +0200
+++ b/D000-1table0rows/manifest.ttl	Tue Nov 01 02:46:29 2011 +0100
@@ -23,7 +23,7 @@
 
 <tc0000> a rdb2rdftest:R2RML ;	
 	dcterms:title "Empty table" ; 
-	dcterms:identifier "R2RMLTC000" ;
+	dcterms:identifier "R2RMLTC0000" ;
 	test:purpose "Tests if an empty table produces an empty RDF graph" ;
 	test:specificationReference "#physical-tables" ;
 	test:reviewStatus test:unreviewed ;
--- a/D002-1table2columns1row/mappedd.nq	Tue Oct 25 20:16:01 2011 +0200
+++ b/D002-1table2columns1row/mappedd.nq	Tue Nov 01 02:46:29 2011 +0100
@@ -1,3 +1,3 @@
-<http://example.com/10Venus> <http://xmlns.com/foaf/0.1/name> "Venus" .
-<http://example.com/10Venus> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<http://example.com/10Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+_:Student10 <http://xmlns.com/foaf/0.1/name> "Venus" .
+_:Student10 <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
+_:Student10 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
--- a/D002-1table2columns1row/r2rmlh.ttl	Tue Oct 25 20:16:01 2011 +0200
+++ b/D002-1table2columns1row/r2rmlh.ttl	Tue Nov 01 02:46:29 2011 +0100
@@ -13,7 +13,7 @@
                             , "ID"
                             , "Name"
 					, "ID"
-                       from "boricles.Student"
+                       from "SA.Student"
                        """
                        ];
 
--- a/D002-1table2columns1row/r2rmli.ttl	Tue Oct 25 20:16:01 2011 +0200
+++ b/D002-1table2columns1row/r2rmli.ttl	Tue Nov 01 02:46:29 2011 +0100
@@ -12,10 +12,10 @@
                        Select ('Student' || ID ) AS StudentId
                             , ID
                             , Name
-                         from boricles.Student
+                         from SA.Student
                        """;
 					   
-			rr:sqlVersion rr:SQL2008 .					   
+			rr:sqlVersion rr:SQL2008 				   
 					   
                        ];
 	
--- a/D003-1table3columns1row/manifest.ttl	Tue Oct 25 20:16:01 2011 +0200
+++ b/D003-1table3columns1row/manifest.ttl	Tue Nov 01 02:46:29 2011 +0100
@@ -36,7 +36,7 @@
 <tc0003b> a rdb2rdftest:R2RML ;	
 	dcterms:title "Two columns mapping" ; 
 	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:purpose "Tests: (1) two column mapping, no primary key; (2) one column to one property and (3) from template feature" ;
 	test:specificationReference "#from-template"  ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d003> ;
@@ -49,7 +49,7 @@
 	dcterms:title "Two columns mapping" ; 
 	dcterms:identifier "R2RMLTC0003c" ;
 	test:purpose "Tests rr:termType rr:BlankNode and rr:Literal" ;
-	test:specificationReference "#from-template"  ;
+	test:specificationReference "#termtype"  ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d003> ;
 	rdb2rdftest:output "mappedc.nq" ;
--- a/D003-1table3columns1row/mappedc.nq	Tue Oct 25 20:16:01 2011 +0200
+++ b/D003-1table3columns1row/mappedc.nq	Tue Nov 01 02:46:29 2011 +0100
@@ -1,4 +1,4 @@
-_:10VenusWilliams <http://xmlns.com/foaf/0.1/lastName> "Williams" .
-_:10VenusWilliams <http://xmlns.com/foaf/0.1/firstName> "Venus" .
-_:10VenusWilliams <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
+_:Student10VenusWilliams <http://xmlns.com/foaf/0.1/lastName> "Williams" .
+_:Student10VenusWilliams <http://xmlns.com/foaf/0.1/firstName> "Venus" .
+_:Student10VenusWilliams <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
 
--- a/D003-1table3columns1row/mappedd.nq	Tue Oct 25 20:16:01 2011 +0200
+++ b/D003-1table3columns1row/mappedd.nq	Tue Nov 01 02:46:29 2011 +0100
@@ -1,4 +1,4 @@
-<http://example.com/10VenusWilliams> <http://xmlns.com/foaf/0.1/firstName> <http://example.com/data/Venus> .
-<http://example.com/10VenusWilliams> <http://example.com//lastName> <http://example.com/data/Williams> .
-<http://example.com/10VenusWilliams> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/Student10VenusWilliams> <http://xmlns.com/foaf/0.1/firstName> <http://example.com/data/Venus> .
+<http://example.com/Student10VenusWilliams> <http://example.com//lastName> <http://example.com/data/Williams> .
+<http://example.com/Student10VenusWilliams> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
 
--- a/D004-1table2columnsprojection/r2rmlb.ttl	Tue Oct 25 20:16:01 2011 +0200
+++ b/D004-1table2columnsprojection/r2rmlb.ttl	Tue Nov 01 02:46:29 2011 +0100
@@ -7,8 +7,9 @@
 <TriplesMap1>
     a rr:TriplesMap;
 
-      rr:logicalTable [ rr:SQLQuery """
-       Select ('Student' || Student) AS StudentId
+      rr:logicalTable [ rr:sqlQuery """
+       Select ('Student' || Student) AS StudentId,
+				Student
          from Student_Sport
        """;
 	   ] ;
@@ -26,10 +27,12 @@
 <TriplesMap2>
     a rr:TriplesMap;
 
-      rr:SQLQuery """
-       Select ('Sport' || Sport) AS SportId
+      rr:logicalTable [ rr:sqlQuery """
+       Select ('Sport' || Sport) AS SportId,
+			Sport
          from Student_Sport
        """;
+	  ];
 
     rr:subjectMap [ rr:column "SportId"; rr:termType rr:BlankNode;
                     rr:class ex:Sport  ];
--- a/D007-1table1primarykey2columns1row/manifest.ttl	Tue Oct 25 20:16:01 2011 +0200
+++ b/D007-1table1primarykey2columns1row/manifest.ttl	Tue Nov 01 02:46:29 2011 +0100
@@ -7,7 +7,7 @@
 	dcterms:title "One table, one column, one primary key" ;
 	dcterms:identifier "D007-1table1primarykey2columns1row" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
-	rdb2rdftest:relatedTestCase <dg0007>, <tc0007a>, <tc0007b>, <tc0007c>, <tc0007d> ;
+	rdb2rdftest:relatedTestCase <dg0007>, <tc0007a>, <tc0007b>, <tc0007c>, <tc0007d>, <tc0007e>, <tc0007f>  ;
 .
 
 <dg0007> a rdb2rdftest:DirectMapping ;	
@@ -25,7 +25,7 @@
 	dcterms:title "One column mapping" ; 
 	dcterms:identifier "R2RMLTC0007a" ;
 	test:purpose "Tests constant-value term map by using rr:constant property" ;
-	test:specificationReference "#termtype" ;
+	test:specificationReference "#constant" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d007> ;
 	rdb2rdftest:output "mappeda.nq" ;
@@ -37,7 +37,7 @@
 	dcterms:title "One column mapping" ; 
 	dcterms:identifier "R2RMLTC0007b" ;
 	test:purpose "Tests constant-value term map by using constant shortcut properties rr:predicate, rr:object and rr:graph. Also directly using rr:tableName" ;
-	test:specificationReference "#termtype" ;
+	test:specificationReference "#constant" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d007> ;
 	rdb2rdftest:output "mappedb.nq" ;
@@ -49,7 +49,7 @@
 	dcterms:title "One column mapping" ; 
 	dcterms:identifier "R2RMLTC0007c" ;
 	test:purpose "Tests subjectmap with more than one class IRIs, rr:class" ;
-	test:specificationReference "#termtype" ;
+	test:specificationReference "#typing" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d007> ;
 	rdb2rdftest:output "mappedc.nq" ;
@@ -60,11 +60,35 @@
 <tc0007d> a rdb2rdftest:R2RML ;	
 	dcterms:title "One column mapping" ; 
 	dcterms:identifier "R2RMLTC0007d" ;
-	test:purpose "Tests subjectmap with an alternative of having rr:class, i.e., by specifying an rr:predicateObjectMap with predicate rdf:type" ;
-	test:specificationReference "#termtype" ;
+	test:purpose " Tests subjectmap with an alternative of having rr:class, i.e., by specifying an rr:predicateObjectMap with predicate rdf:type" ;
+	test:specificationReference "#typing" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d007> ;
 	rdb2rdftest:output "mappedd.nq" ;
 	rdb2rdftest:hasExpectedOutput true ;
 	rdb2rdftest:mappingDocument "r2rmld.ttl" ;
 .
+
+<tc0007e> a rdb2rdftest:R2RML ;	
+	dcterms:title "One column mapping" ; 
+	dcterms:identifier "R2RMLTC0007e" ;
+	test:purpose "Tests subjectmap with rr:graphMap and rr:class" ;
+	test:specificationReference "#named-graphs" ;
+	test:reviewStatus test:unreviewed ;
+	rdb2rdftest:database <d007> ;
+	rdb2rdftest:output "mappede.nq" ;
+	rdb2rdftest:hasExpectedOutput true ;
+	rdb2rdftest:mappingDocument "r2rmle.ttl" ;
+.
+
+<tc0007f> a rdb2rdftest:R2RML ;	
+	dcterms:title "One column mapping" ; 
+	dcterms:identifier "R2RMLTC0007f" ;
+	test:purpose "Tests subjectmap with rr:graphMap and specifying an rr:predicateObjectMap with predicate rdf:type" ;
+	test:specificationReference "#named-graphs" ;
+	test:reviewStatus test:unreviewed ;
+	rdb2rdftest:database <d007> ;
+	rdb2rdftest:output "mappedf.nq" ;
+	rdb2rdftest:hasExpectedOutput true ;
+	rdb2rdftest:mappingDocument "r2rmlf.ttl" ;
+.
--- a/D008-1table1compositeprimarykey3columns1row/manifest.ttl	Tue Oct 25 20:16:01 2011 +0200
+++ b/D008-1table1compositeprimarykey3columns1row/manifest.ttl	Tue Nov 01 02:46:29 2011 +0100
@@ -7,7 +7,7 @@
 	dcterms:title "Composite primary key" ;
 	dcterms:identifier "D008-1table1compositeprimarykey3columns1row" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
-	rdb2rdftest:relatedTestCase <dg0008>, <tc008a> ;
+	rdb2rdftest:relatedTestCase <dg0008>, <tc0008a> ;
 .
 
 <dg0008> a rdb2rdftest:DirectMapping ;	
@@ -22,9 +22,9 @@
 .
 
 
-<tc008a> a rdb2rdftest:R2RML ;	
+<tc0008a> a rdb2rdftest:R2RML ;	
 	dcterms:title "Table with datatypes" ; 
-	dcterms:identifier "R2RMLTC008a" ;
+	dcterms:identifier "R2RMLTC0008a" ;
 	test:purpose "Test that results of the mapping can be directed to a target graph." ;
 	test:specificationReference "#named-graphs" ;
 	test:reviewStatus test:unreviewed ;
--- a/D008-1table1compositeprimarykey3columns1row/mappeda.nq	Tue Oct 25 20:16:01 2011 +0200
+++ b/D008-1table1compositeprimarykey3columns1row/mappeda.nq	Tue Nov 01 02:46:29 2011 +0100
@@ -1,4 +1,4 @@
-<http://example.com/Student10Venus%20Williams> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/graph/Student10Venus%20Williams> .
+<http://example.com/Student10Venus%20Williams> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> <http://example.com/graph/Student10Venus%20Williams> .
 <http://example.com/Student10Venus%20Williams> <http://xmlns.com/foaf/0.1/name> "Venus Williams" <http://example.com/graph/Student10Venus%20Williams> .
 <http://example.com/Student10Venus%20Williams> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example.com/graph/Student10Venus%20Williams> . 
 <http://example.com/Student10Venus%20Williams> <http://example.com/Sport> "Tennis" <http://example.com/graph/Student10Venus%20Williams> . 
--- a/D009-2tables1primarykey1foreingkey/manifest.ttl	Tue Oct 25 20:16:01 2011 +0200
+++ b/D009-2tables1primarykey1foreingkey/manifest.ttl	Tue Nov 01 02:46:29 2011 +0100
@@ -23,7 +23,7 @@
 
 <tc0009a> a rdb2rdftest:R2RML ;	
 	dcterms:title "Two tables to 1 primary key 1 foreing key" ; 
-	dcterms:identifier "R2RMLTC009a" ;
+	dcterms:identifier "R2RMLTC0009a" ;
 	test:purpose "Test foreign key relationships among logical tables" ;
 	test:specificationReference "#foreign-key" ;
 	test:reviewStatus test:unreviewed ;
@@ -35,7 +35,7 @@
 
 <tc0009b> a rdb2rdftest:R2RML ;	
 	dcterms:title "Two tables to multiple graphs" ; 
-	dcterms:identifier "R2RMLTC009b" ;
+	dcterms:identifier "R2RMLTC0009b" ;
 	test:purpose "Test that results from distinct parts of the mapping can be directed to different target graphs." ;
 	test:specificationReference "#named-graphs" ;
 	test:reviewStatus test:unreviewed ;
--- a/D009-2tables1primarykey1foreingkey/r2rmla.ttl	Tue Oct 25 20:16:01 2011 +0200
+++ b/D009-2tables1primarykey1foreingkey/r2rmla.ttl	Tue Nov 01 02:46:29 2011 +0100
@@ -26,9 +26,9 @@
       ];
     ];
 
-    rr:refPredicateObjectMap
+    rr:predicateObjectMap
     [ 
-      rr:refPredicateMap [ rr:constant <http://example.com/ontology/practises> ]; 
+      rr:predicateMap [ rr:constant <http://example.com/ontology/practises> ]; 
       rr:refObjectMap    [ 
            rr:parentTriplesMap <TriplesMap2>;
            rr:joinCondition [
@@ -40,8 +40,7 @@
     .
 
 <TriplesMap2>
-    a rr:TriplesMapClass;
-        
+    a rr:TriplesMap;
 		
 	rr:logicalTable [ rr:tableName  "Sport" ];
 
--- a/D010-SpecialChars/manifest.ttl	Tue Oct 25 20:16:01 2011 +0200
+++ b/D010-SpecialChars/manifest.ttl	Tue Nov 01 02:46:29 2011 +0100
@@ -12,7 +12,7 @@
 
 <tc0010a> a rdb2rdftest:R2RML ;	
 	dcterms:title "Table with Special Chars" ; 
-	dcterms:identifier "R2RMLTC010a" ;
+	dcterms:identifier "R2RMLTC0010a" ;
 	test:purpose "Tests a template with blank space in column" ;
 	test:specificationReference "#dfn-template-valued-term-map" ;
 	test:reviewStatus test:unreviewed ;
@@ -24,7 +24,7 @@
 
 <tc0010b> a rdb2rdftest:R2RML ;	
 	dcterms:title "Table with Special Chars" ; 
-	dcterms:identifier "R2RMLTC010b" ;
+	dcterms:identifier "R2RMLTC0010b" ;
 	test:purpose "Tests a template with special chars in column value" ;
 	test:specificationReference "#dfn-template-valued-term-map" ;
 	test:reviewStatus test:unreviewed ;
@@ -36,7 +36,7 @@
 
 <tc0010c> a rdb2rdftest:R2RML ;	
 	dcterms:title "Table with Special Chars" ; 
-	dcterms:identifier "R2RMLTC010c" ;
+	dcterms:identifier "R2RMLTC0010c" ;
 	test:purpose "Tests a template with special chars in column value and backslash escapes in string templates" ;
 	test:specificationReference "#dfn-template-valued-term-map" ;
 	test:reviewStatus test:unreviewed ;
--- a/D011-M2MRelations/manifest.ttl	Tue Oct 25 20:16:01 2011 +0200
+++ b/D011-M2MRelations/manifest.ttl	Tue Nov 01 02:46:29 2011 +0100
@@ -23,7 +23,7 @@
 
 <tc0011a> a rdb2rdftest:R2RML ;	
 	dcterms:title "M to N relation, by using a SQL query" ; 
-	dcterms:identifier "R2RMLTC011a" ;
+	dcterms:identifier "R2RMLTC0011a" ;
 	test:purpose "Tests, M to N relations, by using a SQL query" ;
 	test:specificationReference "#r2rml-views" ;
 	test:reviewStatus test:unreviewed ;
@@ -35,7 +35,7 @@
 
 <tc0011b> a rdb2rdftest:R2RML ;	
 	dcterms:title "M to N relation, by using an additional Triples Map" ; 
-	dcterms:identifier "R2RMLTC011b" ;
+	dcterms:identifier "R2RMLTC0011b" ;
 	test:purpose "Tests, M to N relations, by using an additional Triples Map" ;
 	test:specificationReference "#termtype" ;
 	test:reviewStatus test:unreviewed ;
--- a/D012-2tables2duplicates0nulls/manifest.ttl	Tue Oct 25 20:16:01 2011 +0200
+++ b/D012-2tables2duplicates0nulls/manifest.ttl	Tue Nov 01 02:46:29 2011 +0100
@@ -13,7 +13,7 @@
 
 <tc0012a> a rdb2rdftest:R2RML ;	
 	dcterms:title "Duplicate tuples generate same blank node" ; 
-	dcterms:identifier "R2RMLTC012a" ;
+	dcterms:identifier "R2RMLTC0012a" ;
 	test:purpose "Tests that blank nodes with same identifier and in the same graph but generated by different logical rows are considered equivalent." ;
 	test:specificationReference "#termtype" ;
 	test:reviewStatus test:unreviewed ;
@@ -25,7 +25,7 @@
 
 <tc0012b> a rdb2rdftest:R2RML ;	
 	dcterms:title "Duplicate tuples generate same blank node" ; 
-	dcterms:identifier "R2RMLTC012b" ;
+	dcterms:identifier "R2RMLTC0012b" ;
 	test:purpose "Tests that blank nodes with same identifier and in the same graph but generated by different logical rows are considered equivalent." ;
 	test:specificationReference "#termtype" ;
 	test:reviewStatus test:unreviewed ;
@@ -37,7 +37,7 @@
 
 <tc0012c> a rdb2rdftest:R2RML ;	
 	dcterms:title "TriplesMap without subjectMap" ; 
-	dcterms:identifier "R2RMLTC012c" ;
+	dcterms:identifier "R2RMLTC0012c" ;
 	test:purpose "Tests a R2RML with missing information, TriplesMap without subjectMap." ;
 	test:specificationReference "#data-errors" ;
 	test:reviewStatus test:unreviewed ;
@@ -48,7 +48,7 @@
 
 <tc0012d> a rdb2rdftest:R2RML ;	
 	dcterms:title "TriplesMap with two subjectMap" ; 
-	dcterms:identifier "R2RMLTC012d" ;
+	dcterms:identifier "R2RMLTC0012d" ;
 	test:purpose "Tests a R2RML with wrong information, TriplesMap with two subjectMap." ;
 	test:specificationReference "#data-errors" ;
 	test:reviewStatus test:unreviewed ;
--- a/D013-1table3columns2rows1nullvalue/manifest.ttl	Tue Oct 25 20:16:01 2011 +0200
+++ b/D013-1table3columns2rows1nullvalue/manifest.ttl	Tue Nov 01 02:46:29 2011 +0100
@@ -23,7 +23,7 @@
 
 <tc0013a> a rdb2rdftest:R2RML ;	
 	dcterms:title "Duplicate tuples generate same blank node" ; 
-	dcterms:identifier "R2RMLTC013a" ;
+	dcterms:identifier "R2RMLTC0013a" ;
 	test:purpose "Tests the presence of null values in a template valued term map" ;
 	test:specificationReference "#dfn-template-valued-term-map" ;
 	test:reviewStatus test:unreviewed ;
--- a/D014-3tablesExample/manifest.ttl	Tue Oct 25 20:16:01 2011 +0200
+++ b/D014-3tablesExample/manifest.ttl	Tue Nov 01 02:46:29 2011 +0100
@@ -13,7 +13,7 @@
 
 <tc0014a> a rdb2rdftest:R2RML ;	
 	dcterms:title "3 tables extended example" ; 
-	dcterms:identifier "R2RMLTC014a" ;
+	dcterms:identifier "R2RMLTC0014a" ;
 	test:purpose "Tests a logicaltable with sqlQuery" ;
 	test:specificationReference "#dfn-graph-map" ;
 	test:reviewStatus test:unreviewed ;
@@ -25,7 +25,7 @@
 
 <tc0014b> a rdb2rdftest:R2RML ;	
 	dcterms:title "3 tables extended example" ; 
-	dcterms:identifier "R2RMLTC014b" ;
+	dcterms:identifier "R2RMLTC0014b" ;
 	test:purpose "Mapping specification using SQL-based logical table definition" ;
 	test:specificationReference "#inverse" ;
 	test:reviewStatus test:unreviewed ;
@@ -37,7 +37,7 @@
 
 <tc0014c> a rdb2rdftest:R2RML ;	
 	dcterms:title "3 tables extended example" ; 
-	dcterms:identifier "R2RMLTC014c" ;
+	dcterms:identifier "R2RMLTC0014c" ;
 	test:purpose "Mapping specification using table name based logical table definition" ;
 	test:specificationReference "#foreign-key" ;
 	test:reviewStatus test:unreviewed ;
@@ -49,7 +49,7 @@
 
 <tc0014d> a rdb2rdftest:R2RML ;	
 	dcterms:title "3 tables extended example" ; 
-	dcterms:identifier "R2RMLTC014d" ;
+	dcterms:identifier "R2RMLTC0014d" ;
 	test:purpose "Mapping specification showing reuse of ObjectMap elements" ;
 	test:specificationReference "#foreign-key" ;
 	test:reviewStatus test:unreviewed ;
@@ -61,7 +61,7 @@
 
 <tc0014e> a rdb2rdftest:R2RML ;	
 	dcterms:title "3 tables extended example" ; 
-	dcterms:identifier "R2RMLTC014e" ;
+	dcterms:identifier "R2RMLTC0014e" ;
 	test:purpose "Mapping Specification for the LIKES Table" ;
 	test:specificationReference "#dfn-output-dataset" ;
 	test:reviewStatus test:unreviewed ;
--- a/D014-3tablesExample/mappedd.nq	Tue Oct 25 20:16:01 2011 +0200
+++ b/D014-3tablesExample/mappedd.nq	Tue Nov 01 02:46:29 2011 +0100
@@ -10,3 +10,8 @@
 <http://example.com/emp/7369> <http://example.com/emp#etype> "PART TIME" <http://example.com/graph/CLERK/PART_TIME> .
 <http://example.com/emp/7369> <http://example.com/emp#c_ref_deptno> _:Department10 <http://example.com/graph/CLERK/PART_TIME> .
 <http://example.com/emp/7369> <http://example.com/emp#name> "SMITH" <http://example.com/emp#empNameGraph> .
+_:Department10 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/ns#dept> <http://example.com/ns#DeptGraph> .
+_:Department10 <http://example.com/dept#deptno> "10"^^xsd:positiveInteger <http://example.com/ns#dept> <http://example.com/ns#DeptGraph> .
+_:Department10 <http://example.com/dept#name> "APPSERVER" <http://example.com/ns#dept> <http://example.com/ns#DeptGraph> .
+_:Department10 <http://example.com/dept#location> "NEW YORK" <http://example.com/ns#dept> <http://example.com/ns#DeptGraph> .
+_:Department10 <http://example.com/dept#COMPANY> "EXAMPLE Corporation" <http://example.com/ns#dept> <http://example.com/ns#DeptGraph> .
--- a/D014-3tablesExample/r2rmla.ttl	Tue Oct 25 20:16:01 2011 +0200
+++ b/D014-3tablesExample/r2rmla.ttl	Tue Nov 01 02:46:29 2011 +0100
@@ -13,7 +13,7 @@
             , "deptno"
             , "dname"
             , "loc"
-         from SCOTT.DEPT
+         from SA.DEPT
        """ ];
 
     rr:subjectMap [ rr:column "deptId"; rr:termType rr:BlankNode;
--- a/D014-3tablesExample/r2rmlb.ttl	Tue Oct 25 20:16:01 2011 +0200
+++ b/D014-3tablesExample/r2rmlb.ttl	Tue Nov 01 02:46:29 2011 +0100
@@ -15,7 +15,7 @@
             , deptno
             , dname
             , loc
-         from SCOTT.DEPT
+         from SA.DEPT
        """ ];
 
     rr:subjectMap [ rr:column "deptId"; rr:termType rr:BlankNode;
@@ -60,7 +60,7 @@
             , ('http://example.com/emp/etype/'|| etype) AS empTypeURI
             , etype
             , ('http://example.com/graph/'|| job || '/' || etype) AS graphURI
-       from SCOTT.EMP
+       from SA.EMP
        """ ];
 
     rr:subjectMap [ rr:column "empURI";
--- a/D014-3tablesExample/r2rmlc.ttl	Tue Oct 25 20:16:01 2011 +0200
+++ b/D014-3tablesExample/r2rmlc.ttl	Tue Nov 01 02:46:29 2011 +0100
@@ -16,7 +16,7 @@
             , deptno
             , dname
             , loc
-         from SCOTT.DEPT
+         from SA.DEPT
        """ ];
 
     rr:subjectMap [ rr:column "deptId"; rr:termType rr:BlankNode;
@@ -52,7 +52,7 @@
 <TriplesMap2>
     a rr:TriplesMap;
 
-    rr:logicalTable [ rr:tableName "SCOTT.EMP" ];
+    rr:logicalTable [ rr:tableName "SA.EMP" ];
 
     rr:subjectMap [ rr:template "http://example.com/emp/{empno}";
                     rr:class ex:emp; 
--- a/D014-3tablesExample/r2rmld.ttl	Tue Oct 25 20:16:01 2011 +0200
+++ b/D014-3tablesExample/r2rmld.ttl	Tue Nov 01 02:46:29 2011 +0100
@@ -14,7 +14,7 @@
             , deptno
             , dname
             , loc
-         from SCOTT.DEPT
+         from SA.DEPT
        """ ];
 
     rr:subjectMap [ rr:column "deptId"; rr:termType rr:BlankNode;
@@ -61,7 +61,7 @@
 <TriplesMap2>
     a rr:TriplesMap;
 
-    rr:logicalTable [ rr:tableName "SCOTT.EMP" ];
+    rr:logicalTable [ rr:tableName "SA.EMP" ];
 
     rr:subjectMap [ rr:template "http://example.com/emp/{empno}";
                     rr:class ex:emp; 
--- a/D014-3tablesExample/r2rmle.ttl	Tue Oct 25 20:16:01 2011 +0200
+++ b/D014-3tablesExample/r2rmle.ttl	Tue Nov 01 02:46:29 2011 +0100
@@ -13,7 +13,7 @@
       Select ('http://example.com/emp/' || id) AS empId
            , ('http://example.com/emp/likes/' || likeType) AS empLikes
            , likedObj
-        from SCOTT.LIKES
+        from SA.LIKES
       """ ];
 
     rr:subjectMap [
--- a/D015-1tableSeveralLanguages/manifest.ttl	Tue Oct 25 20:16:01 2011 +0200
+++ b/D015-1tableSeveralLanguages/manifest.ttl	Tue Nov 01 02:46:29 2011 +0100
@@ -12,7 +12,7 @@
 
 <tc0015a> a rdb2rdftest:R2RML ;	
 	dcterms:title "Table with language information" ; 
-	dcterms:identifier "R2RMLTC015a" ;
+	dcterms:identifier "R2RMLTC0015a" ;
 	test:purpose "Tests the language tag" ;
 	test:specificationReference "#language-tags" ;
 	test:reviewStatus test:unreviewed ;
@@ -24,7 +24,7 @@
 
 <tc0015b> a rdb2rdftest:R2RML ;	
 	dcterms:title "Table with language information" ; 
-	dcterms:identifier "R2RMLTC015b" ;
+	dcterms:identifier "R2RMLTC0015b" ;
 	test:purpose "Tests a term map with rr:language where the value isn't a valid language, which is an error" ;
 	test:specificationReference "#language-tags" ;
 	test:reviewStatus test:unreviewed ;
--- a/D016-1tableSQLdatatypes/manifest.ttl	Tue Oct 25 20:16:01 2011 +0200
+++ b/D016-1tableSQLdatatypes/manifest.ttl	Tue Nov 01 02:46:29 2011 +0100
@@ -12,7 +12,7 @@
 
 <tc0016a> a rdb2rdftest:R2RML ;	
 	dcterms:title "Table with datatypes" ; 
-	dcterms:identifier "R2RMLTC016a" ;
+	dcterms:identifier "R2RMLTC0016a" ;
 	test:purpose "Tests the rr:termtype  and datatype conversions: string and integer" ;
 	test:specificationReference "#datatype-conversions" ;
 	test:reviewStatus test:unreviewed ;
@@ -24,7 +24,7 @@
 
 <tc0016b> a rdb2rdftest:R2RML ;	
 	dcterms:title "Table with datatypes" ; 
-	dcterms:identifier "R2RMLTC016b" ;
+	dcterms:identifier "R2RMLTC0016b" ;
 	test:purpose "Tests the rr:termtype and datatype conversions: real and float" ;
 	test:specificationReference "#datatype-conversions" ;
 	test:reviewStatus test:unreviewed ;
@@ -36,7 +36,7 @@
 
 <tc0016c> a rdb2rdftest:R2RML ;	
 	dcterms:title "Table with datatypes" ; 
-	dcterms:identifier "R2RMLTC016c" ;
+	dcterms:identifier "R2RMLTC0016c" ;
 	test:purpose "Tests the rr:termtype and datatype conversions: date and timestamp" ;
 	test:specificationReference "#datatype-conversions" ;
 	test:reviewStatus test:unreviewed ;
@@ -48,7 +48,7 @@
 
 <tc0016d> a rdb2rdftest:R2RML ;	
 	dcterms:title "Table with datatypes" ; 
-	dcterms:identifier "R2RMLTC016d" ;
+	dcterms:identifier "R2RMLTC0016d" ;
 	test:purpose "Tests the rr:termtype and datatype conversions: boolean" ;
 	test:specificationReference "#datatype-conversions" ;
 	test:reviewStatus test:unreviewed ;
@@ -60,7 +60,7 @@
 
 <tc0016e> a rdb2rdftest:R2RML ;	
 	dcterms:title "Table with datatypes" ; 
-	dcterms:identifier "R2RMLTC016e" ;
+	dcterms:identifier "R2RMLTC0016e" ;
 	test:purpose "Tests the rr:termtype and datatype conversions: binary" ;
 	test:specificationReference "#datatype-conversions" ;
 	test:reviewStatus test:unreviewed ;