restforce-db 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cf7836ccb586e04a24d23816d7c0ccea2c46ea9
-  data.tar.gz: 089b7c3596be1f796de185ca25ded3a613f19848
+  metadata.gz: aa1372a2f8baf6d0af77a254f0360d6ad37aef11
+  data.tar.gz: 323beb3762fbf77ef7aa79f0465924260d22432d
 SHA512:
-  metadata.gz: a4e81d52fc31bfdc3104b9720bceb1931410b7ad39d675a8bd9d172d1acedb3b99efe1f2c62937dca9d7b1c2fee57ad52161883988f0522df0876e41ed9552d4
-  data.tar.gz: c0153e58647b5f60bbb610f9b8bb56c65bed0bc514f1d22f31567274bd56c368185f8798ca63359fb4635c51af0764abece5e947a717bb9d5c855dcd09371b51
+  metadata.gz: ad8b9ed0abf1e713b416a1e352f2c65de949dde70d7ee08db7c3fb40240995a90f7ac4b912b8e34cefa625db2630fd942b40d0a9b61f15661138a69548ed1706
+  data.tar.gz: 5d065ba0b3078f5b5f67c6f7cb8f1de520eb5049bde8cd31b2f73c5ef6cf029ff16ae9a7337e128dc1fae18828b2d54cbe028613b74511f33a62522376f772ce

data/README.md

@@ -170,8 +170,7 @@ This _also_ defines an inverse relationship for a `belongs_to` relationship. The
 
 In the above example, `Dish__c` is a Salesforce object type which references the `Restaurant__c` object type through an aptly-named Lookup. There is no restriction on the number of `Dish__c` objects that may reference the same `Restaurant__c`, so we define this relationship as a `has_many` associaition in our `Restaurant` mapping.
 
-__NOTE__: Unlike `has_one` associations, `has_many` associations do not currently support multiple lookups from the same model. The Lookup is assumed
-to always refer to the `Id` of the parent object.
+__NOTE__: If one side of an association has multiple possible lookup fields, the other side of the association is expected to declare a _single_ lookup field, which will be treated as the canonical lookup for that relationship. The Lookup is assumed to always refer to the `Id` of the object declaring the `has_many`/`has_one` side of the association.
 
 ### Seed your data
 

data/lib/restforce/db/associations/base.rb

@@ -55,6 +55,25 @@ module Restforce
 
         private
 
+        # Internal: Get the appropriate Salesforce Lookup ID field for the
+        # passed mapping.
+        #
+        # mapping         - A Restforce::DB::Mapping.
+        # database_record - An instance of an ActiveRecord::Base subclass.
+        #
+        # Returns a String or nil.
+        def lookup_field(mapping, database_record)
+          inverse = inverse_association_name(target_reflection(database_record))
+          association = mapping.associations.detect { |a| a.name == inverse }
+          return unless association
+
+          if lookup.is_a?(Array)
+            association.lookup
+          else
+            lookup
+          end
+        end
+
         # Internal: Get a list of all newly-constructed records based on this
         # association, for a set of lookups.
         #

data/lib/restforce/db/associations/belongs_to.rb

@@ -76,21 +76,6 @@ module Restforce
           salesforce_instance.record[inverse_association.lookup] if salesforce_instance
         end
 
-        # Internal: Get the appropriate Salesforce Lookup ID field for the
-        # passed mapping.
-        #
-        # mapping         - A Restforce::DB::Mapping.
-        # database_record - An instance of an ActiveRecord::Base subclass.
-        #
-        # Returns a String or nil.
-        def lookup_field(mapping, database_record)
-          inverse = inverse_association_name(target_reflection(database_record))
-          association = mapping.associations.detect { |a| a.name == inverse }
-          return unless association
-
-          association.lookup
-        end
-
       end
 
     end

data/lib/restforce/db/associations/has_many.rb

@@ -21,7 +21,7 @@ module Restforce
           @cache = cache
 
           target = target_mapping(database_record)
-          lookup_id = "#{lookup} = '#{salesforce_record.Id}'"
+          lookup_id = "#{lookup_field(target, database_record)} = '#{salesforce_record.Id}'"
 
           records = []
           target.salesforce_record_type.each(conditions: lookup_id) do |instance|

data/lib/restforce/db/associations/has_one.rb

@@ -21,7 +21,7 @@ module Restforce
           @cache = cache
 
           target = target_mapping(database_record)
-          query = "#{lookup} = '#{salesforce_record.Id}'"
+          query = "#{lookup_field(target, database_record)} = '#{salesforce_record.Id}'"
 
           instance = target.salesforce_record_type.first(query)
           instance ? construct_for(database_record, instance) : []

data/lib/restforce/db/version.rb

@@ -3,7 +3,7 @@ module Restforce
   # :nodoc:
   module DB
 
-    VERSION = "1.2.8"
+    VERSION = "1.2.9"
 
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restforce-db
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Andrew Horner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-01 00:00:00.000000000 Z
+date: 2015-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord