aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
diff options
context:
space:
mode:
authorDana Sherson <robot@dana.sh>2019-06-05 18:01:15 +1000
committerDana Sherson <robot@dana.sh>2019-06-05 18:26:19 +1000
commit459657a9f86f2ff951608e21b4b217e1057c50af (patch)
tree723b8141600dce95cfc86c55fef34d97ff1aa92a /activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
parentc8847c17a7c9ae75c44c522c56ccd9c5fca25ea7 (diff)
downloadrails-459657a9f86f2ff951608e21b4b217e1057c50af.tar.gz
rails-459657a9f86f2ff951608e21b4b217e1057c50af.tar.bz2
rails-459657a9f86f2ff951608e21b4b217e1057c50af.zip
Use compact_blank throughout rails
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index ef33d712ad..59e58d5d35 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -474,12 +474,12 @@ module ActiveRecord
# distinct queries, and requires that the ORDER BY include the distinct column.
# See https://dev.mysql.com/doc/refman/5.7/en/group-by-handling.html
def columns_for_distinct(columns, orders) # :nodoc:
- order_columns = orders.reject(&:blank?).map { |s|
+ order_columns = orders.compact_blank.map { |s|
# Convert Arel node to string
s = s.to_sql unless s.is_a?(String)
# Remove any ASC/DESC modifiers
s.gsub(/\s+(?:ASC|DESC)\b/i, "")
- }.reject(&:blank?).map.with_index { |column, i| "#{column} AS alias_#{i}" }
+ }.compact_blank.map.with_index { |column, i| "#{column} AS alias_#{i}" }
(order_columns << super).join(", ")
end