cartodb/CartoDB-SQL-API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve row size limit error message

Browse Source
This commit is contained in:
Raul Ochoa 2015-03-02 14:34:01 +01:00
parent c590759302
commit 9b31df6793
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS.md
View File

@ -1,6 +1,10 @@
1.21.1 - 2015-mm-dd
-------------------
Enhancements:
* Improve row size limit error message
1.21.0 - 2015-03-02
-------------------

1
app/controllers/app.js
View File

@ -458,6 +458,7 @@ function handleQuery(req, res) {
sql = new PSQL.QueryWrapper(sql).orderBy(orderBy, sortOrder).window(limit, offset).query();
var opts = {
username: cdbUsername,
dbopts: dbopts,
sink: res,
gn: gn,

18
app/models/formats/pg.js
View File

@ -33,13 +33,6 @@ PostgresFormat.prototype.handleQueryRowWithSkipFields = function(row, result) {
this.handleQueryRow(row, result);
};
PostgresFormat.prototype.handleQueryError = function(err) {
this.error = err;
if (err.message && err.message.match(/row too large, was \d* bytes/i)) {
console.error(JSON.stringify({error: err.message}));
}
};
PostgresFormat.prototype.handleNotice = function(msg, result) {
if ( ! result.notices ) result.notices = [];
for (var i=0; i<msg.length; i++) {
@ -132,7 +125,16 @@ PostgresFormat.prototype.sendResponse = function(opts, callback) {
query.on('row', that.handleQueryRow.bind(that));
}
query.on('end', that.handleQueryEnd.bind(that));
query.on('error', that.handleQueryError.bind(that));
query.on('error', function(err) {
that.error = err;
if (err.message && err.message.match(/row too large, was \d* bytes/i)) {
console.error(JSON.stringify({
username: opts.username,
type: 'row_size_limit_exceeded',
error: err.message
}));
}
});
query.on('notice', function(msg) {
that.handleNotice(msg, query._result);
});

5
test/acceptance/app.test.js
View File

@ -1492,7 +1492,10 @@ test('GET with callback must return 200 status error even if it is an error', fu
},
function() {
assert.equal(hit, true);
assert.ok(JSON.parse(consoleError).error.match(/^row too large.*/i), "Expecting row size limit error");
var parsedError = JSON.parse(consoleError);
assert.ok(parsedError.error.match(/^row too large.*/i), "Expecting row size limit error");
assert.equal(parsedError.username, 'vizzuality');
assert.equal(parsedError.type, 'row_size_limit_exceeded');
global.settings.db_max_row_size = dbMaxRowSize;
console.error = consoleErrorFn;