Update TCs according to Richard comments I
authorBoris Villazon-Terrazas <bvillazon@fi.upm.es>
Mon, 12 Mar 2012 01:47:30 +0100
changeset 67 6f3e73e782fd
parent 66 809efccc53b8
child 68 81c382f9a238
Update TCs according to Richard comments I
D002-1table2columns1row/manifest.ttl
D002-1table2columns1row/mappeda.nq
D002-1table2columns1row/mappedb.nq
D002-1table2columns1row/mappedd.nq
D002-1table2columns1row/mappedi.nq
D002-1table2columns1row/mappedj.nq
D002-1table2columns1row/r2rmla.ttl
D002-1table2columns1row/r2rmlb.ttl
D002-1table2columns1row/r2rmlc.ttl
D002-1table2columns1row/r2rmld.ttl
D002-1table2columns1row/r2rmle.ttl
D002-1table2columns1row/r2rmlg.ttl
D002-1table2columns1row/r2rmlh.ttl
D002-1table2columns1row/r2rmli.ttl
D002-1table2columns1row/r2rmlj.ttl
D003-1table3columns1row/manifest.ttl
D003-1table3columns1row/mappedb.nq
D003-1table3columns1row/mappedc.nq
D003-1table3columns1row/r2rmlb.ttl
D003-1table3columns1row/r2rmlc.ttl
D004-1table2columns1row/mappedb.nq
D005-1table3columns3rows2duplicates/directGraph.nt
D005-1table3columns3rows2duplicates/mappeda.nq
D005-1table3columns3rows2duplicates/r2rmla.ttl
D006-1table1primarykey1column1row/manifest.ttl
D016-1table1primarykey10columns3rowsSQLdatatypes/create.sql
ts1.zip
--- a/D002-1table2columns1row/manifest.ttl	Wed Mar 07 01:55:50 2012 +0100
+++ b/D002-1table2columns1row/manifest.ttl	Mon Mar 12 01:47:30 2012 +0100
@@ -36,8 +36,8 @@
 <tc0002b> a rdb2rdftest:R2RML ;	
 	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" ;
+	test:purpose "Tests: (1) two column mapping, no primary key; (2) generation of a \"BlankNode\" subject by using rr:template; (3) one column to one property" ;
+	test:specificationReference "#termtype" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d002> ;
 	rdb2rdftest:output "mappedb.nq" ;
@@ -46,9 +46,9 @@
 .
 
 <tc0002c> a rdb2rdftest:R2RML ;	
-	dcterms:title "Two columns mapping, an invalid SQL identifier" ; 
+	dcterms:title "Two columns mapping, an undefined SQL identifier" ; 
 	dcterms:identifier "R2RMLTC0002c" ;
-	test:purpose "Tests the presence of an invalid SQL identifier" ;
+	test:purpose "Tests the presence of an undefined SQL identifier" ;
 	test:specificationReference "#dfn-sql-identifier" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d002> ;
@@ -57,10 +57,10 @@
 .
 
 <tc0002d> a rdb2rdftest:R2RML ;	
-	dcterms:title "Two columns mapping, delimited indentifiers" ; 
+	dcterms:title "Two columns mapping, generation of a \"BlankNode\" subject" ; 
 	dcterms:identifier "R2RMLTC0002d" ;
-	test:purpose "Tests the presence delimited identifiers" ;
-	test:specificationReference "#dfn-sql-identifier" ;
+	test:purpose "Tests (1) two column mapping, no primary key; (2) generation of a \"BlankNode\" subject by using a SQL Query that concatenates two columns; (3) one column to one property" ;
+	test:specificationReference "#termtype" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d002> ;
 	rdb2rdftest:hasExpectedOutput true ;
@@ -69,9 +69,9 @@
 .
 
 <tc0002e> a rdb2rdftest:R2RML ;	
-	dcterms:title "Two columns mapping, an invalid rr:tableName" ; 
+	dcterms:title "Two columns mapping, an undefined rr:tableName" ; 
 	dcterms:identifier "R2RMLTC0002e" ;
-	test:purpose "Tests the presence of an invalid rr:tableName" ;
+	test:purpose "Tests the presence of an undefined rr:tableName" ;
 	test:specificationReference "#dfn-sql-identifier" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d002> ;
