diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2015-12-30 13:02:14 -0200 |
---|---|---|
committer | Rafael França <rafaelmfranca@gmail.com> | 2015-12-30 13:02:14 -0200 |
commit | 3affdc1a35c1a4d6835982136129f6bc41a6afc6 (patch) | |
tree | cbf4480c67ed6896ea16d4973a7c8199299a4041 /activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb | |
parent | 4f8bdfb40fd464d9bb3760dbac18cb6c6cbb4d4e (diff) | |
parent | d0be40cad168aae558eeb6a9b12acd8d113e3fc9 (diff) | |
download | rails-3affdc1a35c1a4d6835982136129f6bc41a6afc6.tar.gz rails-3affdc1a35c1a4d6835982136129f6bc41a6afc6.tar.bz2 rails-3affdc1a35c1a4d6835982136129f6bc41a6afc6.zip |
Merge pull request #22241 from kamipo/add_columns_for_distinct_for_mysql57
Add `columns_for_distinct` for MySQL 5.7 with ONLY_FULL_GROUP_BY
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb index 7bf548fcba..a918a8b035 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb @@ -1028,11 +1028,12 @@ module ActiveRecord end # Given a set of columns and an ORDER BY clause, returns the columns for a SELECT DISTINCT. - # Both PostgreSQL and Oracle overrides this for custom DISTINCT syntax - they + # PostgreSQL, MySQL, and Oracle overrides this for custom DISTINCT syntax - they # require the order columns appear in the SELECT. # # columns_for_distinct("posts.id", ["posts.created_at desc"]) - def columns_for_distinct(columns, orders) #:nodoc: + # + def columns_for_distinct(columns, orders) # :nodoc: columns end |