Updated the SQL queries, quoted indentifiers
authorBoris Villazon-Terrazas <bvillazon@fi.upm.es>
Wed, 29 Feb 2012 20:44:12 +0100
changeset 62 6073eaeda218
parent 61 4073c257cc14
child 63 4a4e97d06560
Updated the SQL queries, quoted indentifiers
D000-1table1column0rows/r2rml.ttl
D001-1table1column1row/r2rmla.ttl
D001-1table1column1row/r2rmlb.ttl
D002-1table2columns1row/r2rmla.ttl
D002-1table2columns1row/r2rmlb.ttl
D002-1table2columns1row/r2rmlc.ttl
D002-1table2columns1row/r2rmld.ttl
D002-1table2columns1row/r2rmle.ttl
D002-1table2columns1row/r2rmlf.ttl
D002-1table2columns1row/r2rmlg.ttl
D002-1table2columns1row/r2rmlh.ttl
D002-1table2columns1row/r2rmli.ttl
D002-1table2columns1row/r2rmlj.ttl
D003-1table3columns1row/r2rmla.ttl
D003-1table3columns1row/r2rmlb.ttl
D003-1table3columns1row/r2rmlc.ttl
D003-1table3columns1row/r2rmld.ttl
D004-1table2columns1row/r2rmla.ttl
D004-1table2columns1row/r2rmlb.ttl
D005-1table3columns3rows2duplicates/r2rmla.ttl
D006-1table1primarykey1column1row/r2rmla.ttl
D007-1table1primarykey2columns1row/r2rmla.ttl
D007-1table1primarykey2columns1row/r2rmlb.ttl
D007-1table1primarykey2columns1row/r2rmlc.ttl
D007-1table1primarykey2columns1row/r2rmld.ttl
D007-1table1primarykey2columns1row/r2rmle.ttl
D007-1table1primarykey2columns1row/r2rmlf.ttl
D008-1table1compositeprimarykey3columns1row/r2rmla.ttl
D008-1table1compositeprimarykey3columns1row/r2rmlb.ttl
D008-1table1compositeprimarykey3columns1row/r2rmlc.ttl
D009-2tables1primarykey1foreignkey/r2rmla.ttl
D009-2tables1primarykey1foreignkey/r2rmlb.ttl
D009-2tables1primarykey1foreignkey/r2rmlc.ttl
D009-2tables1primarykey1foreignkey/r2rmld.ttl
D010-1table1primarykey3colums3rows/r2rmla.ttl
D010-1table1primarykey3colums3rows/r2rmlb.ttl
D010-1table1primarykey3colums3rows/r2rmlc.ttl
D011-M2MRelations/r2rmlb.ttl
D012-2tables2duplicates0nulls/r2rmla.ttl
D012-2tables2duplicates0nulls/r2rmlb.ttl
D012-2tables2duplicates0nulls/r2rmlc.ttl
D012-2tables2duplicates0nulls/r2rmld.ttl
D013-1table1primarykey3columns2rows1nullvalue/r2rmla.ttl
D014-3tables1primarykey1foreignkey/r2rmla.ttl
D014-3tables1primarykey1foreignkey/r2rmlb.ttl
D014-3tables1primarykey1foreignkey/r2rmlc.ttl
D014-3tables1primarykey1foreignkey/r2rmld.ttl
D014-3tables1primarykey1foreignkey/r2rmle.ttl
D014-3tables1primarykey1foreignkey/r2rmlf.ttl
D015-1table3columns1composityeprimarykey3rows2languages/r2rmla.ttl
D015-1table3columns1composityeprimarykey3rows2languages/r2rmlb.ttl
D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmla.ttl
D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmlb.ttl
D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmlc.ttl
D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmld.ttl
D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmle.ttl
D018-1table1primarykey2columns3rows/r2rmla.ttl
D019-1table1primarykey3columns3rows/.DS_Store
D019-1table1primarykey3columns3rows/r2rmla.ttl
D019-1table1primarykey3columns3rows/r2rmlb.ttl
ts1.zip
--- a/D000-1table1column0rows/r2rml.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D000-1table1column0rows/r2rml.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -7,13 +7,13 @@
 <TriplesMap1>
     a rr:TriplesMap;
         
-    rr:logicalTable [ rr:tableName "Student"; ] ;
+    rr:logicalTable [ rr:tableName "\"Student\""; ] ;
 	
-    rr:subjectMap [ rr:template "http://example.com/{Name}" ]; 
+    rr:subjectMap [ rr:template "http://example.com/{\"Name\"}" ]; 
 	
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
     ]
     .
\ No newline at end of file
--- a/D001-1table1column1row/r2rmla.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D001-1table1column1row/r2rmla.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -7,13 +7,13 @@
 <TriplesMap1>
     a rr:TriplesMap;
     
-    rr:logicalTable [ rr:tableName "Student" ];
+    rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/{Name}" ]; 
+    rr:subjectMap [ rr:template "http://example.com/{\"Name\"}" ]; 
 	
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
     ]
     .
--- a/D001-1table1column1row/r2rmlb.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D001-1table1column1row/r2rmlb.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -7,13 +7,13 @@
 <TriplesMap1>
     a rr:TriplesMap;
     
-    rr:logicalTable [ rr:tableName "Student" ];
+    rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-    rr:subjectMap [ rr:column "Name"; rr:termType rr:BlankNode ]; 
+    rr:subjectMap [ rr:column "\"Name\""; rr:termType rr:BlankNode ]; 
 	
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
     ]
     .
--- a/D002-1table2columns1row/r2rmla.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D002-1table2columns1row/r2rmla.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -7,20 +7,20 @@
 <TriplesMap1>
     a rr:TriplesMap;
     
-    rr:logicalTable [ rr:tableName "Student" ];
+    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
     [ 
       rr:predicateMap [ rr:constant ex:id ]; 
-      rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+      rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
     ]
     .
--- a/D002-1table2columns1row/r2rmlb.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D002-1table2columns1row/r2rmlb.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -21,12 +21,12 @@
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:id ]; 
-      rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+      rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
     ]
     .
--- a/D002-1table2columns1row/r2rmlc.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D002-1table2columns1row/r2rmlc.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -7,20 +7,20 @@
 <TriplesMap1>
     a rr:TriplesMap;
     
-    rr:logicalTable [ rr:tableName "Student" ];
+    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
     [ 
       rr:predicateMap [ rr:constant ex:id ]; 
-      rr:objectMap    [ rr:column "IDs"; rr:datatype xsd:integer ]
+      rr:objectMap    [ rr:column "\"IDs\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
 	]
     .
--- a/D002-1table2columns1row/r2rmld.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D002-1table2columns1row/r2rmld.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -21,12 +21,12 @@
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:id ]; 
-      rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+      rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
     ]
     .
--- a/D002-1table2columns1row/r2rmle.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D002-1table2columns1row/r2rmle.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -7,20 +7,20 @@
 <TriplesMap1>
     a rr:TriplesMap;
     
-    rr:logicalTable [ rr:tableName "Students" ];
+    rr:logicalTable [ rr:tableName "\"Students\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/{ID}{Name}";
+    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:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
 	]
     .
--- a/D002-1table2columns1row/r2rmlf.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D002-1table2columns1row/r2rmlf.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -7,20 +7,20 @@
 <TriplesMap1>
     a rr:TriplesMap;
     
-    rr:logicalTable [ rr:tableName "Student" ];
+    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
     [ 
       rr:predicateMap [ rr:constant ex:id ]; 
-      rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+      rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
 	]
     .
--- a/D002-1table2columns1row/r2rmlg.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D002-1table2columns1row/r2rmlg.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -21,12 +21,12 @@
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:id ]; 
-      rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+      rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
     ]
     .
--- a/D002-1table2columns1row/r2rmlh.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D002-1table2columns1row/r2rmlh.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -22,12 +22,12 @@
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:id ]; 
-      rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+      rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
     ]
     .
