aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/join_dependency/join_association.rb
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2016-01-14 13:43:04 -0700
committerSean Griffin <sean@seantheprogrammer.com>2016-01-14 13:43:04 -0700
commit434ec2371498e99d4669453b66a4b9fa08f7a9a0 (patch)
tree2b1bca6c151f8c65a44e4fb71bc6f1ad6fc612cb /activerecord/lib/active_record/associations/join_dependency/join_association.rb
parentf138bea5da463509c0dc51283dd35e803796a77a (diff)
parenta557ab00f51e28d5609837f02fcc66d519615d3a (diff)
downloadrails-434ec2371498e99d4669453b66a4b9fa08f7a9a0.tar.gz
rails-434ec2371498e99d4669453b66a4b9fa08f7a9a0.tar.bz2
rails-434ec2371498e99d4669453b66a4b9fa08f7a9a0.zip
Merge pull request #23048 from kamipo/substitute_at_is_no_longer_used
`substitute_at` is no longer used
Diffstat (limited to 'activerecord/lib/active_record/associations/join_dependency/join_association.rb')
-rw-r--r--activerecord/lib/active_record/associations/join_dependency/join_association.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/associations/join_dependency/join_association.rb b/activerecord/lib/active_record/associations/join_dependency/join_association.rb
index a6ad09a38a..be65cf318c 100644
--- a/activerecord/lib/active_record/associations/join_dependency/join_association.rb
+++ b/activerecord/lib/active_record/associations/join_dependency/join_association.rb
@@ -74,9 +74,8 @@ module ActiveRecord
value = foreign_klass.base_class.name
column = klass.columns_hash[reflection.type.to_s]
- substitute = klass.connection.substitute_at(column)
binds << Relation::QueryAttribute.new(column.name, value, klass.type_for_attribute(column.name))
- constraint = constraint.and table[reflection.type].eq substitute
+ constraint = constraint.and table[reflection.type].eq(Arel::Nodes::BindParam.new)
end
joins << table.create_join(table, table.create_on(constraint), join_type)