diff options
author | Sean Griffin <sean@thoughtbot.com> | 2014-11-17 15:04:40 -0800 |
---|---|---|
committer | Sean Griffin <sean@thoughtbot.com> | 2014-11-17 15:04:40 -0800 |
commit | eb26f24bde62cbbcd8ef0e7ee9c64060b098baff (patch) | |
tree | bd9a245d1bc6a6a480363c9254cdcd3508ee6ca4 /activerecord/lib/active_record/associations | |
parent | c01b20b658c9fe4b7d54f4a227a09cb090b5763d (diff) | |
download | rails-eb26f24bde62cbbcd8ef0e7ee9c64060b098baff.tar.gz rails-eb26f24bde62cbbcd8ef0e7ee9c64060b098baff.tar.bz2 rails-eb26f24bde62cbbcd8ef0e7ee9c64060b098baff.zip |
Remove the unused second argument to `substitute_at`
Oh hey, we got to remove some code because of that!
Diffstat (limited to 'activerecord/lib/active_record/associations')
-rw-r--r-- | activerecord/lib/active_record/associations/association_scope.rb | 3 | ||||
-rw-r--r-- | activerecord/lib/active_record/associations/join_dependency/join_association.rb | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations/association_scope.rb b/activerecord/lib/active_record/associations/association_scope.rb index b965230e60..dcbd57e61d 100644 --- a/activerecord/lib/active_record/associations/association_scope.rb +++ b/activerecord/lib/active_record/associations/association_scope.rb @@ -11,8 +11,7 @@ module ActiveRecord end def bind_value(scope, column, value, alias_tracker) - substitute = alias_tracker.connection.substitute_at( - column, scope.bind_values.length) + substitute = alias_tracker.connection.substitute_at(column) scope.bind_values += [[column, @block.call(value)]] substitute end 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 e7d3c9ba40..5dede5527d 100644 --- a/activerecord/lib/active_record/associations/join_dependency/join_association.rb +++ b/activerecord/lib/active_record/associations/join_dependency/join_association.rb @@ -67,7 +67,7 @@ module ActiveRecord value = foreign_klass.base_class.name column = klass.columns_hash[reflection.type.to_s] - substitute = klass.connection.substitute_at(column, bind_values.length) + substitute = klass.connection.substitute_at(column) bind_values.push [column, value] constraint = constraint.and table[reflection.type].eq substitute end |