use index based substitution for bind parameters

7 files changed, 10 insertions, 10 deletions

diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index b0e6136e12..d24cce0a3c 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -105,7 +105,7 @@ module ActiveRecord
 
       # Returns a bind substitution value given a +column+ and list of current
       # +binds+
-      def substitute_for(column, binds)
+      def substitute_at(column, index)
         Arel.sql '?'
       end
 
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 1c2cc7d5fa..05f0e5ebe1 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -511,8 +511,8 @@ module ActiveRecord
         end
       end
 
-      def substitute_for(column, current_values)
-        Arel.sql("$#{current_values.length + 1}")
+      def substitute_at(column, index)
+        Arel.sql("$#{index + 1}")
       end
 
       def exec_query(sql, name = 'SQL', binds = [])
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb
index 673e47942b..aae257a0e7 100644
--- a/activerecord/lib/active_record/relation/finder_methods.rb
+++ b/activerecord/lib/active_record/relation/finder_methods.rb
@@ -320,7 +320,7 @@ module ActiveRecord
 
       column = columns_hash[primary_key]
 
-      substitute = connection.substitute_for(column, @bind_values)
+      substitute = connection.substitute_at(column, @bind_values.length)
       relation = where(table[primary_key].eq(substitute))
       relation.bind_values = [[column, id]]
       record = relation.first
diff --git a/activerecord/test/cases/adapters/mysql/connection_test.rb b/activerecord/test/cases/adapters/mysql/connection_test.rb
index eb3f8143e7..eee771ecff 100644
--- a/activerecord/test/cases/adapters/mysql/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql/connection_test.rb
@@ -44,7 +44,7 @@ class MysqlConnectionTest < ActiveRecord::TestCase
   end
 
   def test_bind_value_substitute
-    bind_param = @connection.substitute_for('foo', [])
+    bind_param = @connection.substitute_at('foo', 0)
     assert_equal Arel.sql('?'), bind_param
   end
 
diff --git a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
index 2d412a6e2a..7c49236854 100644
--- a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
@@ -102,11 +102,11 @@ module ActiveRecord
         assert_equal [['1', 'foo']], result.rows
       end
 
-      def test_substitute_for
-        bind = @connection.substitute_for(nil, [])
+      def test_substitute_at
+        bind = @connection.substitute_at(nil, 0)
         assert_equal Arel.sql('$1'), bind
 
-        bind = @connection.substitute_for(nil, [nil])
+        bind = @connection.substitute_at(nil, 1)
         assert_equal Arel.sql('$2'), bind
       end
 
diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
index 0e2f468908..6ff04e3eb3 100644
--- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
@@ -80,7 +80,7 @@ module ActiveRecord
       end
 
       def test_bind_value_substitute
-        bind_param = @conn.substitute_for('foo', [])
+        bind_param = @conn.substitute_at('foo', 0)
         assert_equal Arel.sql('?'), bind_param
       end
 
diff --git a/activerecord/test/cases/bind_parameter_test.rb b/activerecord/test/cases/bind_parameter_test.rb
index 19383bb06b..3652255c38 100644
--- a/activerecord/test/cases/bind_parameter_test.rb
+++ b/activerecord/test/cases/bind_parameter_test.rb
@@ -33,7 +33,7 @@ module ActiveRecord
       # FIXME: use skip with minitest
       return unless @connection.supports_statement_cache?
 
-      sub   = @connection.substitute_for(@pk, [])
+      sub   = @connection.substitute_at(@pk, 0)
       binds = [[@pk, 1]]
       sql   = "select * from topics where id = #{sub}"