--- a/D002-1table2columns1row/r2rmli.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D002-1table2columns1row/r2rmli.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -9,10 +9,10 @@
     
     rr:logicalTable [ 
                      rr:sqlQuery """
-                       Select ('Student' || ID ) AS StudentId
-                            , ID
-                            , Name
-                         from Student
+                       Select ('Student' || "ID" ) AS StudentId
+                            , "ID"
+                            , "Name"
+                         from "Student"
                        """;
 					   
 			rr:sqlVersion rr:SQL2008 				   
@@ -26,12 +26,12 @@
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:id ]; 
-      rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+      rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
     ]
     .
--- a/D002-1table2columns1row/r2rmlj.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D002-1table2columns1row/r2rmlj.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -9,23 +9,23 @@
     
     rr:logicalTable [ 
                      rr:sqlQuery """
-                       SELECT Student.ID, Student.Name 
-                       FROM Student
+                       SELECT "Student"."ID", "Student"."Name" 
+                       FROM "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
     [ 
       rr:predicateMap [ rr:constant ex:id ]; 
-      rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+      rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
 	]
     .
--- a/D003-1table3columns1row/r2rmla.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D003-1table3columns1row/r2rmla.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -7,26 +7,26 @@
 <TriplesMap1>
      a rr:TriplesMap;
 
-     rr:logicalTable [ rr:tableName "Student" ];
+     rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/Student{ID}{FirstName}{LastName}";
+    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:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:firstName ]; 
-      rr:objectMap    [ rr:column "FirstName" ]
+      rr:objectMap    [ rr:column "\"FirstName\"" ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:lastName ]; 
-      rr:objectMap    [ rr:column "LastName" ]
+      rr:objectMap    [ rr:column "\"LastName\"" ]
     ]
     .
--- a/D003-1table3columns1row/r2rmlb.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D003-1table3columns1row/r2rmlb.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -17,13 +17,13 @@
                      """
                      ];
 
-    rr:subjectMap [ rr:template "http://example.com/Student{ID}{FirstName}{LastName}"; 
+    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:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
--- a/D003-1table3columns1row/r2rmlc.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D003-1table3columns1row/r2rmlc.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -22,20 +22,20 @@
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:id ]; 
-      rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+      rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:firstName ]; 
-      rr:objectMap    [ rr:column "FirstName";
+      rr:objectMap    [ rr:column "\"FirstName\"";
 						rr:termType rr:Literal ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:lastName ]; 
-      rr:objectMap    [ rr:column "LastName";
+      rr:objectMap    [ rr:column "\"LastName\"";
 						rr:termType rr:Literal ]
     ]
     .
--- a/D003-1table3columns1row/r2rmld.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D003-1table3columns1row/r2rmld.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -22,20 +22,20 @@
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:id ]; 
-      rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+      rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:firstName ]; 
-      rr:objectMap    [ rr:template "http://example.com/data/{FirstName}";
+      rr:objectMap    [ rr:template "http://example.com/data/{\"FirstName\"}";
 						rr:termType rr:IRI ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:lastName ]; 
-      rr:objectMap    [ rr:template "http://example.com/data/{LastName}";
+      rr:objectMap    [ rr:template "http://example.com/data/{\"LastName\"}";
 						rr:termType rr:IRI ]
     ]
     .
--- a/D004-1table2columns1row/r2rmla.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D004-1table2columns1row/r2rmla.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -7,29 +7,29 @@
 <TriplesMap1>
     a rr:TriplesMap;
 
-	rr:logicalTable [ rr:tableName  "Student_Sport" ];
+	rr:logicalTable [ rr:tableName  "\"Student_Sport\"" ];
 	
-    rr:subjectMap [ rr:template "http://example.com/{Student}";
+    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" ]
+      rr:objectMap    [ rr:column "\"Student\"" ]
     ]
     .
 
 <TriplesMap2>
     a rr:TriplesMap;
 
-	rr:logicalTable [ rr:tableName  "Student_Sport" ];
+	rr:logicalTable [ rr:tableName  "\"Student_Sport\"" ];
 	
-    rr:subjectMap [ rr:template "http://example.com/{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" ]
+      rr:objectMap    [ rr:column "\"Sport\"" ]
     ]
 	.
\ No newline at end of file
--- a/D004-1table2columns1row/r2rmlb.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D004-1table2columns1row/r2rmlb.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -8,9 +8,9 @@
     a rr:TriplesMap;
 
       rr:logicalTable [ rr:sqlQuery """
-       Select ('Student' || Student) AS StudentId,
-				Student
-         from Student_Sport
+       SELECT ('Student' || "Student") AS StudentId,
+				"Student"
+         FROM "Student_Sport"
        """;
 	   ] ;
 
@@ -20,7 +20,7 @@
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
-      rr:objectMap    [ rr:column "Student" ]
+      rr:objectMap    [ rr:column "\"Student\"" ]
     ]
     .
 
@@ -28,9 +28,9 @@
     a rr:TriplesMap;
 
       rr:logicalTable [ rr:sqlQuery """
-       Select ('Sport' || Sport) AS SportId,
-			Sport
-         from Student_Sport
+       SELECT ('Sport' || "Sport") AS SportId,
+			"Sport"
+         FROM "Student_Sport"
        """;
 	  ];
 
@@ -40,6 +40,6 @@
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
-      rr:objectMap    [ rr:column "Sport" ]
+      rr:objectMap    [ rr:column "\"Sport\"" ]
     ]
 	.
\ No newline at end of file
--- a/D005-1table3columns3rows2duplicates/r2rmla.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D005-1table3columns3rows2duplicates/r2rmla.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -7,15 +7,15 @@
 <TriplesMap1>
     a rr:TriplesMap;
     
-    rr:logicalTable [ rr:tableName "IOUs" ];
+    rr:logicalTable [ rr:tableName "\"IOUs\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/{fname}-{lname}";
+    rr:subjectMap [ rr:template "http://example.com/{\"fname\"}-{\"lname\"}";
                     rr:class foaf:Person ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:owes ]; 
-      rr:objectMap    [ rr:column "amount"; rr:datatype xsd:float ]
+      rr:objectMap    [ rr:column "\"amount\""; rr:datatype xsd:float ]
     ];
 
     .
--- a/D006-1table1primarykey1column1row/r2rmla.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D006-1table1primarykey1column1row/r2rmla.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -7,13 +7,13 @@
 <TriplesMap1>
     a rr:TriplesMap;
     
-    rr:logicalTable [ rr:tableName "Student" ];
+    rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/{Name}" ]; 
+    rr:subjectMap [ rr:template "http://example.com/{\"Name\"}" ]; 
 	
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
     ]
     .
--- a/D007-1table1primarykey2columns1row/r2rmla.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D007-1table1primarykey2columns1row/r2rmla.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -9,9 +9,9 @@
 <TriplesMap1>
      a rr:TriplesMap;
 
-	rr:logicalTable [ rr:tableName "Student" ];
+	rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/Student{ID}{Name}"; 
+    rr:subjectMap [ rr:template "http://example.com/Student{\"ID\"}{\"Name\"}"; 
 					rr:graphMap [ rr:constant ex:PersonGraph; ]
 	];
 	
@@ -24,13 +24,13 @@
     rr:predicateObjectMap
     [ 
 		rr:predicateMap [ rr:constant ex:id; ];
-		rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+		rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:firstName; ];
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
     ]
 
     .
--- a/D007-1table1primarykey2columns1row/r2rmlb.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D007-1table1primarykey2columns1row/r2rmlb.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -9,9 +9,9 @@
 <TriplesMap1>
      a rr:TriplesMap;
 
-	rr:logicalTable [ rr:tableName "Student"; ];
+	rr:logicalTable [ rr:tableName "\"Student\""; ];
 
