occams-record 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '01835924f09de2352747a1746b1c7cc1df139a9a3d4789dad9b429a854f51ce4'
-  data.tar.gz: 82c8f9f591cda51f123fc4de5d9f9965ca237ff611b178df829b0396bc769df0
+  metadata.gz: 362412629f1efd7e076409b017c925d112df61a26fda25f9dc4a6f318d250dc7
+  data.tar.gz: fc0a8b2e652ded15b47e85759e6a927e35f0feda6adc7792d0b05364e0343826
 SHA512:
-  metadata.gz: ad565d3de7da27ee54a33f5d4cc786fede2a032f33dd15b2012bac8143b1a64c395c602c9c35e6ed143f1af9b895787e5ec57e6eb146ac923e7b9d494cba7ddb
-  data.tar.gz: 6fae5a5bbc87bcdafe605a44463a8bcd8d0d2b4fd5508410c45b342aafebb4b53295a1bf7613ca842b1cd6816d2a185864bf1a6add3b27f26d53a96e9021cd1a
+  metadata.gz: 570685d5cfef170c128a0c759c48c2e045991fccf0a1be0ecfc9f5cdc9f5ce1078594af2d895d0c68170aab4e6240fba593c5a5c38a3b43b7eb2478694691c25
+  data.tar.gz: 4d2076f93a517969f2eb21142eb5455d0376dc4d9e57526dcde1919bd16acc36772becf4b7bac25b8628e4aa4c908073dbcd37cafe0542df90291403e21b64a7

data/lib/occams-record/eager_loaders/belongs_to.rb

@@ -33,7 +33,7 @@ module OccamsRecord
       #
       def merge!(assoc_rows, rows)
         Merge.new(rows, name).
-          single!(assoc_rows, {@ref.foreign_key.to_s => @model.primary_key.to_s})
+          single!(assoc_rows, {@ref.foreign_key.to_s => @ref.active_record_primary_key.to_s})
       end
     end
   end

data/lib/occams-record/eager_loaders/polymorphic_belongs_to.rb

@@ -73,9 +73,8 @@ module OccamsRecord
             raise MissingColumnError.new(row, e.name)
           end
         }
-        model = type.constantize
         Merge.new(rows_of_type, name).
-          single!(assoc_rows_of_type, {@ref.foreign_key.to_s => model.primary_key.to_s})
+          single!(assoc_rows_of_type, {@ref.foreign_key.to_s => @ref.active_record_primary_key.to_s})
       end
 
       private

data/lib/occams-record/version.rb

@@ -3,5 +3,5 @@
 #
 module OccamsRecord
   # Library version
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: occams-record
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-27 00:00:00.000000000 Z
+date: 2019-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord