Fix minor things and create new direct mappings
authorBoris Villazon-Terrazas <bvillazon@fi.upm.es>
Tue, 14 Feb 2012 17:24:49 +0100
changeset 38 f04a7b0f720f
parent 37 4b49f187300d
child 39 2c4aa9f154cd
Fix minor things and create new direct mappings
D000-1table1column0rows/manifest.ttl
D001-1table1column1row/create.sql
D001-1table1column1row/manifest.ttl
D002-1table2columns1row/directGraph.nt
D002-1table2columns1row/manifest.ttl
D003-1table3columns1row/directGraph.nt
D003-1table3columns1row/manifest.ttl
D004-1table2columns1row/create.sql
D004-1table2columns1row/directGraph.nt
D004-1table2columns1row/manifest.ttl
D004-1table2columns1row/mappeda.nq
D004-1table2columns1row/mappedb.nq
D004-1table2columns1row/r2rmla.ttl
D004-1table2columns1row/r2rmlb.ttl
D005-1table3columns3rows2duplicates/directGraph.nt
D005-1table3columns3rows2duplicates/manifest.ttl
D006-1table1primarykey1column1row/manifest.ttl
D007-1table1primarykey2columns1row/manifest.ttl
D008-1table1compositeprimarykey3columns1row/manifest.ttl
D009-2tables1primarykey1foreignkey/directGraph.nt
D009-2tables1primarykey1foreignkey/manifest.ttl
D010-1table1primarykey3colums3rows/directGraph.nt
D010-1table1primarykey3colums3rows/manifest.ttl
D011-M2MRelations/directGraph.nt
D011-M2MRelations/manifest.ttl
D012-2tables2duplicates0nulls/directGraph.nt
D012-2tables2duplicates0nulls/manifest.ttl
D013-1table1primarykey3columns2rows1nullvalue/directGraph.nt
D013-1table1primarykey3columns2rows1nullvalue/manifest.ttl
D014-3tables1primarykey1foreignkey/directGraph.nt
D014-3tables1primarykey1foreignkey/manifest.ttl
D014-3tables1primarykey1foreignkey/mappedb.nq
D014-3tables1primarykey1foreignkey/mappedc.nq
D014-3tables1primarykey1foreignkey/mappedd.nq
D015-1table3columns1composityeprimarykey3rows2languages/directGraph.nt
D015-1table3columns1composityeprimarykey3rows2languages/manifest.ttl
D016-1table1primarykey10columns3rowsSQLdatatypes/manifest.ttl
ts1.zip
--- a/D000-1table1column0rows/manifest.ttl	Mon Feb 13 02:27:26 2012 +0100
+++ b/D000-1table1column0rows/manifest.ttl	Tue Feb 14 17:24:49 2012 +0100
@@ -4,14 +4,14 @@
 @base <http://mappingpedia.org/rdb2rdf/tc/> .
 
 <d000> a rdb2rdftest:DataBase;
-	dcterms:title "Empty table" ;
+	dcterms:title "One table, a column, zero rows, no primary key" ;
 	dcterms:identifier "D000-1table1column0rows" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
 	rdb2rdftest:relatedTestCase <dg0000>, <tc0000>;
 .
 
 <dg0000> a rdb2rdftest:DirectMapping;	
-	dcterms:title "one table, one column, zero rows"; 
+	dcterms:title "Direct mapping of an empty table"; 
 	dcterms:identifier "Direct Graph TC0000" ;
 	test:purpose "Tests if an empty table produces an empty RDF graph" ;
 	test:specificationReference "#rules_table_triples" ;
--- a/D001-1table1column1row/create.sql	Mon Feb 13 02:27:26 2012 +0100
+++ b/D001-1table1column1row/create.sql	Tue Feb 14 17:24:49 2012 +0100
@@ -1,4 +1,4 @@
-CREATE TABLE Student (
-Name varchar(50)
+CREATE TABLE "Student" (
+"Name" varchar(50)
 );
-INSERT INTO Student (Name) VALUES ('Venus');
+INSERT INTO "Student" ("Name") VALUES ('Venus');
--- a/D001-1table1column1row/manifest.ttl	Mon Feb 13 02:27:26 2012 +0100
+++ b/D001-1table1column1row/manifest.ttl	Tue Feb 14 17:24:49 2012 +0100
@@ -4,14 +4,14 @@
 @base <http://mappingpedia.org/rdb2rdf/tc/> .
 
 <d001> a rdb2rdftest:DataBase;
-	dcterms:title "One table, one column, one row" ;
+	dcterms:title "One table, one column, one row, no primary key" ;
 	dcterms:identifier "D001-1table1column1row" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
 	rdb2rdftest:relatedTestCase <dg0001>, <tc0001a>, <tc0001b> ;
 .
 
 <dg0001> a rdb2rdftest:DirectMapping;	
-	dcterms:title "One table, one column, one row"; 
+	dcterms:title "Direct mapping that generates a BlankNode"; 
 	dcterms:identifier "Direct Graph TC0001" ;
 	test:purpose "Tests: (1) one column mapping, no primary key; (2) generation of a \"BlankNode\" subject; (3) one column to one property" ;
 	test:specificationReference "#rules_table_triples" ;
@@ -24,7 +24,7 @@
 <tc0001a> a rdb2rdftest:R2RML ;	
 	dcterms:title "One column mapping" ; 
 	dcterms:identifier "R2RMLTC0001a" ;
-	test:purpose "Tests: (1) one column mapping, no primary key; (2) subject URI generation by using one single column; (3) one column to one property" ;
+	test:purpose "Tests: (1) one column mapping; (2) subject URI generation by using one single column; (3) one column to one property" ;
 	test:specificationReference "#dfn-template-valued-term-map" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d001> ;
@@ -36,7 +36,7 @@
 <tc0001b> a rdb2rdftest:R2RML ;	
 	dcterms:title "One column mapping" ; 
 	dcterms:identifier "R2RMLTC0001b" ;
-	test:purpose "Tests: (1) one column mapping, no primary key; (2) generation of a \"BlankNode\" subject; (3) one column to one property" ;
+	test:purpose "Tests: (1) one column mapping; (2) generation of a BlankNode subject; (3) one column to one property" ;
 	test:specificationReference "#termtype" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d001> ;
--- a/D002-1table2columns1row/directGraph.nt	Mon Feb 13 02:27:26 2012 +0100
+++ b/D002-1table2columns1row/directGraph.nt	Tue Feb 14 17:24:49 2012 +0100
@@ -1,3 +1,3 @@
-_:a a <Student> .
+_:a <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
 _:a <Student#id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
 _:a <Student#name> "Venus" .
--- a/D002-1table2columns1row/manifest.ttl	Mon Feb 13 02:27:26 2012 +0100
+++ b/D002-1table2columns1row/manifest.ttl	Tue Feb 14 17:24:49 2012 +0100
@@ -4,16 +4,16 @@
 @base <http://mappingpedia.org/rdb2rdf/tc/> .
 
 <d002> a rdb2rdftest:DataBase;
-	dcterms:title "One table, two columns, one row" ;
+	dcterms:title "One table, two columns, one row, no primary key" ;
 	dcterms:identifier "D002-1table2columns1row" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
 	rdb2rdftest:relatedTestCase <dg0002>, <tc0002a>, <tc0002b>, <tc0002c>, <tc0002d>, <tc0002e>, <tc0002f>, <tc0002g>, <tc0002h>, <tc0002i> ;
 .
 
 <dg0002> a rdb2rdftest:DirectMapping ;	
-	dcterms:title "Two columns mapping" ; 
+	dcterms:title "Two columns mapping, generation of a BlankNode subject" ; 
 	dcterms:identifier "Direct Graph TC0002" ;
-	test:purpose "Tests: (1) two columns mapping, no primary key; (2) generation of a \"BlankNode\" subject; (3) one column to one property" ;
+	test:purpose "Tests: (1) two columns mapping; (2) generation of a BlankNode subject; (3) one column to one property" ;
 	test:specificationReference "#rules_table_triples" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d002> ;
@@ -22,7 +22,7 @@
 .
 
 <tc0002a> a rdb2rdftest:R2RML ;	
-	dcterms:title "Two columns mapping" ; 
+	dcterms:title "Two columns mapping, generation of a subject URI" ; 
 	dcterms:identifier "R2RMLTC0002a" ;
 	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; (4) presence of unqualified name for a rr:tableName" ;
 	test:specificationReference "#from-template" ;
@@ -34,7 +34,7 @@
 .
 
 <tc0002b> a rdb2rdftest:R2RML ;	
-	dcterms:title "Two columns mapping" ; 
+	dcterms:title "Two columns mapping, generation of a \"BlankNode\" subject" ; 
 	dcterms:identifier "R2RMLTC0002b" ;
 	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-r2rml-view" ;
@@ -46,7 +46,7 @@
 .
 
 <tc0002c> a rdb2rdftest:R2RML ;	
-	dcterms:title "Two columns mapping" ; 
+	dcterms:title "Two columns mapping, an invalid SQL identifier" ; 
 	dcterms:identifier "R2RMLTC0002c" ;
 	test:purpose "Tests the presence of an invalid SQL identifier" ;
 	test:specificationReference "#dfn-sql-identifier" ;
@@ -57,7 +57,7 @@
 .
 
 <tc0002d> a rdb2rdftest:R2RML ;	
-	dcterms:title "Two columns mapping" ; 
+	dcterms:title "Two columns mapping, delimited indentifiers" ; 
 	dcterms:identifier "R2RMLTC0002d" ;
 	test:purpose "Tests the presence delimited identifiers" ;
 	test:specificationReference "#dfn-sql-identifier" ;
@@ -69,7 +69,7 @@
 .
 
 <tc0002e> a rdb2rdftest:R2RML ;	
-	dcterms:title "Two columns mapping" ; 
+	dcterms:title "Two columns mapping, an invalid rr:tableName" ; 
 	dcterms:identifier "R2RMLTC0002e" ;
 	test:purpose "Tests the presence of an invalid rr:tableName" ;
 	test:specificationReference "#dfn-sql-identifier" ;
@@ -80,7 +80,7 @@
 .
 
 <tc0002f> a rdb2rdftest:R2RML ;	
-	dcterms:title "Two columns mapping" ; 
+	dcterms:title "Two columns mapping, schema-qualified name for a rr:tableName" ; 
 	dcterms:identifier "R2RMLTC0002f" ;
 	test:purpose "Tests the presence of schema-qualified name for a rr:tableName" ;
 	test:specificationReference "#from-template" ;
@@ -92,7 +92,7 @@
 .
 
 <tc0002g> a rdb2rdftest:R2RML ;	
-	dcterms:title "Two columns mapping" ; 
+	dcterms:title "Two columns mapping, invalid SQL query" ; 
 	dcterms:identifier "R2RMLTC0002g" ;
 	test:purpose "Tests the presence of an invalid SQL query" ;
 	test:specificationReference "#dfn-sql-identifier" ;
@@ -103,7 +103,7 @@
 .
 
 <tc0002h> a rdb2rdftest:R2RML ;	
-	dcterms:title "Two columns mapping" ; 
+	dcterms:title "Two columns mapping, duplicate column name in SELECT" ; 
 	dcterms:identifier "R2RMLTC0002h" ;
 	test:purpose "Tests the presence of duplicate column names in the SELECT list of the SQL query" ;
 	test:specificationReference "#dfn-sql-identifier" ;
@@ -114,7 +114,7 @@
 .
 
 <tc0002i> a rdb2rdftest:R2RML ;	
-	dcterms:title "Two columns mapping" ; 
+	dcterms:title "Two columns mapping, SQL Version identifier" ; 
 	dcterms:identifier "R2RMLTC0002i" ;
 	test:purpose "Tests the presence of a SQL Version identifier " ;
 	test:specificationReference "#r2rml-views" ;
--- a/D003-1table3columns1row/directGraph.nt	Mon Feb 13 02:27:26 2012 +0100
+++ b/D003-1table3columns1row/directGraph.nt	Tue Feb 14 17:24:49 2012 +0100
@@ -1,4 +1,4 @@
-_:a a <Student> .
+_:a <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
 _:a <Student#ID> "10"<http://www.w3.org/2001/XMLSchema#integer> .
 _:a <Student#FirstName> "Venus" .
 _:a <Student#LastName> "Williams" .
--- a/D003-1table3columns1row/manifest.ttl	Mon Feb 13 02:27:26 2012 +0100
+++ b/D003-1table3columns1row/manifest.ttl	Tue Feb 14 17:24:49 2012 +0100
@@ -4,16 +4,16 @@
 @base <http://mappingpedia.org/rdb2rdf/tc/> .
 
 <d003> a rdb2rdftest:DataBase;
-	dcterms:title "One table, three columns, one row" ;
+	dcterms:title "One table, three columns, one row, no primary key" ;
 	dcterms:identifier "D003-1table3columns1row" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
 	rdb2rdftest:relatedTestCase <dg0003>, <tc0003a>, <tc0003b>, <tc0003c>, <tc0003d> ;
 .
 
 <dg0003> a rdb2rdftest:DirectMapping ;	
-	dcterms:title "Three columns mapping" ; 
+	dcterms:title "Three columns mapping, generation of a BlankNode" ; 
 	dcterms:identifier "Direct Graph TC0003" ;
-	test:purpose "Tests: (1) three columns mapping, no primary key; (2) generation of a \"BlankNode\" subject; (3) one column to one property" ;
+	test:purpose "Tests: (1) three columns mapping; (2) generation of a \"BlankNode\" subject; (3) one column to one property" ;
 	test:specificationReference "#rules_table_triples" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d003> ;
@@ -22,9 +22,9 @@
 .
 
 <tc0003a> a rdb2rdftest:R2RML ;	
-	dcterms:title "Three columns mapping" ; 
+	dcterms:title "Three columns mapping, concatenation of two column values" ; 
 	dcterms:identifier "R2RMLTC0003a" ;
-	test:purpose "Tests: (1) three column mapping, no primary key; (2) subject URI generated by concatenation of two column values; (3) one column to one property" ;
+	test:purpose "Tests: (1) three column mapping; (2) subject URI generated by concatenation of two column values; (3) one column to one property" ;
 	test:specificationReference "#from-column" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d003> ;
@@ -34,9 +34,9 @@
 .
 
 <tc0003b> a rdb2rdftest:R2RML ;	
-	dcterms:title "Three columns mapping" ; 
+	dcterms:title "Three columns mapping, using \"template\" feature" ; 
 	dcterms:identifier "R2RMLTC0003b" ;
-	test:purpose "Tests: (1) three column mapping, no primary key; (2) one column to one property and (3) from template feature" ;
+	test:purpose "Tests: (1) three column mapping; (2) one column to one property and (3) from template feature" ;
 	test:specificationReference "#from-template"  ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d003> ;
@@ -46,7 +46,7 @@
 .
 
 <tc0003c> a rdb2rdftest:R2RML ;	
-	dcterms:title "Three columns mapping" ; 
+	dcterms:title "Three columns mapping, using rr:termType and rr:Literal" ; 
 	dcterms:identifier "R2RMLTC0003c" ;
 	test:purpose "Tests rr:termType rr:BlankNode and rr:Literal" ;
 	test:specificationReference "#termtype"  ;
@@ -58,7 +58,7 @@
 .
 
 <tc0003d> a rdb2rdftest:R2RML ;	
-	dcterms:title "Three columns mapping" ; 
+	dcterms:title "Three columns mapping, using rr:termType and rr:IRI" ; 
 	dcterms:identifier "R2RMLTC0003d" ;
 	test:purpose "Tests rr:termType rr:IRI" ;
 	test:specificationReference "#from-template"  ;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/D004-1table2columns1row/create.sql	Tue Feb 14 17:24:49 2012 +0100
@@ -0,0 +1,5 @@
+CREATE TABLE "Student_Sport"(
+      "Student" varchar(50),
+      "Sport" varchar(50)
+);
+INSERT INTO "Student_Sport" ("Student","Sport") VALUES ('Venus', 'Tennis');
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/D004-1table2columns1row/directGraph.nt	Tue Feb 14 17:24:49 2012 +0100
@@ -0,0 +1,3 @@
+_:a <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student_Sport> .
+_:a <Student_Sport#Student> "Venus" .
+_:a <Student_Sport#Sport> "Tennis" .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/D004-1table2columns1row/manifest.ttl	Tue Feb 14 17:24:49 2012 +0100
@@ -0,0 +1,46 @@
+@prefix test: <http://www.w3.org/2006/03/test-description#> .
+@prefix dcterms: <http://purl.org/dc/elements/1.1/> .
+@prefix rdb2rdftest: <http://purl.org/NET/rdb2rdf-test#> .
+@base <http://mappingpedia.org/rdb2rdf/tc/> .
+
+<d004> a rdb2rdftest:DataBase;
+	dcterms:title "One table, two columns, one row, projection, no primary key" ;
+	dcterms:identifier "D004-1table2columns1row" ;
+	rdb2rdftest:sqlScriptFile "create.sql";
+	rdb2rdftest:relatedTestCase <dg0004>, <tc0004a>, <tc0004b>  ;
+.
+
+<dg0004> a rdb2rdftest:DirectMapping ;	
+	dcterms:title "Two column mapping, generation of a BlankNode subject"; 
+	dcterms:identifier "Direct Graph TC0004" ;
+	test:purpose "Tests: (1) two column mapping (2) generation of a \"BlankNode\" subject" ;
+	test:specificationReference "#rules_table_triples" ;
+	test:reviewStatus test:unreviewed ;
+	rdb2rdftest:database <d004> ;
+	rdb2rdftest:hasExpectedOutput true ;
+	rdb2rdftest:output "directGraph.nt" ;
+.
+
+<tc0004a> a rdb2rdftest:R2RML ;	
+	dcterms:title "Two column mapping, from one row table to two different triples" ; 
+	dcterms:identifier "R2RMLTC0004a" ;
+	test:purpose "Tests: (1) two column mapping, (2) subject URI generated by a column value; (3) from one row table to two different triples" ;
+	test:specificationReference "#typing" ;
+	test:reviewStatus test:unreviewed ;
+	rdb2rdftest:database <d004> ;
+	rdb2rdftest:output "mappeda.nq" ;
+	rdb2rdftest:hasExpectedOutput true ;
+	rdb2rdftest:mappingDocument "r2rmla.ttl" ;
+.
+
+<tc0004b> a rdb2rdftest:R2RML ;	
+	dcterms:title "Two column mapping, generation of a \"BlankNode\" subject;" ; 
+	dcterms:identifier "R2RMLTC0004b" ;
+	test:purpose "Tests: (1) two column mapping (2) generation of a \"BlankNode\" subject; (3) from one row table to two different triples" ;
+	test:specificationReference "#r2rml-views" ;
+	test:reviewStatus test:unreviewed ;
+	rdb2rdftest:database <d004> ;
+	rdb2rdftest:output "mappedb.nq" ;
+	rdb2rdftest:hasExpectedOutput true ;
+	rdb2rdftest:mappingDocument "r2rmlb.ttl" ;
+.
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/D004-1table2columns1row/mappeda.nq	Tue Feb 14 17:24:49 2012 +0100
@@ -0,0 +1,4 @@
+<http://example.com/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" .
+<http://example.com/Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Student> .
+<http://example.com/Tennis> <http://xmlns.com/foaf/0.1/name> "Tennis" .
+<http://example.com/Tennis> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Sport> .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/D004-1table2columns1row/mappedb.nq	Tue Feb 14 17:24:49 2012 +0100
@@ -0,0 +1,4 @@
+_:AX2dX38ec05dcX3aX131488bea58X3aXX2dX7ff6 <http://xmlns.com/foaf/0.1/name> "Tennis" .
+_:AX2dX38ec05dcX3aX131488bea58X3aXX2dX7ff6 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Sport> .
+_:AX2dX38ec05dcX3aX131488bea58X3aXX2dX7ff7 <http://xmlns.com/foaf/0.1/name> "Venus" .
+_:AX2dX38ec05dcX3aX131488bea58X3aXX2dX7ff7 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Student> .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/D004-1table2columns1row/r2rmla.ttl	Tue Feb 14 17:24:49 2012 +0100
@@ -0,0 +1,35 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@base <http://mappingpedia.org/rdb2rdf/r2rml/tc/> .
+
+<TriplesMap1>
+    a rr:TriplesMap;
+
+	rr:logicalTable [ rr:tableName  "Student_Sport" ];
+	
+    rr:subjectMap [ rr:template "http://example.com/{Student}";
+                    rr:class ex:Student ];
+	
+    rr:predicateObjectMap
+    [ 
+      rr:predicateMap [ rr:constant foaf:name ]; 
+      rr:objectMap    [ rr:column "Student" ]
+    ]
+    .
+
+<TriplesMap2>
+    a rr:TriplesMap;
+
+	rr:logicalTable [ rr:tableName  "Student_Sport" ];
+	
+    rr:subjectMap [ rr:template "http://example.com/{Sport}";
+                    rr:class ex:Sport  ];
+	
+    rr:predicateObjectMap
+    [ 
+      rr:predicateMap [ rr:constant foaf:name ]; 
+      rr:objectMap    [ rr:column "Sport" ]
+    ]
+	.
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/D004-1table2columns1row/r2rmlb.ttl	Tue Feb 14 17:24:49 2012 +0100
@@ -0,0 +1,45 @@
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@base <http://mappingpedia.org/rdb2rdf/r2rml/tc/> .
+
+<TriplesMap1>
+    a rr:TriplesMap;
+
+      rr:logicalTable [ rr:sqlQuery """
+       Select ('Student' || Student) AS StudentId,
+				Student
+         from Student_Sport
+       """;
+	   ] ;
+
+    rr:subjectMap [ rr:column "StudentId"; rr:termType rr:BlankNode;
+                    rr:class ex:Student ];
+	
+    rr:predicateObjectMap
+    [ 
+      rr:predicateMap [ rr:constant foaf:name ]; 
+      rr:objectMap    [ rr:column "Student" ]
+    ]
+    .
+
+<TriplesMap2>
+    a rr:TriplesMap;
+
+      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  ];
+	
+    rr:predicateObjectMap
+    [ 
+      rr:predicateMap [ rr:constant foaf:name ]; 
+      rr:objectMap    [ rr:column "Sport" ]
+    ]
+	.
\ No newline at end of file
--- a/D005-1table3columns3rows2duplicates/directGraph.nt	Mon Feb 13 02:27:26 2012 +0100
+++ b/D005-1table3columns3rows2duplicates/directGraph.nt	Tue Feb 14 17:24:49 2012 +0100
@@ -1,14 +1,14 @@
-_:a a <IOUs> .
+_:a <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <IOUs> .
 _:a <IOUs#fname> "Bob" .
 _:a <IOUs#lname> "Smith" .
 _:a <IOUs#amount> "30"^^<http://www.w3.org/2001/XMLSchema#float> .
   
-_:b a <IOUs> .
+_:b <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <IOUs> .
 _:b <IOUs#fname> "Sue" .
 _:b <IOUs#lname> "Jones" .
 _:b <IOUs#amount> "20"^^<http://www.w3.org/2001/XMLSchema#float> .
   
-_:c a <IOUs> .
+_:c <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <IOUs> .
 _:c <IOUs#fname> "Bob" .
 _:c <IOUs#lname> "Smith" .
 _:c <IOUs#amount> "30"^^<http://www.w3.org/2001/XMLSchema#float> .
--- a/D005-1table3columns3rows2duplicates/manifest.ttl	Mon Feb 13 02:27:26 2012 +0100
+++ b/D005-1table3columns3rows2duplicates/manifest.ttl	Tue Feb 14 17:24:49 2012 +0100
@@ -4,14 +4,14 @@
 @base <http://mappingpedia.org/rdb2rdf/tc/> .
 
 <d005> a rdb2rdftest:DataBase;
-	dcterms:title "One table, three columns, three rows, two duplicate tuples" ;
+	dcterms:title "One table, three columns, three rows, two duplicate tuples, no primary key" ;
 	dcterms:identifier "D005-1table3columns3rows2duplicates" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
 	rdb2rdftest:relatedTestCase <dg0005>, <tc0005a> ;
 .
 
 <dg0005> a rdb2rdftest:DirectMapping ;	