-    rr:subjectMap [ rr:template "http://example.com/Student{ID}{Name}"; 
+    rr:subjectMap [ rr:template "http://example.com/Student{\"ID\"}{\"Name\"}"; 
 				    rr:graph ex:PersonGraph;
 	];
 	
@@ -24,13 +24,13 @@
     rr:predicateObjectMap
     [ 
 		rr:predicate  ex:id;
-		rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+		rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicate foaf:firstName;
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
     ]
 
     .
--- a/D007-1table1primarykey2columns1row/r2rmlc.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D007-1table1primarykey2columns1row/r2rmlc.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -9,23 +9,23 @@
 <TriplesMap1>
      a rr:TriplesMap;
 
-	rr:logicalTable [ rr:tableName "Student" ];
+	rr:logicalTable [ rr:tableName "\"Student\"" ];
 
     rr:subjectMap [ 
-		rr:template "http://example.com/Student{ID}{Name}"; 
+		rr:template "http://example.com/Student{\"ID\"}{\"Name\"}"; 
 		rr:class foaf:Person,ex:Student; 
 	];
 	
     rr:predicateObjectMap
     [ 
 		rr:predicateMap [ rr:constant ex:id; ];
-		rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+		rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:firstName; ];
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
     ]
 
     .
--- a/D007-1table1primarykey2columns1row/r2rmld.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D007-1table1primarykey2columns1row/r2rmld.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -9,10 +9,10 @@
 <TriplesMap1>
      a rr:TriplesMap;
 
-	rr:logicalTable [ rr:tableName "Student" ];
+	rr:logicalTable [ rr:tableName "\"Student\"" ];
 
     rr:subjectMap [ 
-		rr:template "http://example.com/Student{ID}{Name}"; 
+		rr:template "http://example.com/Student{\"ID\"}{\"Name\"}"; 
 	];
 	
     rr:predicateObjectMap
@@ -30,13 +30,13 @@
     rr:predicateObjectMap
     [ 
 		rr:predicateMap [ rr:constant ex:id; ];
-		rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+		rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:firstName; ];
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
     ]
 
     .
--- a/D007-1table1primarykey2columns1row/r2rmle.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D007-1table1primarykey2columns1row/r2rmle.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -9,9 +9,9 @@
 <TriplesMap1>
      a rr:TriplesMap;
 
-	rr:logicalTable [ rr:tableName "Student" ];
+	rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/Student{ID}{Name}"; 
+    rr:subjectMap [ rr:template "http://example.com/Student{\"ID\"}{\"Name\"}"; 
 					rr:graphMap [ rr:constant ex:PersonGraph];
 					rr:class foaf:Person
 	];
@@ -19,13 +19,13 @@
     rr:predicateObjectMap
     [ 
 		rr:predicateMap [ rr:constant ex:id; ];
-		rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+		rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:firstName; ];
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
     ]
 
     .
\ No newline at end of file
--- a/D007-1table1primarykey2columns1row/r2rmlf.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D007-1table1primarykey2columns1row/r2rmlf.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -9,9 +9,9 @@
 <TriplesMap1>
      a rr:TriplesMap;
 
-	rr:logicalTable [ rr:tableName "Student" ];
+	rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-	rr:subjectMap [ rr:template "http://example.com/Student{ID}{Name}";
+	rr:subjectMap [ rr:template "http://example.com/Student{\"ID\"}{\"Name\"}";
 					rr:graphMap [ rr:constant ex:PersonGraph];
 	];
 	
@@ -24,13 +24,13 @@
     rr:predicateObjectMap
     [ 
 		rr:predicateMap [ rr:constant ex:id; ];
-		rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+		rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:firstName; ];
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
     ]
 
     .
\ No newline at end of file
--- a/D008-1table1compositeprimarykey3columns1row/r2rmla.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D008-1table1compositeprimarykey3columns1row/r2rmla.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -9,10 +9,10 @@
 <TriplesMap1>
      a rr:TriplesMap;
 
-	rr:logicalTable [ rr:tableName "Student" ];
+	rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/Student{ID}{Name}"; 
-					rr:graphMap [ rr:template "http://example.com/graph/Student{ID}{Name}"; ]
+    rr:subjectMap [ rr:template "http://example.com/Student{\"ID\"}{\"Name\"}"; 
+					rr:graphMap [ rr:template "http://example.com/graph/Student{\"ID\"}{\"Name\"}"; ]
 	];
 	
     rr:predicateObjectMap
@@ -24,19 +24,19 @@
     rr:predicateObjectMap
     [ 
 		rr:predicateMap [ rr:constant ex:id; ];
-		rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+		rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:name; ];
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:Sport; ];
-      rr:objectMap    [ rr:column "Sport" ]
+      rr:objectMap    [ rr:column "\"Sport\"" ]
     ]
 	
     .
--- a/D008-1table1compositeprimarykey3columns1row/r2rmlb.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D008-1table1compositeprimarykey3columns1row/r2rmlb.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -9,9 +9,9 @@
 
 <TriplesMap2>
 	a rr:TriplesMap;
-	rr:logicalTable [ rr:tableName "Student" ];
+	rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-	rr:subjectMap [ rr:template "http://example.com/{Sport}"; ];
+	rr:subjectMap [ rr:template "http://example.com/{\"Sport\"}"; ];
 
 	rr:predicateObjectMap [
 		rr:predicateMap [rr:constant rdf:type ];
@@ -22,9 +22,9 @@
 <TriplesMap1>
      a rr:TriplesMap;
 
-	rr:logicalTable [ rr:tableName "Student" ];
+	rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/Student{ID}{Name}";
+    rr:subjectMap [ rr:template "http://example.com/Student{\"ID\"}{\"Name\"}";
 	];
 	
     rr:predicateObjectMap
@@ -36,13 +36,13 @@
     rr:predicateObjectMap
     [ 
 		rr:predicateMap [ rr:constant ex:id; ];
-		rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+		rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:name; ];
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
     ];
  
     rr:predicateObjectMap
--- a/D008-1table1compositeprimarykey3columns1row/r2rmlc.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D008-1table1compositeprimarykey3columns1row/r2rmlc.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -9,9 +9,9 @@
 <TriplesMap1>
      a rr:TriplesMap;
 
-	rr:logicalTable [ rr:tableName "Student" ];
+	rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/Student{ID}{Name}"; 
+    rr:subjectMap [ rr:template "http://example.com/Student{\"ID\"}{\"Name\"}"; 
 	];
 	
     rr:predicateObjectMap
@@ -23,20 +23,20 @@
     rr:predicateObjectMap
     [ 
 		rr:predicateMap [ rr:constant ex:id; ];
-		rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+		rr:objectMap    [ rr:column "\"ID\"\"; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:name; ];
       rr:predicateMap [ rr:constant ex:name; ];
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:Sport; ];
-      rr:objectMap    [ rr:column "Sport" ]
+      rr:objectMap    [ rr:column "\"Sport\"" ]
     ]
 	
     .
--- a/D009-2tables1primarykey1foreignkey/r2rmla.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D009-2tables1primarykey1foreignkey/r2rmla.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -8,11 +8,11 @@
 <TriplesMap1>
     a rr:TriplesMap;
         
-	rr:logicalTable [ rr:tableName  "Student" ];
+	rr:logicalTable [ rr:tableName  "\"Student\"" ];
 	
     rr:subjectMap 
     [ 
-        rr:template "http://example.com/resource/student_{ID}";
+        rr:template "http://example.com/resource/student_{\"ID\"}";
         rr:termType rr:IRI;
         rr:class <http://example.com/ontology/Student>;
     ]; 
@@ -21,7 +21,7 @@
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
       rr:objectMap    [ 
-             rr:column "Name";
+             rr:column "\"Name\"";
              rr:termType rr:Literal;
       ];
     ];
@@ -32,8 +32,8 @@
       rr:objectMap    [ 
            rr:parentTriplesMap <TriplesMap2>;
            rr:joinCondition [
-				rr:child "Sport" ;
-				rr:parent "ID" ;
+				rr:child "\"Sport\"" ;
+				rr:parent "\"ID\"" ;
 		   ]
       ];
     ];
@@ -42,11 +42,11 @@
 <TriplesMap2>
     a rr:TriplesMap;
 		
