1 files changed, 4 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb
index 7af4b29ebc..6f57441a66 100644
--- a/activerecord/lib/active_record/relation/finder_methods.rb
+++ b/activerecord/lib/active_record/relation/finder_methods.rb
@@ -299,11 +299,8 @@ module ActiveRecord
       when Array, Hash
         relation = relation.where(conditions)
       else
-        if conditions != :none
-          column = columns_hash[primary_key]
-          substitute = connection.substitute_at(column, bind_values.length)
-          relation = where(table[primary_key].eq(substitute))
-          relation.bind_values += [[column, conditions]]
+        unless conditions == :none
+          relation = where(primary_key => conditions)
         end
       end
 
@@ -351,7 +348,8 @@ module ActiveRecord
         if ActiveRecord::NullRelation === relation
           []
         else
-          rows = connection.select_all(relation.arel, 'SQL', relation.bind_values.dup)
+          arel = relation.arel
+          rows = connection.select_all(arel, 'SQL', arel.bind_values + relation.bind_values)
           join_dependency.instantiate(rows, aliases)
         end
       end