diff --git a/CHANGELOG.md b/CHANGELOG.md index ecda2a355..54e4347c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Change Log ## [Unreleased] +### Fixed +- Line Chart - Fix ambiguous groupBy field for MySQL databases. ## RELEASE 0.5.2 - 2016-12-13 ### Fixed diff --git a/services/line-stat-getter.js b/services/line-stat-getter.js index 7f8260291..a83f4177c 100644 --- a/services/line-stat-getter.js +++ b/services/line-stat-getter.js @@ -25,9 +25,9 @@ function LineStatGetter(model, params, opts) { } function getGroupByDateInterval() { - var column = params['group_by_date_field']; - if (isMysql()) { + var column = getGroupByDateField(); + switch (timeRange) { case 'day': return [ @@ -37,9 +37,10 @@ function LineStatGetter(model, params, opts) { 'date' ]; case 'week': + var columnFormated = '`' + column.replace('.', '`.`') + '`'; return [ - opts.sequelize.literal('DATE_FORMAT(DATE_SUB(' + column + ', ' + - 'INTERVAL ((7 + WEEKDAY(' + column + ')) % 7) DAY), ' + + opts.sequelize.literal('DATE_FORMAT(DATE_SUB(' + columnFormated + + ', INTERVAL ((7 + WEEKDAY(' + columnFormated + ')) % 7) DAY), ' + '\'%Y-%m-%d 00:00:00\')'), 'date' ];