-	rr:logicalTable [ rr:tableName  "Sport" ];
+	rr:logicalTable [ rr:tableName  "\"Sport\"" ];
 
     rr:subjectMap 
     [ 
-        rr:template "http://example.com/resource/sport_{ID}";
+        rr:template "http://example.com/resource/sport_{\"ID\"}";
         rr:termType rr:IRI;
         rr:class <http://example.com/ontology/Sport>;
     ]; 
@@ -55,7 +55,7 @@
     [ 
       rr:predicateMap [ rr:constant rdfs:label ]; 
       rr:objectMap    [ 
-             rr:column "Name"; 
+             rr:column "\"Name\""; 
              rr:termType rr:Literal;
       ];
     ];
--- a/D009-2tables1primarykey1foreignkey/r2rmlb.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D009-2tables1primarykey1foreignkey/r2rmlb.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -8,11 +8,11 @@
 <TriplesMap1>
     a rr:TriplesMap;
         
-	rr:logicalTable [ rr:tableName  "Student" ];
+	rr:logicalTable [ rr:tableName  "\"Student\"" ];
 	
     rr:subjectMap 
     [ 
-        rr:template "http://example.com/resource/student_{ID}";
+        rr:template "http://example.com/resource/student_{\"ID\"}";
         rr:termType rr:IRI;
         rr:class <http://example.com/ontology/Student>;
         rr:graphMap [ rr:constant <http://example.com/graph/students> ] ;
@@ -22,7 +22,7 @@
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
       rr:objectMap    [ 
-             rr:column "Name";
+             rr:column "\"Name\"";
              rr:termType rr:Literal;
       ];
       rr:graphMap [ rr:constant <http://example.com/graph/students> ];
@@ -34,8 +34,8 @@
       rr:objectMap    [ 
            rr:parentTriplesMap <TriplesMap2>;
            rr:joinCondition [
-				rr:child "Sport" ;
-				rr:parent "ID" ;
+				rr:child "\"Sport\"" ;
+				rr:parent "\"ID\"" ;
 		   ]
       ];
       rr:graphMap [ rr:constant <http://example.com/graph/practise> ];
@@ -46,11 +46,11 @@
     a rr:TriplesMap;
         
 		
-	rr:logicalTable [ rr:tableName  "Sport" ];
+	rr:logicalTable [ rr:tableName  "\"Sport\"" ];
 
     rr:subjectMap 
     [ 
-        rr:template "http://example.com/resource/sport_{ID}";
+        rr:template "http://example.com/resource/sport_{\"ID\"}";
         rr:termType rr:IRI;
         rr:class <http://example.com/ontology/Sport>;
         rr:graphMap [ rr:constant <http://example.com/graph/sports> ];
@@ -60,7 +60,7 @@
     [ 
       rr:predicateMap [ rr:constant rdfs:label ]; 
       rr:objectMap    [ 
-             rr:column "Name"; 
+             rr:column "\"Name\""; 
              rr:termType rr:Literal;
       ];
       
--- a/D009-2tables1primarykey1foreignkey/r2rmlc.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D009-2tables1primarykey1foreignkey/r2rmlc.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -9,14 +9,14 @@
    a rr:TriplesMap;
         
    rr:logicalTable [ rr:sqlQuery """
-        SELECT Name, COUNT(Sport)
-        FROM Student
-        GROUP BY Name
+        SELECT "Name", COUNT("Sport")
+        FROM "Student"
+        GROUP BY "Name"
         """ ];
 	
     rr:subjectMap 
     [ 
-        rr:template "http://example.com/resource/student_{Name}";
+        rr:template "http://example.com/resource/student_{\"Name\"}";
         rr:termType rr:IRI;
         rr:class <http://example.com/ontology/Student>;
     ]; 
@@ -25,7 +25,7 @@
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
       rr:objectMap    [ 
-             rr:column "Name";
+             rr:column "\"Name\"";
              rr:termType rr:Literal;
       ];
     ];
--- a/D009-2tables1primarykey1foreignkey/r2rmld.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D009-2tables1primarykey1foreignkey/r2rmld.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -9,9 +9,9 @@
    a rr:TriplesMap;
         
    rr:logicalTable [ rr:sqlQuery """
-        SELECT Name, COUNT(Sport) as SPORTCOUNT
-        FROM Student
-        GROUP BY Name
+        SELECT "Name", COUNT("Sport") as SPORTCOUNT
+        FROM "Student"
+        GROUP BY "Name"
         """ ];
 	
     rr:subjectMap 
@@ -25,7 +25,7 @@
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
       rr:objectMap    [ 
-             rr:column "Name";
+             rr:column "\"Name\"";
              rr:termType rr:Literal;
       ];
     ];
--- a/D010-1table1primarykey3colums3rows/r2rmla.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D010-1table1primarykey3colums3rows/r2rmla.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -7,13 +7,13 @@
 <TriplesMap1>
     a rr:TriplesMap;
         
-	rr:logicalTable [ rr:tableName "Country Info"; ] ;
+	rr:logicalTable [ rr:tableName "\"Country Info\""; ] ;
 	
-    rr:subjectMap [ rr:template "http://example.com/{Country Code}" ]; 
+    rr:subjectMap [ rr:template "http://example.com/{\"Country Code\"}" ]; 
 	
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:name ]; 
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
     ]
     .
\ No newline at end of file
--- a/D010-1table1primarykey3colums3rows/r2rmlb.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D010-1table1primarykey3colums3rows/r2rmlb.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -7,13 +7,13 @@
 <TriplesMap1>
     a rr:TriplesMap;
         
-	rr:logicalTable [ rr:tableName "Country Info"; ] ;
+	rr:logicalTable [ rr:tableName "\"Country Info\""; ] ;
 	
-    rr:subjectMap [ rr:template "http://example.com/{Country Code}{Name}" ]; 
+    rr:subjectMap [ rr:template "http://example.com/{\"Country Code\"}{\"Name\"}" ]; 
 	
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:name ]; 
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
     ]
     .
\ No newline at end of file
--- a/D010-1table1primarykey3colums3rows/r2rmlc.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D010-1table1primarykey3colums3rows/r2rmlc.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -7,9 +7,9 @@
 <TriplesMap1>
     a rr:TriplesMap;
         
-	rr:logicalTable [ rr:tableName "Country Info"; ] ;
+	rr:logicalTable [ rr:tableName "\"Country Info\""; ] ;
 	
-    rr:subjectMap [ rr:template "http://example.com/{Country Code}{Name}" ]; 
+    rr:subjectMap [ rr:template "http://example.com/{\"Country Code\"}{\"Name\"}" ]; 
 	
     rr:predicateObjectMap
     [ 
--- a/D011-M2MRelations/r2rmlb.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D011-M2MRelations/r2rmlb.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -6,54 +6,54 @@
 
 <TriplesMap1>
 	a rr:TriplesMap; 
-    rr:logicalTable [ rr:tableName "Student"; ] ;
+    rr:logicalTable [ rr:tableName "\"Student\""; ] ;
     rr:subjectMap [
-        rr:template "http://example.com/student/{ID}";
+        rr:template "http://example.com/student/{\"ID\"}";
         rr:class ex:Student;
     ];
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:firstName ]; 
-      rr:objectMap    [ rr:column "FirstName" ]
+      rr:objectMap    [ rr:column "\"FirstName\"" ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:lastName ]; 
-      rr:objectMap    [ rr:column "LastName" ]
+      rr:objectMap    [ rr:column "\"LastName\"" ]
     ]
 	.	
     
 <TriplesMap2>
 	a rr:TriplesMap; 
-    rr:logicalTable [ rr:tableName "Sport"; ] ;
+    rr:logicalTable [ rr:tableName "\"Sport\""; ] ;
     rr:subjectMap [
-        rr:template "http://example.com/sport/{ID}";
+        rr:template "http://example.com/sport/{\"ID\"}";
         rr:class ex:Sport;
     ];
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:id ]; 
-      rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+      rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:description ]; 
-      rr:objectMap    [ rr:column "Description" ]
+      rr:objectMap    [ rr:column "\"Description\"" ]
     ]
 	.
 
 <LinkMap_1_2>
 	a rr:TriplesMap; 
    
