aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/postgresql
diff options
context:
space:
mode:
authorRafael Mendonça França <rafael@franca.dev>2019-07-25 16:18:18 -0400
committerRafael Mendonça França <rafael@franca.dev>2019-07-25 16:18:18 -0400
commitc9b7b9ff8adb3f01db0f9af90359030028a33b5b (patch)
tree02cf4d079caaa6f5553067f049950657714ad44f /activerecord/lib/active_record/connection_adapters/postgresql
parent706ee3eb490781387e9a7e00ab9cfdb3d3dbf264 (diff)
parent459657a9f86f2ff951608e21b4b217e1057c50af (diff)
downloadrails-c9b7b9ff8adb3f01db0f9af90359030028a33b5b.tar.gz
rails-c9b7b9ff8adb3f01db0f9af90359030028a33b5b.tar.bz2
rails-c9b7b9ff8adb3f01db0f9af90359030028a33b5b.zip
Merge pull request #36412 from robotdana/compact_blank
Add compact_blank shortcut for reject(&:blank?)
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/postgresql')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
index 0062952667..628a609521 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb
@@ -555,13 +555,13 @@ module ActiveRecord
# PostgreSQL requires the ORDER BY columns in the select list for distinct queries, and
# requires that the ORDER BY include the distinct column.
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, "")
.gsub(/\s+NULLS\s+(?:FIRST|LAST)\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