--- a/D002-1table2columns1row/mappeda.nq	Wed Mar 07 01:55:50 2012 +0100
+++ b/D002-1table2columns1row/mappeda.nq	Mon Mar 12 01:47:30 2012 +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> .
+<http://example.com/10/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" .
+<http://example.com/10/Venus> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
+<http://example.com/10/Venus> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
--- a/D002-1table2columns1row/mappedb.nq	Wed Mar 07 01:55:50 2012 +0100
+++ b/D002-1table2columns1row/mappedb.nq	Mon Mar 12 01:47:30 2012 +0100
@@ -1,3 +1,1 @@
 _: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/mappedd.nq	Wed Mar 07 01:55:50 2012 +0100
+++ b/D002-1table2columns1row/mappedd.nq	Mon Mar 12 01:47:30 2012 +0100
@@ -1,3 +1,1 @@
-_: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> .
+_:Student10 <http://xmlns.com/foaf/0.1/name> "Venus" .
\ No newline at end of file
--- a/D002-1table2columns1row/mappedi.nq	Wed Mar 07 01:55:50 2012 +0100
+++ b/D002-1table2columns1row/mappedi.nq	Mon Mar 12 01:47:30 2012 +0100
@@ -1,3 +1,1 @@
-_: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> .
+<http://example.com/10/Student> <http://xmlns.com/foaf/0.1/name> "Venus" .
\ No newline at end of file
--- a/D002-1table2columns1row/mappedj.nq	Wed Mar 07 01:55:50 2012 +0100
+++ b/D002-1table2columns1row/mappedj.nq	Mon Mar 12 01:47:30 2012 +0100
@@ -1,3 +1,1 @@
-<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> .
+<http://example.com/10/Venus> <http://xmlns.com/foaf/0.1/name> "Venus" .
\ No newline at end of file
--- a/D002-1table2columns1row/r2rmla.ttl	Wed Mar 07 01:55:50 2012 +0100
+++ b/D002-1table2columns1row/r2rmla.ttl	Mon Mar 12 01:47:30 2012 +0100
@@ -9,7 +9,7 @@
     
     rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/{\"ID\"}{\"Name\"}";
+    rr:subjectMap [ rr:template "http://example.com/{\"ID\"}/{\"Name\"}";
                     rr:class foaf:Person ];
 
     rr:predicateObjectMap
--- a/D002-1table2columns1row/r2rmlb.ttl	Wed Mar 07 01:55:50 2012 +0100
+++ b/D002-1table2columns1row/r2rmlb.ttl	Mon Mar 12 01:47:30 2012 +0100
@@ -7,22 +7,9 @@
 <TriplesMap1>
      a rr:TriplesMap;
     
-    rr:logicalTable [ 
-                     rr:sqlQuery """
-                       Select ('Student' || "ID" ) AS StudentId
-                            , "ID"
-                            , "Name"
-                         from Student
-                       """
-                       ];
+    rr:logicalTable [ rr:tableName "\"Student\""; ];
 
-    rr:subjectMap [ rr:column "StudentId"; rr:termType rr:BlankNode; rr:class foaf:Person ];
-
-    rr:predicateObjectMap
-    [ 
-      rr:predicateMap [ rr:constant ex:id ]; 
-      rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
-    ];
+    rr:subjectMap [ rr:template "Student{\"ID\"}" rr:termType rr:BlankNode;  ];
 
     rr:predicateObjectMap
     [ 
--- a/D002-1table2columns1row/r2rmlc.ttl	Wed Mar 07 01:55:50 2012 +0100
+++ b/D002-1table2columns1row/r2rmlc.ttl	Mon Mar 12 01:47:30 2012 +0100
@@ -9,18 +9,12 @@
     
     rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/{\"ID\"}{\"Name\"}";
-                    rr:class foaf:Person ];
+    rr:subjectMap [ rr:template "http://example.com/{\"ID\"}/{\"Name\"}"; ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:id ]; 
-      rr:objectMap    [ rr:column "\"IDs\""; rr:datatype xsd:integer ]
-    ];
+      rr:objectMap    [ rr:column "\"IDs\""; ]
+    ]
 
-    rr:predicateObjectMap
-    [ 
-      rr:predicateMap [ rr:constant foaf:name ]; 
-      rr:objectMap    [ rr:column "\"Name\"" ]
-	]
     .
