camshaft quote_columns

lib/backends/cluster.js

@@ -75,6 +75,15 @@ const SKIP_COLUMNS = {
     the_geom_webmercator: true
 };
 
+function stripQuotes(columnName) {
+    const quotedName = columnName.length > 2 && columnName[0] === '"' && columnName[columnName.length - 1] === '"';
+    if (quotedName)
+    {
+        return columnName.substring(1, columnName.length - 1);
+    }
+    return columnName;
+}
+
 function getColumnsName (pg, query, callback) {
     const sql = schemaQuery({
         query: query
@@ -89,7 +98,7 @@ function getColumnsName (pg, query, callback) {
 
         const fields = resultSet.fields || [];
         const columnNames = fields.map(field => field.name)
-            .filter(columnName => !SKIP_COLUMNS[columnName]);
+            .filter(columnName => !SKIP_COLUMNS[stripQuotes(columnName)]);
 
         return callback(null, columnNames);
     }, true);

lib/models/mapconfig/adapter/analysis-mapconfig-adapter.js

@@ -179,6 +179,16 @@ AnalysisMapConfigAdapter.prototype.getMapConfig = function (user, requestMapConf
     });
 };
 
+
+function stripQuotes(columnName) {
+    const quotedName = columnName.length > 2 && columnName[0] === '"' && columnName[columnName.length - 1] === '"';
+    if (quotedName)
+    {
+        return columnName.substring(1, columnName.length - 1);
+    }
+    return columnName;
+}
+
 var SKIP_COLUMNS = {
     the_geom: true,
     the_geom_webmercator: true
@@ -186,7 +196,7 @@ var SKIP_COLUMNS = {
 
 function skipColumns (columnNames) {
     return columnNames
-        .filter(function (columnName) { return !SKIP_COLUMNS[columnName]; });
+        .filter(function (columnName) { return !SKIP_COLUMNS[stripQuotes(columnName)]; });
 }
 
 var wrappedQueryTpl = dot.template([