find_one uses prepared statement cache

2 files changed, 7 insertions, 1 deletions

diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index db7f9b7974..492a807ff5 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -718,6 +718,7 @@ module ActiveRecord #:nodoc:
       #    end
       #  end
       def reset_column_information
+        connection.reset!
         undefine_attribute_methods
         @column_names = @columns = @columns_hash = @content_columns = @dynamic_methods_hash = @inheritance_column = nil
         @arel_engine = @relation = @arel_table = nil
diff --git a/activerecord/lib/active_record/relation/finder_methods.rb b/activerecord/lib/active_record/relation/finder_methods.rb
index b763e22ec6..fe1ef2e2e3 100644
--- a/activerecord/lib/active_record/relation/finder_methods.rb
+++ b/activerecord/lib/active_record/relation/finder_methods.rb
@@ -288,7 +288,12 @@ module ActiveRecord
     def find_one(id)
       id = id.id if ActiveRecord::Base === id
 
-      record = where(primary_key.eq(id)).first
+      column = primary_key.column
+
+      substitute = connection.substitute_for(column, @bind_values)
+      relation = where(primary_key.eq(substitute))
+      relation.bind_values = [[column, id]]
+      record = relation.first
 
       unless record
         conditions = arel.where_sql