Make Model.find_or_create_by_* and find_or_initialize_by_* use relations and remove method caching

1 files changed, 4 insertions, 3 deletions

diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index f17b889c53..89b9b9b4ff 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -164,11 +164,12 @@ module ActiveRecord
     def find_or_instantiator_by_attributes(match, attributes, *args)
       guard_protected_attributes = false
 
-      attributes_for_create = conditions = attributes.inject({}) {|h, a| h[a] = args[attributes.index(a)]; h}
-
       if args[0].is_a?(Hash)
         guard_protected_attributes = true
-        conditions = args[0].with_indifferent_access.slice(*attributes).symbolize_keys
+        attributes_for_create = args[0].with_indifferent_access
+        conditions = attributes_for_create.slice(*attributes).symbolize_keys
+      else
+        attributes_for_create = conditions = attributes.inject({}) {|h, a| h[a] = args[attributes.index(a)]; h}
       end
 
       record = where(conditions).first