diff options
| author | Miklos Fazkeas <mfazekas@szemafor.com> | 2014-12-09 15:20:22 +0100 |
|---|---|---|
| committer | Miklos Fazkeas <mfazekas@szemafor.com> | 2014-12-11 00:48:06 +0100 |
| commit | bd0d47eed6d88184cd9209b12f853f06b15de48a (patch) | |
| tree | 0fd80aed0dd503a4f81634379756519e24c6ef34 /activerecord/lib | |
| parent | 81e940c313b6924915ca77a0f3af66332c9f0b1f (diff) | |
| download | rails-bd0d47eed6d88184cd9209b12f853f06b15de48a.tar.gz rails-bd0d47eed6d88184cd9209b12f853f06b15de48a.tar.bz2 rails-bd0d47eed6d88184cd9209b12f853f06b15de48a.zip | |
Fix ProtocolViolation/bind message supplies for polymorphic + pluck or group
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/relation/calculations.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/relation/calculations.rb b/activerecord/lib/active_record/relation/calculations.rb index c8ebb41131..71673324eb 100644 --- a/activerecord/lib/active_record/relation/calculations.rb +++ b/activerecord/lib/active_record/relation/calculations.rb @@ -177,7 +177,7 @@ module ActiveRecord relation.select_values = column_names.map { |cn| columns_hash.key?(cn) ? arel_table[cn] : cn } - result = klass.connection.select_all(relation.arel, nil, bind_values) + result = klass.connection.select_all(relation.arel, nil, relation.arel.bind_values + bind_values) result.cast_values(klass.column_types) end end @@ -317,7 +317,7 @@ module ActiveRecord relation.group_values = group relation.select_values = select_values - calculated_data = @klass.connection.select_all(relation, nil, bind_values) + calculated_data = @klass.connection.select_all(relation, nil, relation.arel.bind_values + bind_values) if association key_ids = calculated_data.collect { |row| row[group_aliases.first] } |