Improve Rails 5.1 compatibility

composite-primary-keys · May 23, 2017 · 635938d · 635938d
1 parent bb40a9e
commit 635938d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/lib/composite_primary_keys/associations/preloader/association.rb b/lib/composite_primary_keys/associations/preloader/association.rb
@@ -3,9 +3,9 @@ module Associations
     class Preloader
       class Association
         silence_warnings do
-          def query_scope(ids)
+          def records_for(ids)
             # CPK
-            # scope.where(association_key.in(ids))
+            # scope.where(association_key_name => ids)
 
             if reflection.foreign_key.is_a?(Array)
               predicate = cpk_in_predicate(table, reflection.foreign_key, ids)

diff --git a/lib/composite_primary_keys/associations/preloader/belongs_to.rb b/lib/composite_primary_keys/associations/preloader/belongs_to.rb
@@ -2,15 +2,15 @@ module ActiveRecord
   module Associations
     class Preloader
       class BelongsTo
-        def query_scope(ids)
+        def records_for(ids)
           # CPK
           # scope.where(association_key.in(ids))
 
           if association_key_name.is_a?(Array)
             predicate = cpk_in_predicate(table, association_key_name, ids)
             scope.where(predicate)
           else
-            scope.where(association_key.in(ids))
+            scope.where(association_key_name => ids)
           end
         end
       end

diff --git a/lib/composite_primary_keys/attribute_methods/write.rb b/lib/composite_primary_keys/attribute_methods/write.rb
@@ -2,6 +2,20 @@ module ActiveRecord
   module AttributeMethods
     module Write
       silence_warnings do
+        def write_attribute(attr_name, value)
+          name = if self.class.attribute_alias?(attr_name)
+            # CPK
+            # self.class.attribute_alias(attr_name).to_s
+            self.class.attribute_alias(attr_name)
+          else
+            # CPK
+            # attr_name.to_s
+            attr_name
+          end
+
+          write_attribute_with_type_cast(name, value, true)
+        end
+
         def write_attribute_with_type_cast(attr_name, value, should_type_cast)
           # CPK
           if attr_name.kind_of?(Array)