-	dcterms:title "Duplicate tuples, no primary key"; 
+	dcterms:title "Generation of BlankNodes from duplicate tuples"; 
 	dcterms:identifier "Direct Graph TC0005" ;
 	test:purpose "Tests the generation of Blank Nodes for duplicate tuples" ;
 	test:specificationReference "#rules_table_triples" ;
@@ -22,7 +22,7 @@
 .
 
 <tc0005a> a rdb2rdftest:R2RML ;	
-	dcterms:title "Duplicate tuples, no primary key" ; 
+	dcterms:title "generation of duplicate triples, typing of resources" ; 
 	dcterms:identifier "R2RMLTC0005a" ;
 	test:purpose "Tests the generation of duplicate triples and the typing of resources" ;
 	test:specificationReference "#typing" ;
--- a/D006-1table1primarykey1column1row/manifest.ttl	Mon Feb 13 02:27:26 2012 +0100
+++ b/D006-1table1primarykey1column1row/manifest.ttl	Tue Feb 14 17:24:49 2012 +0100
@@ -11,9 +11,9 @@
 .
 
 <dg0006> a rdb2rdftest:DirectMapping ;	
-	dcterms:title "One table, one primary key, one column, one row"; 
+	dcterms:title "Generation of subjects"; 
 	dcterms:identifier "Direct Graph TC0006" ;
-	test:purpose "Tests a table with a column that is a primary key" ;
+	test:purpose "Tests a the generation of subjects" ;
 	test:specificationReference "#rules_table_triples" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d006> ;
@@ -22,7 +22,7 @@
 .
 
 <tc0006a> a rdb2rdftest:R2RML ;	
-	dcterms:title "One column mapping, one primary key" ; 
+	dcterms:title "One column mapping using rr:template" ; 
 	dcterms:identifier "R2RMLTC0006a" ;
 	test:purpose "Tests one column mapping with one primary key and rr:template" ;
 	test:specificationReference "#dfn-template-valued-term-map" ;
--- a/D007-1table1primarykey2columns1row/manifest.ttl	Mon Feb 13 02:27:26 2012 +0100
+++ b/D007-1table1primarykey2columns1row/manifest.ttl	Tue Feb 14 17:24:49 2012 +0100
@@ -11,9 +11,9 @@
 .
 
 <dg0007> a rdb2rdftest:DirectMapping ;	
-	dcterms:title "A table with a primary key and two columns"; 
+	dcterms:title "Generation of a subject"; 
 	dcterms:identifier "Direct Graph TC0007" ;
-	test:purpose "Tests a table with a primary key and two columns" ;
+	test:purpose "Tests the generation of a subject" ;
 	test:specificationReference "#rules_table_triples" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d007> ;
@@ -22,7 +22,7 @@
 .
 
 <tc0007a> a rdb2rdftest:R2RML ;	
-	dcterms:title "One column mapping" ; 
+	dcterms:title "One column mapping, using rr:constant property" ; 
 	dcterms:identifier "R2RMLTC0007a" ;
 	test:purpose "Tests constant-value term map by using rr:constant property" ;
 	test:specificationReference "#constant" ;
@@ -34,7 +34,7 @@
 .
 
 <tc0007b> a rdb2rdftest:R2RML ;	
-	dcterms:title "One column mapping" ; 
+	dcterms:title "One column mapping, using constant shortcut properties" ; 
 	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 "#constant" ;
@@ -46,7 +46,7 @@
 .
 
 <tc0007c> a rdb2rdftest:R2RML ;	
-	dcterms:title "One column mapping" ; 
+	dcterms:title "One column mapping, using rr:class" ; 
 	dcterms:identifier "R2RMLTC0007c" ;
 	test:purpose "Tests subjectmap with more than one class IRIs, rr:class" ;
 	test:specificationReference "#typing" ;
@@ -58,7 +58,7 @@
 .
 
 <tc0007d> a rdb2rdftest:R2RML ;	
-	dcterms:title "One column mapping" ; 
+	dcterms:title "One column mapping, specifying an rr:predicaObjectMap with rdf:type" ; 
 	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 "#typing" ;
@@ -70,7 +70,7 @@
 .
 
 <tc0007e> a rdb2rdftest:R2RML ;	
-	dcterms:title "One column mapping" ; 
+	dcterms:title "One column mapping, using rr:graphMap and rr:class" ; 
 	dcterms:identifier "R2RMLTC0007e" ;
 	test:purpose "Tests subjectmap with rr:graphMap and rr:class" ;
 	test:specificationReference "#named-graphs" ;
@@ -82,7 +82,7 @@
 .
 
 <tc0007f> a rdb2rdftest:R2RML ;	
