cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Analysis layers can have a sql_wrap option to wrap node queries

Browse Source
This commit is contained in:
Raul Ochoa
2016-05-06 16:37:52 +02:00
parent e4ba68850c
commit 7d4caf6974
3 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cartodb/models/analysis-mapconfig-adapter.js
+6 -1
View File
@@ -139,7 +139,12 @@ AnalysisMapConfigAdapter.prototype.getMapConfig = function(analysisConfiguration
var layerSourceId = getLayerSourceId(layer);
var layerNode = sourceId2Node[layerSourceId];
if (layerNode) {
layer.options.sql = layerQuery(layerNode.getQuery(), layerNode.getColumns());
var analysisSql = layerQuery(layerNode.getQuery(), layerNode.getColumns());
var sqlQueryWrap = layer.options.sql_wrap;
if (sqlQueryWrap) {
analysisSql = sqlQueryWrap.replace(/<%=\s*__analysis_query\s*%>/g, analysisSql);
}
layer.options.sql = analysisSql;
var layerDataviews = getLayerDataviews(layer, dataviews);
layer.options.columns = layerDataviews.reduce(function(columns, dataview) {
return columns.concat(getDataviewColumns(dataview));