-   rr:logicalTable [ rr:tableName "Student_Sport" ];
+   rr:logicalTable [ rr:tableName "\"Student_Sport\"" ];
    
-   rr:subjectMap [ rr:template "http://example.com/student/{ID_Student}" ];
+   rr:subjectMap [ rr:template "http://example.com/student/{\"ID_Student\"}" ];
    
    rr:predicateObjectMap [
        rr:predicateMap [ rr:constant ex:plays ];
-       rr:objectMap [ rr:template "http://example.com/sport/{ID_Sport}" ];
+       rr:objectMap [ rr:template "http://example.com/sport/{\"ID_Sport\"}" ];
    ].
    
    
--- a/D012-2tables2duplicates0nulls/r2rmla.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D012-2tables2duplicates0nulls/r2rmla.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -7,10 +7,10 @@
 <TriplesMap1>
     a rr:TriplesMap;
 
-	rr:logicalTable [ rr:tableName  "IOUs" ];
+	rr:logicalTable [ rr:tableName  "\"IOUs\"" ];
 	
     rr:subjectMap [
-            rr:template "{fname}_{lname}_{amount}"; 
+            rr:template "{\"fname\"}_{\"lname\"}_{\"amount\"}"; 
             rr:termType rr:BlankNode;
             rr:class ex:IOU; 
       ];
@@ -19,7 +19,7 @@
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
       rr:objectMap    [ 
-            rr:template "{fname} {lname}";
+            rr:template "{\"fname\"} {\"lname\"}";
             rr:termType rr:Literal ;
       ]
     ];
@@ -28,7 +28,7 @@
     [ 
       rr:predicateMap [ rr:constant ex:amount ]; 
       rr:objectMap    [ 
-            rr:column "amount";
+            rr:column "\"amount\"";
             rr:termType rr:Literal ;
             rr:datatype xsd:float ;
       ]
--- a/D012-2tables2duplicates0nulls/r2rmlb.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D012-2tables2duplicates0nulls/r2rmlb.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -7,10 +7,10 @@
 <TriplesMap1>
     a rr:TriplesMap;
 
-	rr:logicalTable [ rr:tableName  "IOUs" ]; 
+	rr:logicalTable [ rr:tableName  "\"IOUs\"" ]; 
 	
     rr:subjectMap [
-            rr:template "{fname}_{lname}"; 
+            rr:template "{\"fname\"}_{\"lname\"}"; 
             rr:termType rr:BlankNode ;
             rr:class ex:IOU; 
       ];
@@ -19,7 +19,7 @@
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
       rr:objectMap    [ 
-            rr:template "{fname} {lname}";
+            rr:template "{\"fname\"} {\"lname\"}";
             rr:termType rr:Literal ;
       ]
     ];
@@ -27,10 +27,10 @@
 <TriplesMap2>
     a rr:TriplesMap;
 	
-	rr:logicalTable [ rr:tableName  "Lives" ]; 
+	rr:logicalTable [ rr:tableName  "\"Lives\"" ]; 
 
     rr:subjectMap [
-            rr:template "{fname}_{lname}"; 
+            rr:template "{\"fname\"}_{\"lname\"}"; 
             rr:termType rr:BlankNode;
             rr:class ex:IOU; 
       ];
@@ -39,7 +39,7 @@
     [ 
       rr:predicateMap [ rr:constant ex:city ]; 
       rr:objectMap    [ 
-            rr:column "city";
+            rr:column "\"city\"";
             rr:termType rr:Literal ; 
       ]
     ];
--- a/D012-2tables2duplicates0nulls/r2rmlc.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D012-2tables2duplicates0nulls/r2rmlc.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -7,13 +7,13 @@
 <TriplesMap1>
     a rr:TriplesMap;
 
-	rr:logicalTable [ rr:tableName  "IOUs" ];
+	rr:logicalTable [ rr:tableName  "\"IOUs\"" ];
 	
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
       rr:objectMap    [ 
-            rr:template "{fname} {lname}";
+            rr:template "{\"fname\"} {\"lname\"}";
             rr:termType rr:Literal ;
       ]
     ];
@@ -22,7 +22,7 @@
     [ 
       rr:predicateMap [ rr:constant ex:amount ]; 
       rr:objectMap    [ 
-            rr:column "amount";
+            rr:column "\"amount\"";
             rr:termType rr:Literal ;
             rr:datatype xsd:float ;
       ]
--- a/D012-2tables2duplicates0nulls/r2rmld.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D012-2tables2duplicates0nulls/r2rmld.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -7,16 +7,16 @@
 <TriplesMap1>
     a rr:TriplesMap;
 
-	rr:logicalTable [ rr:tableName  "IOUs" ];
+	rr:logicalTable [ rr:tableName  "\"IOUs\"" ];
 	
     rr:subjectMap [
-            rr:template "{fname}_{lname}_{amount}"; 
+            rr:template "{\"fname\"}_{\"lname\"}_{\"amount\"}"; 
             rr:termType rr:BlankNode;
             rr:class ex:IOU; 
       ];
 
     rr:subjectMap [
-            rr:template "{amount}_{fname}_{lname}"; 
+            rr:template "{\"amount\"}_{\"fname\"}_{\"lname\"}"; 
             rr:termType rr:BlankNode;
             rr:class ex:IOU; 
       ];
@@ -25,7 +25,7 @@
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
       rr:objectMap    [ 
-            rr:template "{fname} {lname}";
+            rr:template "{\"fname\"} {\"lname\"}";
             rr:termType rr:Literal ;
       ]
     ];
@@ -34,7 +34,7 @@
     [ 
       rr:predicateMap [ rr:constant ex:amount ]; 
       rr:objectMap    [ 
-            rr:column "amount";
+            rr:column "\"amount\"";
             rr:termType rr:Literal ;
             rr:datatype xsd:float ;
       ]
--- a/D013-1table1primarykey3columns2rows1nullvalue/r2rmla.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D013-1table1primarykey3columns2rows1nullvalue/r2rmla.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -9,9 +9,9 @@
 <TriplesMap1>
      a rr:TriplesMap;
 
-	rr:logicalTable [ rr:tableName "Person" ];
+	rr:logicalTable [ rr:tableName "\"Person\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/Person{ID}{Name}{DateOfBirth}";  ];
+    rr:subjectMap [ rr:template "http://example.com/Person{\"ID\"}{\"Name\"}{\"DateOfBirth\"}";  ];
 	
     rr:predicateObjectMap
     [ 
@@ -22,19 +22,19 @@
     rr:predicateObjectMap
     [ 
 		rr:predicateMap [ rr:constant ex:id; ];
-		rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+		rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:name; ];
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:BirthDay; ];
-      rr:objectMap    [ rr:column "DateOfBirth" ]
+      rr:objectMap    [ rr:column "\"DateOfBirth\"" ]
     ]
 	
     .
--- a/D014-3tables1primarykey1foreignkey/r2rmla.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/r2rmla.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -13,30 +13,30 @@
             , "deptno"
             , "dname"
             , "loc"
-         from DEPT
+         from "DEPT"
        """ ];
 
-    rr:subjectMap [ rr:column "deptId"; rr:termType rr:BlankNode;
+    rr:subjectMap [ rr:column "\"deptId\""; rr:termType rr:BlankNode;
                     rr:class ex:dept; 
                     rr:graphMap [ rr:graph ex:DeptGraph; ];
-                    rr:inverseExpression "{deptno} = substr({deptId},length('Department')+1)"];
+                    rr:inverseExpression "{\"deptno\"} = substr({\"deptId\"},length('Department')+1)"];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant dept:deptno ]; 
-      rr:objectMap    [ rr:column "deptno"; rr:datatype xsd:positiveInteger ]
+      rr:objectMap    [ rr:column "\"deptno\""; rr:datatype xsd:positiveInteger ]
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant dept:name ]; 
-      rr:objectMap    [ rr:column "dname" ]
+      rr:objectMap    [ rr:column "\"dname\"" ]
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant dept:location ]; 
-      rr:objectMap    [ rr:column "loc" ]
+      rr:objectMap    [ rr:column "\"loc\"" ]
     ];
 
     rr:predicateObjectMap 
--- a/D014-3tables1primarykey1foreignkey/r2rmlb.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/r2rmlb.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -11,34 +11,34 @@
 <TriplesMap1>
     a rr:TriplesMap;
     rr:logicalTable [ rr:sqlQuery """
