Skip to content

Commit 6897101

Browse files
author
Eneko Lakasta
authored
Merge pull request #514 from CartoDB/984-sql-timeout-error-message
Improve sql timeout error message
2 parents b066b6d + 55acccd commit 6897101

File tree

6 files changed

+18
-8
lines changed

6 files changed

+18
-8
lines changed

NEWS.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
## 2.1.1
44
Released 2018-mm-dd
55

6+
Announcements:
7+
* Improve error message when the DB query is over the user's limits
68

79
## 2.1.0
810
Released 2018-06-13

app/services/error_handler_factory.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ function isTimeoutError(err) {
1818

1919
function createTimeoutError() {
2020
return new ErrorHandler({
21-
message: 'You are over platform\'s limits. Please contact us to know more details',
21+
message: 'You are over platform\'s limits: SQL query timeout error.' +
22+
' Refactor your query before running again or contact CARTO support for more details.',
2223
context: 'limit',
2324
detail: 'datasource',
2425
http_status: 429

test/acceptance/app.test.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,8 @@ it('GET with callback must return 200 status error even if it is an error', func
791791
var error = JSON.parse(res.body);
792792
assert.deepEqual(error, {
793793
error: [
794-
'You are over platform\'s limits. Please contact us to know more details'
794+
'You are over platform\'s limits: SQL query timeout error.' +
795+
' Refactor your query before running again or contact CARTO support for more details.',
795796
],
796797
context: 'limit',
797798
detail: 'datasource'
@@ -817,7 +818,8 @@ it('GET with callback must return 200 status error even if it is an error', func
817818
var error = JSON.parse(res.body);
818819
assert.deepEqual(error, {
819820
error: [
820-
'You are over platform\'s limits. Please contact us to know more details'
821+
'You are over platform\'s limits: SQL query timeout error.' +
822+
' Refactor your query before running again or contact CARTO support for more details.',
821823
],
822824
context: 'limit',
823825
detail: 'datasource'

test/acceptance/copy-endpoints.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,8 @@ describe('copy-endpoints', function() {
216216
assert.ifError(err);
217217
assert.deepEqual(JSON.parse(res.body), {
218218
error: [
219-
'You are over platform\'s limits. Please contact us to know more details'
219+
'You are over platform\'s limits: SQL query timeout error.' +
220+
' Refactor your query before running again or contact CARTO support for more details.',
220221
],
221222
context: 'limit',
222223
detail: 'datasource'
@@ -251,7 +252,8 @@ describe('copy-endpoints', function() {
251252
},{}, function(err, res) {
252253
assert.ifError(err);
253254
const error = {
254-
error:["You are over platform's limits. Please contact us to know more details"],
255+
error: ['You are over platform\'s limits: SQL query timeout error.' +
256+
' Refactor your query before running again or contact CARTO support for more details.',],
255257
context:"limit",
256258
detail:"datasource"
257259
};

test/acceptance/export/timeout.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ describe('timeout', function () {
9898

9999
assert.deepEqual(res, {
100100
error: [
101-
'You are over platform\'s limits. Please contact us to know more details'
101+
'You are over platform\'s limits: SQL query timeout error.' +
102+
' Refactor your query before running again or contact CARTO support for more details.',
102103
],
103104
context: 'limit',
104105
detail: 'datasource'
@@ -180,7 +181,8 @@ describe('timeout', function () {
180181

181182
assert.deepEqual(res, {
182183
error: [
183-
'You are over platform\'s limits. Please contact us to know more details'
184+
'You are over platform\'s limits: SQL query timeout error.' +
185+
' Refactor your query before running again or contact CARTO support for more details.',
184186
],
185187
context: 'limit',
186188
detail: 'datasource'

test/unit/error_handler_factory.test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ describe('error-handler-factory', function () {
4444
const error = new Error('statement timeout');
4545
const errorHandler = errorHandlerFactory(error);
4646
const expectedError = new ErrorHandler({
47-
message: 'You are over platform\'s limits. Please contact us to know more details',
47+
message: 'You are over platform\'s limits: SQL query timeout error.' +
48+
' Refactor your query before running again or contact CARTO support for more details.',
4849
context: 'limit',
4950
detail: 'datasource',
5051
http_status: 429

0 commit comments

Comments
 (0)