--- a/D007-1table1primarykey2columns1row/manifest.ttl	Thu Jun 14 02:23:29 2012 +0200
+++ b/D007-1table1primarykey2columns1row/manifest.ttl	Thu Jun 28 13:40:15 2012 +0200
@@ -7,7 +7,7 @@
 	dcterms:title "One table, one primary key, two columns, one row" ;
 	dcterms:identifier "D007-1table1primarykey2columns1row" ;
 	rdb2rdftest:sqlScriptFile "create.sql";
-	rdb2rdftest:relatedTestCase <dg0007>, <tc0007a>, <tc0007b>, <tc0007c>, <tc0007d>, <tc0007e>, <tc0007f>, <tc0007g>, <tc0007h>, <tc0007i> ;
+	rdb2rdftest:relatedTestCase <dg0007>, <tc0007a>, <tc0007b>, <tc0007c>, <tc0007d>, <tc0007e>, <tc0007f>, <tc0007g>, <tc0007h> ;
 .
 
 <dg0007> a rdb2rdftest:DirectMapping ;	
@@ -94,10 +94,10 @@
 .
 
 <tc0007g> a rdb2rdftest:R2RML ;	
-	dcterms:title "Empty R2RML mapping file that generates an empty output datasets" ; 
+	dcterms:title "Assigning triples to the default graph" ; 
 	dcterms:identifier "R2RMLTC0007g" ;
-	test:purpose "Tests an empty R2RML mapping file that generates an empty output dataset" ;
-	test:specificationReference "#generated-rdf" ;
+	test:purpose "Tests the generation of triples to the default graph" ;
+	test:specificationReference "#named-graphs" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d007> ;
 	rdb2rdftest:output "mappedg.nq" ;
@@ -106,25 +106,13 @@
 .
 
 <tc0007h> a rdb2rdftest:R2RML ;	
-	dcterms:title "Assigning triples to the default graph" ; 
+	dcterms:title "Assigning triples to a non-IRI named graph" ; 
 	dcterms:identifier "R2RMLTC0007h" ;
-	test:purpose "Tests the generation of triples to the default graph" ;
-	test:specificationReference "#named-graphs" ;
-	test:reviewStatus test:unreviewed ;
-	rdb2rdftest:database <d007> ;
-	rdb2rdftest:output "mappedh.nq" ;
-	rdb2rdftest:hasExpectedOutput true ;
-	rdb2rdftest:mappingDocument "r2rmlh.ttl" ;
-.
-
-<tc0007i> a rdb2rdftest:R2RML ;	
-	dcterms:title "Assigning triples to a non-IRI named graph" ; 
-	dcterms:identifier "R2RMLTC0007i" ;
 	test:purpose "Tests the generation of triples to a non-IRI named graph, which is an error" ;
 	test:specificationReference "#named-graphs" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d007> ;
 	rdb2rdftest:failMessage "non-conforming R2RML mapping";
 	rdb2rdftest:hasExpectedOutput false ;
-	rdb2rdftest:mappingDocument "r2rmli.ttl" ;
+	rdb2rdftest:mappingDocument "r2rmlh.ttl" ;
 .

--- a/D007-1table1primarykey2columns1row/mappedg.nq	Thu Jun 14 02:23:29 2012 +0200
+++ b/D007-1table1primarykey2columns1row/mappedg.nq	Thu Jun 28 13:40:15 2012 +0200
@@ -0,0 +1,2 @@
+<http://example.com/Student/10/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" . 
+<http://example.com/Student/10/Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person>  .

--- a/D007-1table1primarykey2columns1row/mappedh.nq	Thu Jun 14 02:23:29 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-<http://example.com/Student/10/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" . 
-<http://example.com/Student/10/Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person>  .

--- a/D007-1table1primarykey2columns1row/r2rmlg.ttl	Thu Jun 14 02:23:29 2012 +0200
+++ b/D007-1table1primarykey2columns1row/r2rmlg.ttl	Thu Jun 28 13:40:15 2012 +0200
@@ -1,3 +1,30 @@
-
-
-
+@prefix rr: <http://www.w3.org/ns/r2rml#> .
+@prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix ex: <http://example.com/> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@base <http://example.com/base/> .
+
+
+<TriplesMap1>
+     a rr:TriplesMap;
+
+	rr:logicalTable [ rr:tableName "\"Student\""; ];
+
+    rr:subjectMap [ rr:template "http://example.com/Student/{\"ID\"}/{\"Name\"}"; 
+				    rr:graph rr:defaultGraph;
+	];
+	
+    rr:predicateObjectMap
+    [ 
+		rr:predicate	rdf:type;
+		rr:object		foaf:Person;
+	];
+
+    rr:predicateObjectMap
+    [ 
+      rr:predicate		foaf:name;
+      rr:objectMap		[ rr:column "\"Name\"" ]
+    ]
+
+    .

--- a/D007-1table1primarykey2columns1row/r2rmlh.ttl	Thu Jun 14 02:23:29 2012 +0200
+++ b/D007-1table1primarykey2columns1row/r2rmlh.ttl	Thu Jun 28 13:40:15 2012 +0200
@@ -12,7 +12,7 @@
 	rr:logicalTable [ rr:tableName "\"Student\""; ];
 
     rr:subjectMap [ rr:template "http://example.com/Student/{\"ID\"}/{\"Name\"}"; 
-				    rr:graph rr:defaultGraph;
+				    rr:graphMap [ rr:column "\"Name\""; rr:termType rr:Literal; ]
 	];
 	
     rr:predicateObjectMap

--- a/D007-1table1primarykey2columns1row/r2rmli.ttl	Thu Jun 14 02:23:29 2012 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-@prefix rr: <http://www.w3.org/ns/r2rml#> .
-@prefix foaf: <http://xmlns.com/foaf/0.1/> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix ex: <http://example.com/> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@base <http://example.com/base/> .
-
-
-<TriplesMap1>
-     a rr:TriplesMap;
-
-	rr:logicalTable [ rr:tableName "\"Student\""; ];
-
-    rr:subjectMap [ rr:template "http://example.com/Student/{\"ID\"}/{\"Name\"}"; 
-				    rr:graphMap [ rr:column "\"Name\""; rr:termType rr:Literal; ]
-	];
-	
-    rr:predicateObjectMap
-    [ 
-		rr:predicate	rdf:type;
-		rr:object		foaf:Person;
-	];
-
-    rr:predicateObjectMap
-    [ 
-      rr:predicate		foaf:name;
-      rr:objectMap		[ rr:column "\"Name\"" ]
-    ]
-
-    .

Binary file rdb2rdf-ts.zip has changed