--- a/D002-1table2columns1row/r2rmld.ttl	Wed Mar 07 01:55:50 2012 +0100
+++ b/D002-1table2columns1row/r2rmld.ttl	Mon Mar 12 01:47:30 2012 +0100
@@ -16,13 +16,7 @@
                        """
                        ];
 
-    rr:subjectMap [ rr:column "StudentId"; rr:termType rr:BlankNode; rr:class foaf:Person ];
-
-    rr:predicateObjectMap
-    [ 
-      rr:predicateMap [ rr:constant ex:id ]; 
-      rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
-    ];
+    rr:subjectMap [ rr:column "StudentId"; rr:termType rr:BlankNode; ];
 
     rr:predicateObjectMap
     [ 
--- a/D002-1table2columns1row/r2rmle.ttl	Wed Mar 07 01:55:50 2012 +0100
+++ b/D002-1table2columns1row/r2rmle.ttl	Mon Mar 12 01:47:30 2012 +0100
@@ -9,18 +9,12 @@
     
     rr:logicalTable [ rr:tableName "\"Students\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/{\"ID\"}{\"Name\"}";
-                    rr:class foaf:Person ];
+    rr:subjectMap [ rr:template "http://example.com/{\"ID\"}/{\"Name\"}"; ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:id ]; 
-      rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
+      rr:objectMap    [ rr:column "\"ID\"";  ]
     ];
 
-    rr:predicateObjectMap
-    [ 
-      rr:predicateMap [ rr:constant foaf:name ]; 
-      rr:objectMap    [ rr:column "\"Name\"" ]
-	]
     .
--- a/D002-1table2columns1row/r2rmlg.ttl	Wed Mar 07 01:55:50 2012 +0100
+++ b/D002-1table2columns1row/r2rmlg.ttl	Mon Mar 12 01:47:30 2012 +0100
@@ -9,24 +9,15 @@
     
     rr:logicalTable [ 
                      rr:sqlQuery """
-                       Select ('Student' || "ID" ) AS StudentId
-                            , "ID"
-                            , "Name"
-                         "Student"
+                       THIS IS NOT A VALID SQL QUERY
                        """
                        ];
 
-    rr:subjectMap [ rr:column "StudentId"; rr:termType rr:BlankNode; rr:class foaf:Person ];
+    rr:subjectMap [ rr:column "StudentId"; ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:id ]; 
-      rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
+      rr:objectMap    [ rr:column "\"ID\""; ]
     ];
-
-    rr:predicateObjectMap
-    [ 
-      rr:predicateMap [ rr:constant foaf:name ]; 
-      rr:objectMap    [ rr:column "\"Name\"" ]
-    ]
     .
--- a/D002-1table2columns1row/r2rmlh.ttl	Wed Mar 07 01:55:50 2012 +0100
+++ b/D002-1table2columns1row/r2rmlh.ttl	Mon Mar 12 01:47:30 2012 +0100
@@ -17,17 +17,12 @@
                        """
                        ];
 
-    rr:subjectMap [ rr:column "StudentId"; rr:termType rr:BlankNode; rr:class foaf:Person ];
+    rr:subjectMap [ rr:column "StudentId"; ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:id ]; 
-      rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
+      rr:objectMap    [ rr:column "\"ID\""; ]
     ];
 
-    rr:predicateObjectMap
-    [ 
-      rr:predicateMap [ rr:constant foaf:name ]; 
-      rr:objectMap    [ rr:column "\"Name\"" ]
-    ]
     .
--- a/D002-1table2columns1row/r2rmli.ttl	Wed Mar 07 01:55:50 2012 +0100
+++ b/D002-1table2columns1row/r2rmli.ttl	Mon Mar 12 01:47:30 2012 +0100
@@ -9,25 +9,16 @@
     
     rr:logicalTable [ 
                      rr:sqlQuery """
-                       Select ('Student' || "ID" ) AS StudentId
-                            , "ID"
-                            , "Name"
-                         from "Student"
+                       SELECT "ID",
+                              "Name"
+                         FROM "Student"
                        """;
 					   
 			rr:sqlVersion rr:SQL2008 				   
 					   
                        ];
 	