-       Select ('Department' || deptno) AS deptId
-            , deptno
-            , dname
-            , loc
-         from DEPT
+       Select ('Department' || "deptno") AS deptId
+            , "deptno"
+            , "dname"
+            , "loc"
+         from "DEPT"
        """ ];
 
     rr:subjectMap [ rr:column "deptId"; rr:termType rr:BlankNode;
                     rr:class ex:dept; 
                     rr:graphMap [ rr:constant ex:DeptGraph; ];
-                    rr:inverseExpression "{deptno} = substr({deptId},length('Department')+1)"];
+                    rr:inverseExpression "{\"deptno\"} = substr({"deptId"},length('Department')+1)"];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant dept:deptno ]; 
-      rr:objectMap    [ rr:column "deptno"; rr:datatype xsd:positiveInteger ]
+      rr:objectMap    [ rr:column "\"deptno\""; rr:datatype xsd:positiveInteger ]
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant dept:name ]; 
-      rr:objectMap    [ rr:column "dname" ]
+      rr:objectMap    [ rr:column "\"dname\"" ]
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant dept:location ]; 
-      rr:objectMap    [ rr:column "loc" ]
+      rr:objectMap    [ rr:column "\"loc\"" ]
     ];
 
     rr:predicateObjectMap 
@@ -51,16 +51,16 @@
 <TriplesMap2>
     a rr:TriplesMap;
     rr:logicalTable [ rr:sqlQuery """
-       Select ('http://example.com/emp/' || empno) AS empURI
-            , empno
-            , ename
-            , ('http://example.com/emp/job/'|| job) AS jobTypeURI
-            , job
+       Select ('http://example.com/emp/' || "empno") AS empURI
+            , "empno"
+            , "ename"
+            , ('http://example.com/emp/job/'|| "job") AS jobTypeURI
+            , "job"
             , deptno
-            , ('http://example.com/emp/etype/'|| etype) AS empTypeURI
-            , etype
-            , ('http://example.com/graph/'|| job || '/' || etype) AS graphURI
-       from EMP
+            , ('http://example.com/emp/etype/'|| "etype") AS empTypeURI
+            , "etype"
+            , ('http://example.com/graph/'|| "job" || '/' || "etype") AS graphURI
+       from "EMP"
        """ ];
 
     rr:subjectMap [ rr:column "empURI";
@@ -94,32 +94,32 @@
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant emp:empno ]; 
-      rr:objectMap    [ rr:column "empno" ]
+      rr:objectMap    [ rr:column "\"empno\"" ]
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant emp:name ]; 
-      rr:objectMap    [ rr:column "ename" ]; 
+      rr:objectMap    [ rr:column "\"ename\"" ]; 
       rr:graphMap     [ rr:constant emp:empNameGraph ];
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant emp:job ]; 
-      rr:objectMap    [ rr:column "job" ]
+      rr:objectMap    [ rr:column "\"job\"" ]
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant emp:deptNum ]; 
-      rr:objectMap    [ rr:column "deptno" ]
+      rr:objectMap    [ rr:column "\"deptno\"" ]
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant emp:etype ]; 
-      rr:objectMap    [ rr:column "etype" ]
+      rr:objectMap    [ rr:column "\"etype\"" ]
     ];
 
     rr:predicateObjectMap [
@@ -127,8 +127,8 @@
       rr:objectMap    [
         rr:parentTriplesMap <TriplesMap1>;
         rr:joinCondition [
-          rr:child "deptno";
-          rr:parent "deptno";
+          rr:child "\"deptno\"";
+          rr:parent "\"deptno\"";
         ];
       ];
     ]
--- a/D014-3tables1primarykey1foreignkey/r2rmlc.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/r2rmlc.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -12,34 +12,34 @@
 <TriplesMap1>
     a rr:TriplesMap;
     rr:logicalTable [ rr:sqlQuery """
-       Select ('Department' || deptno) AS deptId
-            , deptno
-            , dname
-            , loc
-         from DEPT
+       Select ('Department' || "deptno") AS deptId
+            , "deptno"
+            , "dname"
+            , "loc"
+         from "DEPT"
        """ ];
 
     rr:subjectMap [ rr:column "deptId"; rr:termType rr:BlankNode;
                     rr:class ex:dept; 
                     rr:graphMap [ rr:constant ex:DeptGraph; ];
-                    rr:inverseExpression "{deptno} = substr({deptId},length('Department')+1)"];
+                    rr:inverseExpression "{\"deptno\"} = substr({deptId},length('Department')+1)"];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant dept:deptno ]; 
-      rr:objectMap    [ rr:column "deptno"; rr:datatype xsd:positiveInteger ]
+      rr:objectMap    [ rr:column "\"deptno\""; rr:datatype xsd:positiveInteger ]
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant dept:name ]; 
-      rr:objectMap    [ rr:column "dname" ]
+      rr:objectMap    [ rr:column "\"dname\"" ]
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant dept:location ]; 
-      rr:objectMap    [ rr:column "loc" ]
+      rr:objectMap    [ rr:column "\"loc\"" ]
     ];
 
     rr:predicateObjectMap 
@@ -52,66 +52,66 @@
 <TriplesMap2>
     a rr:TriplesMap;
 
-    rr:logicalTable [ rr:tableName "EMP" ];
+    rr:logicalTable [ rr:tableName "\"EMP\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/emp/{empno}";
+    rr:subjectMap [ rr:template "http://example.com/emp/{\"empno\"}";
                     rr:class ex:emp; 
-                    rr:graphMap [ rr:template "http://example.com/graph/{job}/{etype}"; ];
+                    rr:graphMap [ rr:template "http://example.com/graph/{\"job\"}/{\"etype\"}"; ];
                   ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant emp:jobtype ]; 
-      rr:objectMap    [ rr:template "http://example.com/emp/job/{job}" ]
+      rr:objectMap    [ rr:template "http://example.com/emp/job/{\"job\"}" ]
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant rdf:type ]; 
-      rr:objectMap    [ rr:template "http://example.com/emp/job/{job}" ]
+      rr:objectMap    [ rr:template "http://example.com/emp/job/{\"job\"}" ]
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant emp:emptype ]; 
-      rr:objectMap    [ rr:template "http://example.com/emp/etype/{etype}" ]
+      rr:objectMap    [ rr:template "http://example.com/emp/etype/{\"etype\"}" ]
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant rdf:type ]; 
-      rr:objectMap    [ rr:template "http://example.com/emp/etype/{etype}" ]
+      rr:objectMap    [ rr:template "http://example.com/emp/etype/{\"etype\"}" ]
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant emp:empno ]; 
-      rr:objectMap    [ rr:column "empno" ]
+      rr:objectMap    [ rr:column "\"empno\"" ]
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant emp:name ]; 
-      rr:objectMap    [ rr:column "ename" ]; 
+      rr:objectMap    [ rr:column "\"ename\"" ]; 
       rr:graphMap     [ rr:constant emp:empNameGraph ];
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant emp:job ]; 
-      rr:objectMap    [ rr:column "job" ]
+      rr:objectMap    [ rr:column "\"job\"" ]
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant emp:deptNum ]; 
-      rr:objectMap    [ rr:column "deptno" ]
+      rr:objectMap    [ rr:column "\"deptno\"" ]
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant emp:etype ]; 
-      rr:objectMap    [ rr:column "etype" ]
+      rr:objectMap    [ rr:column "\"etype\"" ]
     ];
 
     rr:predicateObjectMap [
@@ -119,8 +119,8 @@
       rr:objectMap    [
         rr:parentTriplesMap <TriplesMap1>;
         rr:joinCondition [
-          rr:child "deptno";
-          rr:parent "deptno";
+          rr:child "\"deptno\"";
+          rr:parent "\"deptno\"";
         ];
       ];
     ]
--- a/D014-3tables1primarykey1foreignkey/r2rmld.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/r2rmld.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -10,34 +10,34 @@
 <TriplesMap1>
     a rr:TriplesMap;
     rr:logicalTable [ rr:sqlQuery """