-	dcterms:title "One column mapping" ; 
+	dcterms:title "One column mapping, using rr:graphMap and specifying an rr:predicaObjectMap with rdf:type" ; 
 	dcterms:identifier "R2RMLTC0007f" ;
 	test:purpose "Tests subjectmap with rr:graphMap and specifying an rr:predicateObjectMap with predicate rdf:type" ;
 	test:specificationReference "#named-graphs" ;
@@ -94,7 +94,7 @@
 .
 
 <tc0007g> a rdb2rdftest:R2RML ;	
-	dcterms:title "Empty R2RML mapping file" ; 
+	dcterms:title "Empty R2RML mapping file that generates an empty output datasets" ; 
 	dcterms:identifier "R2RMLTC0007g" ;
 	test:purpose "Tests an empty R2RML mapping file that generates an empty output dataset" ;
 	test:specificationReference "#generated-rdf" ;
--- a/D008-1table1compositeprimarykey3columns1row/manifest.ttl	Mon Feb 13 02:27:26 2012 +0100
+++ b/D008-1table1compositeprimarykey3columns1row/manifest.ttl	Tue Feb 14 17:24:49 2012 +0100
@@ -11,9 +11,9 @@
 .
 
 <dg0008> a rdb2rdftest:DirectMapping ;	
-	dcterms:title "Composite primary key"; 
+	dcterms:title "Generation of direct graph from a table with composite primary key"; 
 	dcterms:identifier "Direct Graph TC0008" ;
-	test:purpose "Tests a table with a composite primary key" ;
+	test:purpose "Tests the generation of a direct graph from a table with a composite primary key" ;
 	test:specificationReference "#rules_table_triples" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d008> ;
@@ -23,7 +23,7 @@
 
 
 <tc0008a> a rdb2rdftest:R2RML ;	
-	dcterms:title "Table with datatypes" ; 
+	dcterms:title "Generation of triples to a target graph" ; 
 	dcterms:identifier "R2RMLTC0008a" ;
 	test:purpose "Test that results of the mapping can be directed to a target graph." ;
 	test:specificationReference "#named-graphs" ;
--- a/D009-2tables1primarykey1foreignkey/directGraph.nt	Mon Feb 13 02:27:26 2012 +0100
+++ b/D009-2tables1primarykey1foreignkey/directGraph.nt	Tue Feb 14 17:24:49 2012 +0100
@@ -1,11 +1,11 @@
+<Student/ID-10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
+<Student/ID-10> <Student#ID> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student/ID-10> <Student#Name> "Venus Williams" .
+<Student/ID-10> <Student#Sport> "100"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student/ID-10> <Student#ref-Sport> <Sport/ID-100> .
 <Student/ID-20> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
 <Student/ID-20> <Student#ID> "20"^^<http://www.w3.org/2001/XMLSchema#integer> .
 <Student/ID-20> <Student#Name> "Demi Moore" .
-<Student/ID-10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
-<Student/ID-10> <Student#ID> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<Student/ID-10> <Student#Name> "Venus Williams" .
-<Student/ID-10> <Student#Sport> 100 .
-<Student/ID-10> <Student#ref-Sport> <Sport/ID-100> .
 <Sport/ID-100> <Sport#ID> "100"^^<http://www.w3.org/2001/XMLSchema#integer> .
 <Sport/ID-100> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Sport> .
 <Sport/ID-100> <Sport#Name> "Tennis" .
--- a/D009-2tables1primarykey1foreignkey/manifest.ttl	Mon Feb 13 02:27:26 2012 +0100
+++ b/D009-2tables1primarykey1foreignkey/manifest.ttl	Tue Feb 14 17:24:49 2012 +0100
@@ -22,7 +22,7 @@
 .
 
 <tc0009a> a rdb2rdftest:R2RML ;	
-	dcterms:title "Two tables to 1 primary key 1 foreign key" ; 
+	dcterms:title "Generation of triples from foreign key relations" ; 
 	dcterms:identifier "R2RMLTC0009a" ;
 	test:purpose "Test foreign key relationships among logical tables" ;
 	test:specificationReference "#foreign-key" ;
@@ -34,7 +34,7 @@
 .
 
 <tc0009b> a rdb2rdftest:R2RML ;	
-	dcterms:title "Two tables to multiple graphs" ; 
+	dcterms:title "Generation of triples to multiple graphs" ; 
 	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" ;
@@ -46,7 +46,7 @@
 .
 
 <tc0009c> a rdb2rdftest:R2RML ;	
-	dcterms:title "Unamed column in logical table" ; 
+	dcterms:title "Unamed column in a logical table" ; 
 	dcterms:identifier "R2RMLTC0009c" ;
 	test:purpose "Test a logical table with unamed column." ;
 	test:specificationReference "#dfn-logical-table" ;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/D010-1table1primarykey3colums3rows/directGraph.nt	Tue Feb 14 17:24:49 2012 +0100
@@ -0,0 +1,12 @@
+<Country%20Info/Country%20Code-1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Country%20Info> .
+<Country%20Info/Country%20Code-1> <Country%20Info#Country%20Code> "1"^^<http://www.w3.org/2001/XMLSchema#integer>  .
+<Country%20Info/Country%20Code-1> <Country%20Info#Name> "Bolivia, Plurinational State of"  .
+<Country%20Info/Country%20Code-1> <Country%20Info#ISO%203166> "BO"  .
+<Country%20Info/Country%20Code-2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Country%20Info> .
+<Country%20Info/Country%20Code-2> <Country%20Info#Country%20Code> "2"^^<http://www.w3.org/2001/XMLSchema#integer>  .
+<Country%20Info/Country%20Code-2> <Country%20Info#Name> "Ireland"  .
+<Country%20Info/Country%20Code-2> <Country%20Info#ISO%203166> "IE"  .
+<Country%20Info/Country%20Code-3> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Country%20Info> .
+<Country%20Info/Country%20Code-3> <Country%20Info#Country%20Code> "3"^^<http://www.w3.org/2001/XMLSchema#integer>  .
+<Country%20Info/Country%20Code-3> <Country%20Info#Name> "Saint Martin (French part)"  .
+<Country%20Info/Country%20Code-3> <Country%20Info#ISO%203166> "MF"  .
\ No newline at end of file
--- a/D010-1table1primarykey3colums3rows/manifest.ttl	Mon Feb 13 02:27:26 2012 +0100
+++ b/D010-1table1primarykey3colums3rows/manifest.ttl	Tue Feb 14 17:24:49 2012 +0100
@@ -7,7 +7,18 @@
 	dcterms:title "One table, a primary key, three columns, three rows" ;
 	dcterms:identifier "D010-1table1primarykey3colums3rows" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
-	rdb2rdftest:relatedTestCase <tc0010a>, <tc0010b>, <tc0010c>  ;
+	rdb2rdftest:relatedTestCase <dg0010>, <tc0010a>, <tc0010b>, <tc0010c>  ;
+.
+
+<dg0010> a rdb2rdftest:DirectMapping ;	
+	dcterms:title "Generation of direct graph for table names with spaces"; 
+	dcterms:identifier "Direct Graph TC0010" ;
+	test:purpose "Tests the generation of the direct graph for table names with spaces" ;
+	test:specificationReference "#rules_table_triples" ;
+	test:reviewStatus test:unreviewed ;
+	rdb2rdftest:database <d010> ;
+	rdb2rdftest:hasExpectedOutput true ;	
+	rdb2rdftest:output "directGraph.nt" ;
 .
 
 <tc0010a> a rdb2rdftest:R2RML ;	
