From 21f3c8a387bf87efde612a4ac160ec2d7cc4d9ad Mon Sep 17 00:00:00 2001 From: Javier Goizueta Date: Tue, 23 Feb 2016 11:45:26 +0100 Subject: [PATCH 1/2] Change error messages when getting overviews metadata fails Remove the detail that the error occurred trying to get overviews metadata from the error message. This should be less confusing to the user. --- lib/cartodb/api/overviews_metadata_api.js | 2 +- test/acceptance/multilayer_server.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/cartodb/api/overviews_metadata_api.js b/lib/cartodb/api/overviews_metadata_api.js index f3568f5c..4a8e8c92 100644 --- a/lib/cartodb/api/overviews_metadata_api.js +++ b/lib/cartodb/api/overviews_metadata_api.js @@ -26,7 +26,7 @@ OverviewsMetadataApi.prototype.getOverviewsMetadata = function (username, sql, c this.pgQueryRunner.run(username, query, function handleOverviewsRows(err, rows) { if (err){ var msg = err.message ? err.message : err; - callback(new Error('could not get overviews metadata: ' + msg)); + callback(new Error(msg)); return; } var metadata = {}; diff --git a/test/acceptance/multilayer_server.js b/test/acceptance/multilayer_server.js index 544aea6c..7728073b 100644 --- a/test/acceptance/multilayer_server.js +++ b/test/acceptance/multilayer_server.js @@ -334,7 +334,7 @@ describe('tests from old api translated to multilayer', function() { var parsed = JSON.parse(res.body); assert.deepEqual(parsed, { - errors: ["could not get overviews metadata: fake error message"] + errors: ["fake error message"] }); done(); From f0a1e7a0e0a82f4984cb4dfef0e5e46050cdad71 Mon Sep 17 00:00:00 2001 From: Javier Goizueta Date: Tue, 23 Feb 2016 18:15:14 +0100 Subject: [PATCH 2/2] Simplify error passing --- lib/cartodb/api/overviews_metadata_api.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/cartodb/api/overviews_metadata_api.js b/lib/cartodb/api/overviews_metadata_api.js index 4a8e8c92..738753f0 100644 --- a/lib/cartodb/api/overviews_metadata_api.js +++ b/lib/cartodb/api/overviews_metadata_api.js @@ -25,8 +25,7 @@ OverviewsMetadataApi.prototype.getOverviewsMetadata = function (username, sql, c var query = 'SELECT * FROM CDB_Overviews(CDB_QueryTablesText($windshaft$' + prepareSql(sql) + '$windshaft$))'; this.pgQueryRunner.run(username, query, function handleOverviewsRows(err, rows) { if (err){ - var msg = err.message ? err.message : err; - callback(new Error(msg)); + callback(err); return; } var metadata = {};