-       Select ('Department' || deptno) AS deptId
-            , deptno
-            , dname
-            , loc
-         from DEPT
+       Select ('Department' || "deptno") AS deptId
+            , "deptno"
+            , "dname"
+            , "loc"
+         from "DEPT"
        """ ];
 
     rr:subjectMap [ rr:column "deptId"; rr:termType rr:BlankNode;
                     rr:class ex:dept; 
                     rr:graphMap [ rr:constant ex:DeptGraph; ];
-                    rr:inverseExpression "{deptno} = substr({deptId},length('Department')+1)"];
+                    rr:inverseExpression "{"deptno"} = substr({deptId},length('Department')+1)"];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant dept:deptno ]; 
-      rr:objectMap    [ rr:column "deptno"; rr:datatype xsd:positiveInteger ]
+      rr:objectMap    [ rr:column "\"deptno\""; rr:datatype xsd:positiveInteger ]
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant dept:name ]; 
-      rr:objectMap    [ rr:column "dname" ]
+      rr:objectMap    [ rr:column "\"dname\"" ]
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant dept:location ]; 
-      rr:objectMap    [ rr:column "loc" ]
+      rr:objectMap    [ rr:column "\"loc\"" ]
     ];
 
     rr:predicateObjectMap 
@@ -50,22 +50,22 @@
 
 <jobtypeObjectMap>
     a rr:ObjectMap;
-    rr:template "http://example.com/emp/job/{job}"
+    rr:template "http://example.com/emp/job/{\"job\"}"
     .
 
 <emptypeObjectMap>
     a rr:ObjectMap;
-    rr:template "http://example.com/emp/etype/{etype}"
+    rr:template "http://example.com/emp/etype/{\"etype\"}"
     .
 
 <TriplesMap2>
     a rr:TriplesMap;
 
-    rr:logicalTable [ rr:tableName "EMP" ];
+    rr:logicalTable [ rr:tableName "\"EMP\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/emp/{empno}";
+    rr:subjectMap [ rr:template "http://example.com/emp/{\"empno\"}";
                     rr:class ex:emp; 
-                    rr:graphMap [ rr:template "http://example.com/graph/{job}/{etype}"; ];
+                    rr:graphMap [ rr:template "http://example.com/graph/{\"job\"}/{\"etype\"}"; ];
                   ];
 
     rr:predicateObjectMap 
@@ -95,32 +95,32 @@
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant emp:empno ]; 
-      rr:objectMap    [ rr:column "empno" ]
+      rr:objectMap    [ rr:column "\"empno\"" ]
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant emp:name ]; 
-      rr:objectMap    [ rr:column "ename" ]; 
+      rr:objectMap    [ rr:column "\"ename\"" ]; 
       rr:graphMap     [ rr:constant emp:empNameGraph ];
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant emp:job ]; 
-      rr:objectMap    [ rr:column "job" ]
+      rr:objectMap    [ rr:column "\"job\"" ]
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant emp:deptNum ]; 
-      rr:objectMap    [ rr:column "deptno" ]
+      rr:objectMap    [ rr:column "\"deptno\"" ]
     ];
 
     rr:predicateObjectMap 
     [ 
       rr:predicateMap [ rr:constant emp:etype ]; 
-      rr:objectMap    [ rr:column "etype" ]
+      rr:objectMap    [ rr:column "\"etype\"" ]
     ];
 
     rr:predicateObjectMap [
@@ -128,8 +128,8 @@
       rr:objectMap    [
         rr:parentTriplesMap <TriplesMap1>;
         rr:joinCondition [
-          rr:child "deptno";
-          rr:parent "deptno";
+          rr:child "\"deptno\"";
+          rr:parent "\"deptno\"";
         ];
       ];
     ]
--- a/D014-3tables1primarykey1foreignkey/r2rmle.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/r2rmle.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -10,10 +10,10 @@
 <TriplesMap3>
     a rr:TriplesMap;
     rr:logicalTable [ rr:sqlQuery """
-      Select ('http://example.com/emp/' || id) AS empId
-           , ('http://example.com/emp/likes/' || likeType) AS empLikes
-           , likedObj
-        from LIKES
+      Select ('http://example.com/emp/' || "id") AS empId
+           , ('http://example.com/emp/likes/' || "likeType") AS empLikes
+           , "likedObj"
+        from "LIKES"
       """ ];
 
     rr:subjectMap [
--- a/D014-3tables1primarykey1foreignkey/r2rmlf.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D014-3tables1primarykey1foreignkey/r2rmlf.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -11,15 +11,15 @@
 	a rr:TriplesMap;
     rr:logicalTable [ rr:sqlQuery """
 
-        SELECT *, (CASE JOB
+        SELECT *, (CASE "job"
             WHEN 'CLERK' THEN 'general-office'
             WHEN 'NIGHTGUARD' THEN 'security'
             WHEN 'ENGINEER' THEN 'engineering'
-        END) ROLE FROM EMP
+        END) ROLE FROM "EMP"
 
         """ ];
     rr:subjectMap [
-        rr:template "http://data.example.com/employee/{EMPNO}";
+        rr:template "http://data.example.com/employee/{\"empno\"}";
     ];
     rr:predicateObjectMap [
         rr:predicate ex:role;
--- a/D015-1table3columns1composityeprimarykey3rows2languages/r2rmla.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D015-1table3columns1composityeprimarykey3rows2languages/r2rmla.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -15,12 +15,12 @@
 					   WHERE "Lan" = 'EN';
                        """ ] ;
 	
-    rr:subjectMap [ rr:template "http://example.com/{Code}" ]; 
+    rr:subjectMap [ rr:template "http://example.com/{\"Code\"}" ]; 
 	
     rr:predicateObjectMap
     [ 
       rr:predicate rdfs:label;
-      rr:objectMap    [ rr:column "Name"; rr:language "en" ]
+      rr:objectMap    [ rr:column "\"Name\""; rr:language "en" ]
     ]
     .
 	
@@ -33,11 +33,11 @@
 					   WHERE "Lan" = 'ES';
                        """ ] ;
 	
-    rr:subjectMap [ rr:template "http://example.com/{Code}" ]; 
+    rr:subjectMap [ rr:template "http://example.com/{\"Code\"}" ]; 
 	
     rr:predicateObjectMap
     [ 
       rr:predicate rdfs:label;
-      rr:objectMap    [ rr:column "Name"; rr:language "es" ]
+      rr:objectMap    [ rr:column "\"Name\""; rr:language "es" ]
     ]
     .	
\ No newline at end of file
--- a/D015-1table3columns1composityeprimarykey3rows2languages/r2rmlb.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D015-1table3columns1composityeprimarykey3rows2languages/r2rmlb.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -15,12 +15,12 @@
 					   WHERE "Lan" = 'EN';
                        """ ] ;
 	
-    rr:subjectMap [ rr:template "http://example.com/{Code}" ]; 
+    rr:subjectMap [ rr:template "http://example.com/{\"Code\"}" ]; 
 	
     rr:predicateObjectMap
     [ 
       rr:predicate rdfs:label;
-      rr:objectMap    [ rr:column "Name"; rr:language "english" ]
+      rr:objectMap    [ rr:column "\"Name\""; rr:language "english" ]
     ]
     .
 	
