diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2018-06-29 07:40:13 +0300 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2018-06-29 07:40:13 +0300 |
| commit | 9bc07524516a1091386c3ae118934018efbbd645 (patch) | |
| tree | eba2d6400868a85d6c0ecd0570c3192f3f25e986 | |
| parent | e763d6f8cae4f3bfc7e71b297f47e896b4de01d0 (diff) | |
[Rails5] Apply patchblackst0ne-rails5-master-with-patches
| -rw-r--r-- | app/models/milestone.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/blackst0ne-rails5-activerecord-statementinvalid-mysql2-error-expression-1-of-select-list-is-not-in-group-by-clause.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/models/milestone.rb b/app/models/milestone.rb index d05dcfd083a..d92fee2b4c8 100644 --- a/app/models/milestone.rb +++ b/app/models/milestone.rb @@ -131,7 +131,7 @@ class Milestone < ActiveRecord::Base rel.order(:project_id, :due_date).select('DISTINCT ON (project_id) id') else rel - .group(:project_id) + .group(:project_id, :id) .having('due_date = MIN(due_date)') .pluck(:id, :project_id, :due_date) .map(&:first) diff --git a/changelogs/unreleased/blackst0ne-rails5-activerecord-statementinvalid-mysql2-error-expression-1-of-select-list-is-not-in-group-by-clause.yml b/changelogs/unreleased/blackst0ne-rails5-activerecord-statementinvalid-mysql2-error-expression-1-of-select-list-is-not-in-group-by-clause.yml new file mode 100644 index 00000000000..d9cccc49830 --- /dev/null +++ b/changelogs/unreleased/blackst0ne-rails5-activerecord-statementinvalid-mysql2-error-expression-1-of-select-list-is-not-in-group-by-clause.yml @@ -0,0 +1,5 @@ +--- +title: "[Rails5] Fix milestone GROUP BY query" +merge_request: 20256 +author: "@blackst0ne" +type: fixed |