From 8518255e1063425235f1e469ffab76b9b7ec5055 Mon Sep 17 00:00:00 2001 From: gogbajbobo Date: Tue, 20 Jun 2017 14:00:30 +0300 Subject: [PATCH 1/3] fix exec error: { code: '-131', text: 'Syntax error near \',\' on line 1' } if selectGrouped is empty --- server/components/orm/selectQuery.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/components/orm/selectQuery.js b/server/components/orm/selectQuery.js index 2a213a4..4069724 100644 --- a/server/components/orm/selectQuery.js +++ b/server/components/orm/selectQuery.js @@ -192,7 +192,9 @@ export default function (parameters) { groupBy = groupByList.join(', '); orderBy = groupBy; - result.query = `SELECT ${selectGrouped.join(', ')}, count(*) as [count()] `; + selectGrouped.push('count(*) as [count()]'); + + result.query = `SELECT ${selectGrouped.join(', ')}`; _.each(cnfg.fields, (field, name) => { From e886ada4dcdb5a6117d41886992b41e79533e45e Mon Sep 17 00:00:00 2001 From: gogbajbobo Date: Tue, 20 Jun 2017 14:10:43 +0300 Subject: [PATCH 2/3] fix exec error: { code: '-854', text: 'Function or column reference to \'ts\' in the ORDER BY clause is invalid' } if selectGrouped is empty --- server/components/orm/selectQuery.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/components/orm/selectQuery.js b/server/components/orm/selectQuery.js index 4069724..bd4d2b2 100644 --- a/server/components/orm/selectQuery.js +++ b/server/components/orm/selectQuery.js @@ -18,6 +18,8 @@ export default function (parameters) { let groupBy = params['groupBy:']; + let onlyCountQuery = false; + function parseOrderByParams(params) { let arr = params.split(','); @@ -192,6 +194,7 @@ export default function (parameters) { groupBy = groupByList.join(', '); orderBy = groupBy; + if (selectGrouped.length === 0) onlyCountQuery = true; selectGrouped.push('count(*) as [count()]'); result.query = `SELECT ${selectGrouped.join(', ')}`; @@ -424,7 +427,7 @@ export default function (parameters) { result.query += ` GROUP BY ${groupBy} ` } - if (!params['agg:']) { + if (!params['agg:'] && !onlyCountQuery) { if (orderBy) { result.query += ` ORDER BY ${orderBy}`; } else { From dc9d6025933b24a7afda91511517b3ea9020bdb3 Mon Sep 17 00:00:00 2001 From: gogbajbobo Date: Wed, 12 Jul 2017 15:46:58 +0300 Subject: [PATCH 3/3] disallowTrailingWhitespace false --- .jscsrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.jscsrc b/.jscsrc index 70d8d4b..a98c9da 100644 --- a/.jscsrc +++ b/.jscsrc @@ -27,7 +27,7 @@ "disallowSpacesInsideArrayBrackets": true, "disallowSpacesInsideParentheses": true, "disallowTrailingComma": true, - "disallowTrailingWhitespace": true, + "disallowTrailingWhitespace": false, "requireCommaBeforeLineBreak": true, "requireLineFeedAtFileEnd": true, "requireSpaceAfterBinaryOperators": ["?", ":", "+", "-", "/", "*", "%", "==", "===", "!=", "!==", ">", ">=", "<", "<=", "&&", "||"],