@@ -33,11 +33,11 @@
 					   WHERE "Lan" = 'ES';
                        """ ] ;
 	
-    rr:subjectMap [ rr:template "http://example.com/{Code}" ]; 
+    rr:subjectMap [ rr:template "http://example.com/{\"Code\"}" ]; 
 	
     rr:predicateObjectMap
     [ 
       rr:predicate rdfs:label;
-      rr:objectMap    [ rr:column "Name"; rr:language "spanish" ]
+      rr:objectMap    [ rr:column "\"Name\""; rr:language "spanish" ]
     ]
     .	
\ No newline at end of file
--- a/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmla.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmla.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -9,9 +9,9 @@
 <TriplesMap1>
     a rr:TriplesMap;
 
-	rr:logicalTable [ rr:tableName "Patient" ];
+	rr:logicalTable [ rr:tableName "\"Patient\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/Patient{ID}"; ];
+    rr:subjectMap [ rr:template "http://example.com/Patient{\"ID\"}"; ];
 	
     rr:predicateObjectMap
     [ 
@@ -22,25 +22,25 @@
     rr:predicateObjectMap
     [ 
 		rr:predicateMap [ rr:constant ex:id; ];
-		rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+		rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicate	foaf:firstName;
-      rr:objectMap    [ rr:column "FirstName"; rr:datatype xsd:string ]
+      rr:objectMap    [ rr:column "\"FirstName\""; rr:datatype xsd:string ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicate foaf:lastName;
-      rr:objectMap    [ rr:column "LastName"; rr:datatype xsd:string ]
+      rr:objectMap    [ rr:column "\"LastName\""; rr:datatype xsd:string ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicate foaf:gender;
-      rr:objectMap    [ rr:column "Sex"; rr:datatype xsd:string ]
+      rr:objectMap    [ rr:column "\"Sex\""; rr:datatype xsd:string ]
     ];
 
     .
--- a/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmlb.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmlb.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -9,9 +9,9 @@
 <TriplesMap1>
     a rr:TriplesMap;
 
-	rr:logicalTable [ rr:tableName "Patient" ];
+	rr:logicalTable [ rr:tableName "\"Patient\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/Patient{ID}"; ];
+    rr:subjectMap [ rr:template "http://example.com/Patient{\"ID\"}"; ];
 	
     rr:predicateObjectMap
     [ 
@@ -22,13 +22,13 @@
     rr:predicateObjectMap
     [ 
       rr:predicate ex:weight;
-      rr:objectMap    [ rr:column "Weight"; rr:datatype xsd:real ]
+      rr:objectMap    [ rr:column "\"Weight\""; rr:datatype xsd:real ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicate ex:height;
-      rr:objectMap    [ rr:column "Height"; rr:datatype xsd:float ]
+      rr:objectMap    [ rr:column "\"Height\""; rr:datatype xsd:float ]
     ];
 
     .
--- a/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmlc.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmlc.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -9,9 +9,9 @@
 <TriplesMap1>
     a rr:TriplesMap;
 
-	rr:logicalTable [ rr:tableName "Patient" ];
+	rr:logicalTable [ rr:tableName "\"Patient\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/Patient{ID}"; ];
+    rr:subjectMap [ rr:template "http://example.com/Patient{\"ID\"}"; ];
 	
     rr:predicateObjectMap
     [ 
@@ -22,13 +22,13 @@
     rr:predicateObjectMap
     [ 
       rr:predicate ex:birthdate;
-      rr:objectMap    [ rr:column "BirthDate"; rr:datatype xsd:date ]
+      rr:objectMap    [ rr:column "\"BirthDate\""; rr:datatype xsd:date ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicate ex:entrancedate;
-      rr:objectMap    [ rr:column "EntranceDate"; rr:datatype xsd:dateTime ]
+      rr:objectMap    [ rr:column "\"EntranceDate\""; rr:datatype xsd:dateTime ]
     ];
 
     .
--- a/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmld.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmld.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -9,9 +9,9 @@
 <TriplesMap1>
     a rr:TriplesMap;
 
-	rr:logicalTable [ rr:tableName "Patient" ];
+	rr:logicalTable [ rr:tableName "\"Patient\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/Patient{ID}"; ];
+    rr:subjectMap [ rr:template "http://example.com/Patient{\"ID\"}"; ];
 	
     rr:predicateObjectMap
     [ 
@@ -22,7 +22,7 @@
     rr:predicateObjectMap
     [ 
       rr:predicate ex:paid;
-      rr:objectMap    [ rr:column "PaidInAdvance"; rr:datatype xsd:boolean ]
+      rr:objectMap    [ rr:column "\"PaidInAdvance\""; rr:datatype xsd:boolean ]
     ];
 
     .
--- a/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmle.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D016-1table1primarykey10columns3rowsSQLdatatypes/r2rmle.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -9,9 +9,9 @@
 <TriplesMap1>
     a rr:TriplesMap;
 
-	rr:logicalTable [ rr:tableName "Patient" ];
+	rr:logicalTable [ rr:tableName "\"Patient\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/Patient{ID}"; ];
+    rr:subjectMap [ rr:template "http://example.com/Patient{\"ID\"}"; ];
 	
     rr:predicateObjectMap
     [ 
@@ -22,7 +22,7 @@
     rr:predicateObjectMap
     [ 
       rr:predicate ex:photo;
-      rr:objectMap    [ rr:column "Photo"; rr:datatype xsd:base64Binary ]
+      rr:objectMap    [ rr:column "\"Photo\""; rr:datatype xsd:base64Binary ]
     ];
 
     .
--- a/D018-1table1primarykey2columns3rows/r2rmla.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D018-1table1primarykey2columns3rows/r2rmla.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -7,20 +7,20 @@
 <TriplesMap1>
     a rr:TriplesMap;
     
-    rr:logicalTable [ rr:tableName "Student" ];
+    rr:logicalTable [ rr:tableName "\"Student\"" ];
 
-    rr:subjectMap [ rr:template "http://example.com/{ID}";
+    rr:subjectMap [ rr:template "http://example.com/{\"ID\"}";
                     rr:class foaf:Person ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant ex:id ]; 
-      rr:objectMap    [ rr:column "ID"; rr:datatype xsd:integer ]
+      rr:objectMap    [ rr:column "\"ID\""; rr:datatype xsd:integer ]
     ];
 
     rr:predicateObjectMap
     [ 
       rr:predicateMap [ rr:constant foaf:name ]; 
-      rr:objectMap    [ rr:column "Name" ]
+      rr:objectMap    [ rr:column "\"Name\"" ]
     ]
     .
\ No newline at end of file
Binary file D019-1table1primarykey3columns3rows/.DS_Store has changed
--- a/D019-1table1primarykey3columns3rows/r2rmla.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D019-1table1primarykey3columns3rows/r2rmla.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -14,10 +14,10 @@
                        """
                        ];
     
-	rr:subjectMap [ rr:column "FirstName" ]; 
+	rr:subjectMap [ rr:column "\"FirstName\"" ]; 
 	rr:predicateObjectMap
     [ 
       rr:predicate foaf:name; 
-      rr:objectMap    [ rr:column "FirstName" ];
+      rr:objectMap    [ rr:column "\"FirstName\"" ];
     ];
 .
--- a/D019-1table1primarykey3columns3rows/r2rmlb.ttl	Wed Feb 29 12:30:02 2012 +0100
+++ b/D019-1table1primarykey3columns3rows/r2rmlb.ttl	Wed Feb 29 20:44:12 2012 +0100
@@ -6,11 +6,11 @@
 
 <TriplesMap1>
     a rr:TriplesMap;
-    rr:logicalTable [ rr:tableName "Employee" ];
-	rr:subjectMap [ rr:column "FirstName" ]; 
+    rr:logicalTable [ rr:tableName "\"Employee\"" ];
+	rr:subjectMap [ rr:column "\"FirstName\"" ]; 
 	rr:predicateObjectMap
     [ 
       rr:predicate foaf:name; 
-      rr:objectMap    [ rr:column "FirstName" ];
+      rr:objectMap    [ rr:column "\"FirstName\"" ];
     ];
 .
Binary file ts1.zip has changed