-	
-
-    rr:subjectMap [ rr:column "StudentId"; rr:termType rr:BlankNode; rr:class foaf:Person ];
-
-    rr:predicateObjectMap
-    [ 
-      rr:predicateMap [ rr:constant ex:id ]; 
-      rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
-    ];
+    rr:subjectMap [ rr:template "http://example.com/{\"ID\"}/{\"Name\"}";  ];
 
     rr:predicateObjectMap
     [ 
--- a/D002-1table2columns1row/r2rmlj.ttl	Wed Mar 07 01:55:50 2012 +0100
+++ b/D002-1table2columns1row/r2rmlj.ttl	Mon Mar 12 01:47:30 2012 +0100
@@ -14,14 +14,7 @@
                        """
                        ];
 
-    rr:subjectMap [ rr:template "http://example.com/{\"ID\"}{\"Name\"}";
-                    rr:class foaf:Person ];
-
-    rr:predicateObjectMap
-    [ 
-      rr:predicateMap [ rr:constant ex:id ]; 
-      rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
-    ];
+    rr:subjectMap [ rr:template "http://example.com/{\"ID\"}/{\"Name\"}"; ];
 
     rr:predicateObjectMap
     [ 
--- a/D003-1table3columns1row/manifest.ttl	Wed Mar 07 01:55:50 2012 +0100
+++ b/D003-1table3columns1row/manifest.ttl	Mon Mar 12 01:47:30 2012 +0100
@@ -34,10 +34,10 @@
 .
 
 <tc0003b> a rdb2rdftest:R2RML ;	
-	dcterms:title "Three columns mapping, using \"template\" feature" ; 
+	dcterms:title "Three columns mapping, concatenation of columns to produce literal" ; 
 	dcterms:identifier "R2RMLTC0003b" ;
-	test:purpose "Tests: (1) three column mapping; (2) one column to one property and (3) from template feature" ;
-	test:specificationReference "#from-template"  ;
+	test:purpose "Tests: (1) three column mapping; and (2) concatenation of columns to produce literal" ;
+	test:specificationReference "#r2rml-views"  ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d003> ;
 	rdb2rdftest:output "mappedb.nq" ;
@@ -46,10 +46,10 @@
 .
 
 <tc0003c> a rdb2rdftest:R2RML ;	
-	dcterms:title "Three columns mapping, using rr:termType and rr:Literal" ; 
+	dcterms:title "Three columns mapping, using rr:template to produce literal" ; 
 	dcterms:identifier "R2RMLTC0003c" ;
-	test:purpose "Tests rr:termType rr:BlankNode and rr:Literal" ;
-	test:specificationReference "#termtype"  ;
+	test:purpose "Tests: (1) three column mapping; and (2) the use of rr:template to produce literal" ;
+	test:specificationReference "#from-template"  ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d003> ;
 	rdb2rdftest:output "mappedc.nq" ;
--- a/D003-1table3columns1row/mappedb.nq	Wed Mar 07 01:55:50 2012 +0100
+++ b/D003-1table3columns1row/mappedb.nq	Mon Mar 12 01:47:30 2012 +0100
@@ -1,3 +1,1 @@
-<http://example.com/Student10VenusWilliams> <http://xmlns.com/foaf/0.1/name> "Venus Williams" .
-<http://example.com/Student10VenusWilliams> <http://example.com/id> "10"^^<http://www.w3.org/2001/XMLSchema#integer> .
-<http://example.com/Student10VenusWilliams> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
+<http://example.com/Student10> <http://xmlns.com/foaf/0.1/name> "Venus Williams" .
\ No newline at end of file
--- a/D003-1table3columns1row/mappedc.nq	Wed Mar 07 01:55:50 2012 +0100
+++ b/D003-1table3columns1row/mappedc.nq	Mon Mar 12 01:47:30 2012 +0100
@@ -1,4 +1,1 @@
-_: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> .
-
+<http://example.com/Student10> <http://xmlns.com/foaf/0.1/name> "Venus Williams" .
--- a/D003-1table3columns1row/r2rmlb.ttl	Wed Mar 07 01:55:50 2012 +0100
+++ b/D003-1table3columns1row/r2rmlb.ttl	Mon Mar 12 01:47:30 2012 +0100
@@ -10,21 +10,12 @@
      rr:logicalTable [ 
                      rr:sqlQuery """
                      SELECT "ID",
-                            ("FirstName" || ' ' || "LastName") AS Name,
-                            "FirstName",
-                            "LastName"
+                            ("FirstName" || ' ' || "LastName") AS Name
                      FROM "Student"
                      """
                      ];
 
-    rr:subjectMap [ rr:template "http://example.com/Student{\"ID\"}{\"FirstName\"}{\"LastName\"}"; 
-                    rr:class foaf:Person ];
-	
-    rr:predicateObjectMap
-    [ 
-      rr:predicateMap [ rr:constant ex:id ]; 
-      rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
-    ];
+    rr:subjectMap [ rr:template "http://example.com/Student{\"ID\"}"; ];
 
     rr:predicateObjectMap
     [ 
--- a/D003-1table3columns1row/r2rmlc.ttl	Wed Mar 07 01:55:50 2012 +0100
+++ b/D003-1table3columns1row/r2rmlc.ttl	Mon Mar 12 01:47:30 2012 +0100
@@ -7,35 +7,13 @@
 <TriplesMap1>
      a rr:TriplesMap;
 
-     rr:logicalTable [ 
-                      rr:sqlQuery """
-                     SELECT ('Student' || "ID" || "FirstName" || "LastName") as StudentID,
-                            "ID",
-                            "FirstName",
-                            "LastName"
-                     FROM "Student"
-                     """
-                     ];
+     rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-    rr:subjectMap [ rr:column "StudentID"; rr:termType rr:BlankNode;  ];
+    rr:subjectMap [ rr:template "http://example.com/Student{\"ID\"}";  ];
 	
     rr:predicateObjectMap
     [ 
-      rr:predicateMap [ rr:constant ex:id ]; 
-      rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
-    ];
-
-    rr:predicateObjectMap
-    [ 
-      rr:predicateMap [ rr:constant foaf:firstName ]; 
-      rr:objectMap    [ rr:column "\"FirstName\"";
-						rr:termType rr:Literal ]
-    ];
-
-    rr:predicateObjectMap
-    [ 
-      rr:predicateMap [ rr:constant foaf:lastName ]; 
-      rr:objectMap    [ rr:column "\"LastName\"";
-						rr:termType rr:Literal ]
+      rr:predicateMap [ rr:constant foaf:name ]; 
+      rr:objectMap    [ rr:template "{\"FirstName\"} {\"LastName\"}"; rr:termType rr:Literal; ]
     ]
-    .
+    .	
--- a/D004-1table2columns1row/mappedb.nq	Wed Mar 07 01:55:50 2012 +0100
+++ b/D004-1table2columns1row/mappedb.nq	Mon Mar 12 01:47:30 2012 +0100
@@ -1,4 +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> .
+_:SportTennis <http://xmlns.com/foaf/0.1/name> "Tennis" .
+_:SportTennis <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Sport> .
+_:StudentVenus <http://xmlns.com/foaf/0.1/name> "Venus" .
+_:StudentVenus <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Student> .
--- a/D005-1table3columns3rows2duplicates/directGraph.nt	Wed Mar 07 01:55:50 2012 +0100
+++ b/D005-1table3columns3rows2duplicates/directGraph.nt	Mon Mar 12 01:47:30 2012 +0100
@@ -1,15 +1,15 @@
 _: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> .
+_:a <IOUs#amount> "3.0E1"^^<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"^^<http://www.w3.org/2001/XMLSchema#float> .
+_:b <IOUs#amount> "3.0E1"^^<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"^^<http://www.w3.org/2001/XMLSchema#float> .
+_:c <IOUs#amount> "3.0E1"^^<http://www.w3.org/2001/XMLSchema#double> .
 
--- a/D005-1table3columns3rows2duplicates/mappeda.nq	Wed Mar 07 01:55:50 2012 +0100
+++ b/D005-1table3columns3rows2duplicates/mappeda.nq	Mon Mar 12 01:47:30 2012 +0100
@@ -1,6 +1,4 @@
 <http://example.com/Bob-Smith> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Bob-Smith> <http://example.com/owes> "30"^^<http://www.w3.org/2001/XMLSchema#float> .
+<http://example.com/Bob-Smith> <http://example.com/owes> "3.0E1"^^<http://www.w3.org/2001/XMLSchema#double> .
 <http://example.com/Sue-Jones> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Sue-Jones> <http://example.com/owes> "20"^^<http://www.w3.org/2001/XMLSchema#float> .
-<http://example.com/Bob-Smith> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://xmlns.com/foaf/0.1/Person> .
-<http://example.com/Bob-Smith> <http://example.com/owes> "30"^^<http://www.w3.org/2001/XMLSchema#float> .
+<http://example.com/Sue-Jones> <http://example.com/owes> "2.0E1"^^<http://www.w3.org/2001/XMLSchema#double> .
--- a/D005-1table3columns3rows2duplicates/r2rmla.ttl	Wed Mar 07 01:55:50 2012 +0100
+++ b/D005-1table3columns3rows2duplicates/r2rmla.ttl	Mon Mar 12 01:47:30 2012 +0100
@@ -15,7 +15,7 @@
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:owes ]; 
-      rr:objectMap    [ rr:column "\"amount\""; rr:datatype xsd:float ]
+      rr:objectMap    [ rr:column "\"amount\""; ]
     ];
 
     .
--- a/D006-1table1primarykey1column1row/manifest.ttl	Wed Mar 07 01:55:50 2012 +0100
+++ b/D006-1table1primarykey1column1row/manifest.ttl	Mon Mar 12 01:47:30 2012 +0100
@@ -22,10 +22,10 @@
 .
 
 <tc0006a> a rdb2rdftest:R2RML ;	
-	dcterms:title "One column mapping using rr:template" ; 
+	dcterms:title "Long form of R2RML by using rr:constant" ; 
 	dcterms:identifier "R2RMLTC0006a" ;
 	test:purpose "Tests one column mapping with one primary key and rr:template" ;
-	test:specificationReference "#dfn-template-valued-term-map" ;
+	test:specificationReference "#constant" ;
 	test:reviewStatus test:unreviewed ;
 	rdb2rdftest:database <d006> ;
 	rdb2rdftest:output "mappeda.nq" ;
--- a/D016-1table1primarykey10columns3rowsSQLdatatypes/create.sql	Wed Mar 07 01:55:50 2012 +0100
+++ b/D016-1table1primarykey10columns3rowsSQLdatatypes/create.sql	Mon Mar 12 01:47:30 2012 +0100
@@ -13,8 +13,16 @@
 );
 
 INSERT INTO "Patient" ("ID", "FirstName","LastName","Sex","Weight","Height","BirthDate","EntranceDate","PaidInAdvance","Photo") 
-VALUES (10,'Monica','Geller','female',80.25,1.65,'1981-10-10','2009-10-10 12:12:22','FALSE',CAST('iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==' as VARBINARY(200)) );
+VALUES (10,'Monica','Geller','female',80.25,1.65,'1981-10-10','2009-10-10 12:12:22','FALSE', CAST(
+'iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4\ux2F\ux2F8\ux2Fw38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg\ux3D\ux3D'
+AS VARBINARY(200)));
+
 INSERT INTO "Patient" ("ID", "FirstName","LastName","Sex","Weight","Height","BirthDate","EntranceDate","PaidInAdvance","Photo") 
-VALUES (11,'Rachel','Green','female',70.22,1.70,'1982-11-12','2008-11-12 09:45:44','TRUE',CAST('iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P5//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==' as VARBINARY(200)));
+VALUES (11,'Rachel','Green','female',70.22,1.70,'1982-11-12','2008-11-12 09:45:44','TRUE',CAST(
+'iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P5\ux2F\ux2F8\ux2Fw38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg\ux3D\ux3D'
+AS VARBINARY(200)));
+
 INSERT INTO "Patient" ("ID", "FirstName","LastName","Sex","Weight","Height","BirthDate","EntranceDate","PaidInAdvance","Photo") 
-VALUES (12,'Chandler','Bing','male',90.31,1.76,'1978-04-06','2007-03-12 02:13:14','TRUE',CAST('iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P5//6/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==' as VARBINARY(200)));
+VALUES (12,'Chandler','Bing','male',90.31,1.76,'1978-04-06','2007-03-12 02:13:14','TRUE',CAST(
+'iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P5\ux2F\ux2F6\ux2Fw38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg\ux3D\ux3D' 
+AS VARBINARY(200)));
\ No newline at end of file
Binary file ts1.zip has changed