ActiveRecord 3.1 association compatibility

cmeiklejohn · Jan 10, 2012 · 2c7bd06 · 2c7bd06
1 parent 6b406c9
commit 2c7bd06
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/History.txt b/History.txt
@@ -1,3 +1,8 @@
+== master
+
+  * ActiveRecord 3.1 association compatibility [Ian White]
+
+
 == 0.0.5
 
   * Adds Mongo Mapper adapter [Luke Cunningham]

diff --git a/lib/orm_adapter/adapters/active_record.rb b/lib/orm_adapter/adapters/active_record.rb
@@ -69,8 +69,15 @@ def conditions_to_fields(conditions)
       fields = {}
       conditions.each do |key, value|
         if value.is_a?(ActiveRecord::Base) && (assoc = klass.reflect_on_association(key.to_sym)) && assoc.belongs_to?
-          fields[assoc.primary_key_name] = value.send(value.class.primary_key)          
+
-          fields[assoc.options[:foreign_type]] = value.class.base_class.name.to_s if assoc.options[:polymorphic]
+          if ActiveRecord::VERSION::STRING < "3.1"
+            fields[assoc.primary_key_name] = value.send(value.class.primary_key)          
+            fields[assoc.options[:foreign_type]] = value.class.base_class.name.to_s if assoc.options[:polymorphic]
+          else # >= 3.1
+            fields[assoc.foreign_key] = value.send(value.class.primary_key)          
+            fields[assoc.foreign_type] = value.class.base_class.name.to_s if assoc.options[:polymorphic]
+          end
+
         else
           fields[key] = value
         end