tyler-composite_primary_keys 1.1.3 → 1.1.4

data/lib/composite_primary_keys/associations.rb

@@ -80,9 +80,8 @@ module ActiveRecord::Associations::ClassMethods
           association = join.instantiate(row)
           collection.target.push(association) unless collection.target.include?(association)
         when :has_one, :belongs_to
-          return if record.id.to_s != join.parent.record_id(row).to_s or
-                    [*join.aliased_primary_key].any? { |key| row[key].nil? }
-          association = join.instantiate(row)
+          return if record.id.to_s != join.parent.record_id(row).to_s
+          association = join.instantiate(row) unless [*join.aliased_primary_key].any? { |key| row[key].nil? }
           record.send("set_#{join.reflection.name}_target", association)
         else
           raise ConfigurationError, "unknown macro: #{join.reflection.macro}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tyler-composite_primary_keys
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors: 
 - Dr Nic Williams