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

Fix for changes in pgQueryRunner

Browse Source
This commit is contained in:
Javier Goizueta
2016-01-20 13:13:02 +01:00
parent 3dad225568
commit 09568050d6
1 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cartodb/api/overviews_api.js
+13 -20
View File
@@ -14,6 +14,7 @@ function OverviewsApi(pgQueryRunner) {
module.exports = OverviewsApi;
OverviewsApi.prototype.getOverviewsMetadata = function (username, sql, callback) {
var self = this;
this.queryTablesApi.getAffectedTablesInQuery(username, sql, function(err, tableNames){
if (err) {
callback(err);
@@ -26,13 +27,19 @@ OverviewsApi.prototype.getOverviewsMetadata = function (username, sql, callback)
tableNames.forEach(function(tableName) {
q.defer(function(done){
var query = "SELECT * FROM CDB_Overviews('" + tableName + "');";
this.pgQueryRunner.run(username, query, handleOverviewsRows, function(err, table_metadata){
if (err) {
done(err);
} else {
metadata[tableName] = table_metadata;
done(null);
self.pgQueryRunner.run(username, query, function handleOverviewsRows(err, rows) {
if (err){
var msg = err.message ? err.message : err;
done(new Error('could not get overviews metadata: ' + msg));
return;
}
var table_metadata = {};
for ( var i=0; i<rows.length; ++i ) {
var row = rows[i];
table_metadata[row.z] = { table: row.overview_table };
}
metadata[tableName] = table_metadata;
done(null);
});
});
});
@@ -47,17 +54,3 @@ OverviewsApi.prototype.getOverviewsMetadata = function (username, sql, callback)
}
});
};
function handleOverviewsRows(err, rows, callback) {
if (err){
var msg = err.message ? err.message : err;
callback(new Error('could not get overviews metadata: ' + msg));
return;
}
var metadata = {};
for ( var i=0; i<rows.length; ++i ) {
var row = rows[i];
metadata[row.z] = { table: row.overview_table };
}
callback(null, metadata);
}