--- a/D011-M2MRelations/directGraph.nt	Mon Feb 13 02:27:26 2012 +0100
+++ b/D011-M2MRelations/directGraph.nt	Tue Feb 14 17:24:49 2012 +0100
@@ -1,48 +1,42 @@
-<Student/ID-12> <rdf:type> <Student> .
+<Student/ID-10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
+<Student/ID-10> <Student#FirstName> "Venus".
+<Student/ID-10> <Student#ID> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student/ID-10> <Student#LastName> "Williams" .
+<Student/ID-11> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
+<Student/ID-11> <Student#FirstName> "Fernando".
+<Student/ID-11> <Student#ID> "11"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student/ID-11> <Student#LastName> "Alonso" .
+<Student/ID-12> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student> .
 <Student/ID-12> <Student#FirstName> "David".
-<Student/ID-12> <Student#ID> 12 .
+<Student/ID-12> <Student#ID> "12"^^<http://www.w3.org/2001/XMLSchema#integer> .
 <Student/ID-12> <Student#LastName> "Villa" .
-
-<Student_Sport/ID_Student.10,ID_Sport.110#_> <rdf:type> <Student_Sport> .
-<Student_Sport/ID_Student.10,ID_Sport.110#_> <Student_Sport#ID_Sport> <Sport/ID.110#_> .
-<Student_Sport/ID_Student.10,ID_Sport.110#_> <Student_Sport#ID_Student>  <Student/ID.10#_> .
-
-<Student/ID-11> <rdf:type> <Student> .
-<Student/ID-11> <Student#FirstName> "Fernando" .
-<Student/ID-11> <Student#ID> 11 .
-<Student/ID-11> <Student#LastName> "Alonso" .
-
-<Sport/ID-111>  <rdf:type>  <Sport> .
+<Student_Sport/ID_Student-10.ID_Sport-110> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student_Sport> .
+<Student_Sport/ID_Student-10.ID_Sport-110> <Student_Sport#ID_Student> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student_Sport/ID_Student-10.ID_Sport-110> <Student_Sport#ref-ID_Student> <Student/ID-10> .
+<Student_Sport/ID_Student-10.ID_Sport-110> <Student_Sport#ID_Sport> "110"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student_Sport/ID_Student-10.ID_Sport-110> <Student_Sport#ref-ID_Sport> <Sport/ID-110> .
+<Student_Sport/ID_Student-11.ID_Sport-111> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student_Sport> .
+<Student_Sport/ID_Student-11.ID_Sport-111> <Student_Sport#ID_Student> "11"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student_Sport/ID_Student-11.ID_Sport-111> <Student_Sport#ref-ID_Student> <Student/ID-11> .
+<Student_Sport/ID_Student-11.ID_Sport-111> <Student_Sport#ID_Sport> "111"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student_Sport/ID_Student-11.ID_Sport-111> <Student_Sport#ref-ID_Sport> <Sport/ID-111> .
+<Student_Sport/ID_Student-11.ID_Sport-112> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student_Sport> .
+<Student_Sport/ID_Student-11.ID_Sport-112> <Student_Sport#ID_Student> "11"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student_Sport/ID_Student-11.ID_Sport-112> <Student_Sport#ref-ID_Student> <Student/ID-11> .
+<Student_Sport/ID_Student-11.ID_Sport-112> <Student_Sport#ID_Sport> "112"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student_Sport/ID_Student-11.ID_Sport-112> <Student_Sport#ref-ID_Sport> <Sport/ID-112> .
+<Student_Sport/ID_Student-12.ID_Sport-111> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Student_Sport> .
+<Student_Sport/ID_Student-12.ID_Sport-111> <Student_Sport#ID_Student> "12"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student_Sport/ID_Student-12.ID_Sport-111> <Student_Sport#ref-ID_Student> <Student/ID-12> .
+<Student_Sport/ID_Student-12.ID_Sport-111> <Student_Sport#ID_Sport> "111"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Student_Sport/ID_Student-12.ID_Sport-111> <Student_Sport#ref-ID_Sport> <Sport/ID-111> .
+<Sport/ID-110> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>  <Sport> .
+<Sport/ID-110> <Sport#ID> "110"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Sport/ID-110> <Sport#Description> "Tennis" .
+<Sport/ID-111>  <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>  <Sport> .
+<Sport/ID-111> <Sport#ID> "111"^^<http://www.w3.org/2001/XMLSchema#integer> .
 <Sport/ID-111> <Sport#Description> "Football" .
-<Sport/ID-111> <Sport#ID> 111 .
-
-<Sport/ID-110> <rdf:type>  <Sport> .
-<Sport/ID-110> <Sport#Description> "Tennis" .
-<Sport/ID-110> <Sport#ID> 110 .
+<Sport/ID-112>  <http://www.w3.org/1999/02/22-rdf-syntax-ns#type>  <Sport> .
+<Sport/ID-112>  <Sport#ID> "112"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<Sport/ID-112>  <Sport#Description> "Formula1" .
 
-<Student_Sport/ID_Student-12.ID_Sport-111> <rdf:type> <Student_Sport> .
-<Student_Sport/ID_Student-12.ID_Sport-111> <Student_Sport#ID_Sport>  <Sport/ID-111> .
-<Student_Sport/ID_Student-12.ID_Sport-111> <Student_Sport#ref-ID_Sport>  <Sport/ID-111> .
-<Student_Sport/ID_Student-12.ID_Sport-111> <Student_Sport#ID_Student> <Student/ID-12> .
-<Student_Sport/ID_Student-12.ID_Sport-111> <Student_Sport#ref-ID_Student> <Student/ID-12> .
-
-<Student_Sport/ID_Student-11.ID_Sport-111> <rdf:type>  <Student_Sport> .
-<Student_Sport/ID_Student-11.ID_Sport-111> <Student_Sport#ID_Sport> <Sport/ID-111> .
-<Student_Sport/ID_Student-11.ID_Sport-111> <Student_Sport#ref-ID_Sport> <Sport/ID-111> .
-<Student_Sport/ID_Student-11.ID_Sport-111> <Student_Sport#ID_Student> <Student/ID-11> .
-<Student_Sport/ID_Student-11.ID_Sport-111> <Student_Sport#ref-ID_Student> <Student/ID-11> .
-
-<Student_Sport/ID_Student-11.ID_Sport-112> <rdf:type> <Student_Sport> .
-<Student_Sport/ID_Student-11.ID_Sport-112> <Student_Sport#ID_Sport> <Sport/ID-112> .
-<Student_Sport/ID_Student-11.ID_Sport-112> <Student_Sport#ref-ID_Sport> <Sport/ID-112> .
-<Student_Sport/ID_Student-11.ID_Sport-112> <Student_Sport#ID_Student>  <Student/ID-11> .
-<Student_Sport/ID_Student-11.ID_Sport-112> <Student_Sport#ref-ID_Student>  <Student/ID-11> .
-
-<Sport/ID-112>  <rdf:type>  <Sport> .
-<Sport/ID-112>  <Sport#Description> "Formula1" .
-<Sport/ID-112>  <Sport#ID> 112 .
-
-<Student/ID-10> <rdf:type>  <Student> .
-<Student/ID-10> <Student#FirstName> "Venus" .
-<Student/ID-10> <Student#ID> 10 .
-<Student/ID-10> <Student#LastName> "Williams" .
\ No newline at end of file
--- a/D011-M2MRelations/manifest.ttl	Mon Feb 13 02:27:26 2012 +0100
+++ b/D011-M2MRelations/manifest.ttl	Tue Feb 14 17:24:49 2012 +0100
@@ -13,7 +13,7 @@
 <dg0011> a rdb2rdftest:DirectMapping ;	
 	dcterms:title "Many to Many relations"; 
 	dcterms:identifier "Direct Graph TC0011" ;
-	test:purpose "Tests M to M relations" ;
+	test:purpose "Tests the generation of triples from tables M to M relations" ;
 	test:specificationReference "#rules_table_triples" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d011> ;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/D012-2tables2duplicates0nulls/directGraph.nt	Tue Feb 14 17:24:49 2012 +0100
@@ -0,0 +1,24 @@
+_:a <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <IOUs> .
+_:a <IOUs#fname> "Bob" .
+_:a <IOUs#lname> "Smith" .
+_:a <IOUs#amount> "30.0"^^<http://www.w3.org/2001/XMLSchema#double> .
+_:b <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <IOUs> .
+_:b <IOUs#fname> "Sue" .
+_:b <IOUs#lname> "Jones" .
+_:b <IOUs#amount> "20.0"^^<http://www.w3.org/2001/XMLSchema#double> .
+_:c <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <IOUs> .
+_:c <IOUs#fname> "Bob" .
+_:c <IOUs#lname> "Smith" .
+_:c <IOUs#amount> "30.0"^^<http://www.w3.org/2001/XMLSchema#double> .
+_:d <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Lives> .
+_:d <Lives#fname> "Bob" .
+_:d <Lives#lname> "Smith" .
+_:d <Lives#city> "London" .
+_:e <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Lives> .
+_:e <Lives#fname> "Sue" .
+_:e <Lives#lname> "Jones" .
+_:e <Lives#city> "Madrid" .
+_:f <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Lives> .
+_:f <Lives#fname> "Bob" .
+_:f <Lives#lname> "Smith" .
+_:f <Lives#city> "London" .
--- a/D012-2tables2duplicates0nulls/manifest.ttl	Mon Feb 13 02:27:26 2012 +0100
+++ b/D012-2tables2duplicates0nulls/manifest.ttl	Tue Feb 14 17:24:49 2012 +0100
@@ -5,12 +5,22 @@
 @base <http://mappingpedia.org/rdb2rdf/tc/> .
 
 <d012> a rdb2rdftest:DataBase;
-	dcterms:title "Two tables, two duplicate records, zero nulls" ;
+	dcterms:title "Two tables, two duplicate records, zero nulls, no primary key" ;
 	dcterms:identifier "D012-2tables2duplicates0nulls" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
-	rdb2rdftest:relatedTestCase <tc0012a>, <tc0012b>, <tc0012c>, <tc0012d> ;
+	rdb2rdftest:relatedTestCase <dg0012>, <tc0012a>, <tc0012b>, <tc0012c>, <tc0012d> ;
 .
 
+<dg0012> a rdb2rdftest:DirectMapping ;	
+	dcterms:title "Generation of direct graph from a database without primary keys"; 
+	dcterms:identifier "Direct Graph TC0012" ;
+	test:purpose "Test the generation of direct graph from a database without primary keys, by creating subject BlankNodes" ;
+	test:specificationReference "#rules_table_triples" ;
+	test:reviewStatus test:unreviewed ;
+	rdb2rdftest:database <d012> ;
+	rdb2rdftest:hasExpectedOutput true ;	
+	rdb2rdftest:output "directGraph.nt" ;
+.
 <tc0012a> a rdb2rdftest:R2RML ;	
 	dcterms:title "Duplicate tuples generate same blank node" ; 
 	dcterms:identifier "R2RMLTC0012a" ;
--- a/D013-1table1primarykey3columns2rows1nullvalue/directGraph.nt	Mon Feb 13 02:27:26 2012 +0100
+++ b/D013-1table1primarykey3columns2rows1nullvalue/directGraph.nt	Tue Feb 14 17:24:49 2012 +0100
@@ -1,10 +1,7 @@
-<Person#ID> <http://www.w3.org/2000/01/rdf-schema#domain> <Person> .
-<Person#Name> <http://www.w3.org/2000/01/rdf-schema#domain> <Person> .
-<Person#DateOfBirth> <http://www.w3.org/2000/01/rdf-schema#domain> <Person> .
-
 <Person/ID-1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Person> .
+<Person/ID-1> <Person#ID> "1"^^<http://www.w3.org/2001/XMLSchema#integer> .
 <Person/ID-1> <Person#Name> "Alice" .
-
 <Person/ID-2> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Person> .
+<Person/ID-2> <Person#ID> "2"^^<http://www.w3.org/2001/XMLSchema#integer> .
 <Person/ID-2> <Person#Name> "Bob" .
-<Person/ID-2> <Person#DateOfBirth> "September, 2010" .
\ No newline at end of file
+<Person/ID-2> <Person#DateOfBirth> "September, 2010" .
--- a/D013-1table1primarykey3columns2rows1nullvalue/manifest.ttl	Mon Feb 13 02:27:26 2012 +0100
+++ b/D013-1table1primarykey3columns2rows1nullvalue/manifest.ttl	Tue Feb 14 17:24:49 2012 +0100
@@ -4,16 +4,16 @@
 @base <http://mappingpedia.org/rdb2rdf/tc/> .
 
 <d013> a rdb2rdftest:DataBase;
-	dcterms:title "Table with null value" ;
+	dcterms:title "One table, one primary key, three columns, two rows, a null value" ;
 	dcterms:identifier "D013-1table1primarykey3columns2rows1nullvalue" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
 	rdb2rdftest:relatedTestCase <dg0013>, <tc0013a> ;
 .
 
 <dg0013> a rdb2rdftest:DirectMapping ;	
-	dcterms:title "Direct Graph of a table with NULL values"; 
+	dcterms:title "Generation of a direct graph from a table with NULL values"; 
 	dcterms:identifier "Direct Graph TC0013" ;
-	test:purpose "Tests Direct Graph of table with NULL values" ;
+	test:purpose "Tests the generation of a Direct Graph from a table with NULL values" ;
 	test:specificationReference "#rules_table_triples" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d013> ;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/D014-3tables1primarykey1foreignkey/directGraph.nt	Tue Feb 14 17:24:49 2012 +0100
@@ -0,0 +1,21 @@
+<EMP/empno-7369> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <EMP> .
+<EMP/empno-7369> <EMP#empno> "7369"^^<http://www.w3.org/2001/XMLSchema#integer>  .
+<EMP/empno-7369> <EMP#deptno> "10"^^<http://www.w3.org/2001/XMLSchema#integer>  .
+<EMP/empno-7369> <EMP#ref-deptno> <DEPT/deptno-10>  .
+<EMP/empno-7369> <EMP#ename> "SMITH" .
+<EMP/empno-7369> <EMP#job> "CLERK" .
+<EMP/empno-7369> <EMP#etype> "PART_TIME" .
+_:a <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <LIKES> .
+_:a <LIKES#id> "7369"^^<http://www.w3.org/2001/XMLSchema#integer>  .
+_:a <LIKES#likeType> "Playing" .
+_:a <LIKES#likedObj> "Soccer" .
+_:b <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <LIKES> .
+_:b <LIKES#id> "7369"^^<http://www.w3.org/2001/XMLSchema#integer>  .
+_:b <LIKES#likeType> "Watching" .
+_:b <LIKES#likedObj> "Basketball" .
+<DEPT/deptno-10> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <DEPT> .
+<DEPT/deptno-10> <DEPT#deptno> "10"^^<http://www.w3.org/2001/XMLSchema#integer>  .
+<DEPT/deptno-10> <DEPT#dname> "APPSERVER" .
+<DEPT/deptno-10> <DEPT#loc> "NEW YORK" .
+
+
--- a/D014-3tables1primarykey1foreignkey/manifest.ttl	Mon Feb 13 02:27:26 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/manifest.ttl	Tue Feb 14 17:24:49 2012 +0100
@@ -5,10 +5,21 @@
 @base <http://mappingpedia.org/rdb2rdf/tc/> .
 
 <d014> a rdb2rdftest:DataBase;
-	dcterms:title "3 tables extended example" ;
+	dcterms:title "3 tables, one primary key, one foreign key" ;
 	dcterms:identifier "D014-3tables1primarykey1foreignkey" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
-	rdb2rdftest:relatedTestCase <tc0014a>, <tc0014b>, <tc0014c>, <tc0014d>, <tc0014e> ;
+	rdb2rdftest:relatedTestCase <dg0014>, <tc0014a>, <tc0014b>, <tc0014c>, <tc0014d>, <tc0014e> ;
+.
+
+<dg0014> a rdb2rdftest:DirectMapping ;	
+	dcterms:title "Generation of direct graph from a database with primary key referencing candidate key"; 
+	dcterms:identifier "Direct Graph TC0014" ;
+	test:purpose "Test the generation of direct graph from a database with primary key referencing candidate key";
+	test:specificationReference "#rules_table_triples" ;
+	test:reviewStatus test:unreviewed ;
+	rdb2rdftest:database <d014> ;
+	rdb2rdftest:hasExpectedOutput true ;	
+	rdb2rdftest:output "directGraph.nt" ;
 .
 
 <tc0014a> a rdb2rdftest:R2RML ;	
--- a/D014-3tables1primarykey1foreignkey/mappedb.nq	Mon Feb 13 02:27:26 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/mappedb.nq	Tue Feb 14 17:24:49 2012 +0100
@@ -3,7 +3,7 @@
 <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#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> .
 <http://example.com/emp/7369> <http://example.com/emp#deptNum> "10"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example.com/graph/CLERK/PART_TIME> .
--- a/D014-3tables1primarykey1foreignkey/mappedc.nq	Mon Feb 13 02:27:26 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/mappedc.nq	Tue Feb 14 17:24:49 2012 +0100
@@ -1,9 +1,9 @@
 <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://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#positiveInteger>	.
+<http://example.com/emp/7369> <http://example.com/emp#empno> "7369"^^<http://www.w3.org/2001/XMLSchema#positiveInteger> .
 <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> .
 <http://example.com/emp/7369> <http://example.com/emp#deptNum> "10"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example.com/graph/CLERK/PART_TIME> .
--- a/D014-3tables1primarykey1foreignkey/mappedd.nq	Mon Feb 13 02:27:26 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/mappedd.nq	Tue Feb 14 17:24:49 2012 +0100
@@ -1,9 +1,9 @@
 <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://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#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> .
 <http://example.com/emp/7369> <http://example.com/emp#deptNum> "10"^^<http://www.w3.org/2001/XMLSchema#integer> <http://example.com/graph/CLERK/PART_TIME> .
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/D015-1table3columns1composityeprimarykey3rows2languages/directGraph.nt	Tue Feb 14 17:24:49 2012 +0100
@@ -0,0 +1,16 @@
+<Country/Code-BO.Lan-EN> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Country> .
+<Country/Code-BO.Lan-EN> <Country#Code> "BO" .
+<Country/Code-BO.Lan-EN> <Country#Lan> "EN" .
+<Country/Code-BO.Lan-EN> <Country#Name> "Bolivia, Plurinational State of" .
+<Country/Code-BO.Lan-ES> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Country> .
+<Country/Code-BO.Lan-ES> <Country#Code> "BO" .
+<Country/Code-BO.Lan-ES> <Country#Lan> "ES" .
+<Country/Code-BO.Lan-ES> <Country#Name> "Estado Plurinacional de Bolivia" . 
+<Country/Code-IE.Lan-EN> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Country> .
+<Country/Code-IE.Lan-EN> <Country#Code> "IE" .
+<Country/Code-IE.Lan-EN> <Country#Lan> "EN" .
+<Country/Code-IE.Lan-EN> <Country#Name> "Ireland" .
+<Country/Code-IE.Lan-ES> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <Country> .
+<Country/Code-IE.Lan-ES> <Country#Code> "IE" .
+<Country/Code-IE.Lan-ES> <Country#Lan> "ES" .
+<Country/Code-IE.Lan-ES> <Country#Name> "Irlanda" .
\ No newline at end of file
--- a/D015-1table3columns1composityeprimarykey3rows2languages/manifest.ttl	Mon Feb 13 02:27:26 2012 +0100
+++ b/D015-1table3columns1composityeprimarykey3rows2languages/manifest.ttl	Tue Feb 14 17:24:49 2012 +0100
@@ -4,10 +4,21 @@
 @base <http://mappingpedia.org/rdb2rdf/tc/> .
 
 <d015> a rdb2rdftest:DataBase;
-	dcterms:title "Table with language information" ;
+	dcterms:title "One table, three columns, one composite primary key, three rows, two languages" ;
 	dcterms:identifier "D015-1table3columns1composityeprimarykey3rows2languages" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
-	rdb2rdftest:relatedTestCase <tc0015a>, <tc0015b> ;
+	rdb2rdftest:relatedTestCase <dg0015>, <tc0015a>, <tc0015b> ;
+.
+
+<dg0015> a rdb2rdftest:DirectMapping ;	
+	dcterms:title "Generation of direct graph from multi-column primary keys"; 
+	dcterms:identifier "Direct Graph TC0015" ;
+	test:purpose "Tests the generation of direct graph from multi-column primary keys" ;
+	test:specificationReference "#rules_table_triples" ;
+	test:reviewStatus test:unreviewed ;
+	rdb2rdftest:database <d015> ;
+	rdb2rdftest:hasExpectedOutput true ;	
+	rdb2rdftest:output "directGraph.nt" ;
 .
 
 <tc0015a> a rdb2rdftest:R2RML ;	
--- a/D016-1table1primarykey10columns3rowsSQLdatatypes/manifest.ttl	Mon Feb 13 02:27:26 2012 +0100
+++ b/D016-1table1primarykey10columns3rowsSQLdatatypes/manifest.ttl	Tue Feb 14 17:24:49 2012 +0100
@@ -4,7 +4,7 @@
 @base <http://mappingpedia.org/rdb2rdf/tc/> .
 
 <d016> a rdb2rdftest:DataBase;
-	dcterms:title "Table with datatypes" ;
+	dcterms:title "One table, one primary key, ten columns, three rows with sql datatypes" ;
 	dcterms:identifier "D016-1table1primarykey10columns3rowsSQLdatatypes" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
 	rdb2rdftest:relatedTestCase <tc0016a>, <tc0016b>, <tc0016c>, <tc0016d>, <tc0016e> ;
Binary file ts1.zip has changed