occams-record 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 362412629f1efd7e076409b017c925d112df61a26fda25f9dc4a6f318d250dc7
-  data.tar.gz: fc0a8b2e652ded15b47e85759e6a927e35f0feda6adc7792d0b05364e0343826
+  metadata.gz: 0c3286a31a994b2afe81cefe35abf494e8edb02ce52fb231d63ca8381e3dba01
+  data.tar.gz: e61a7565407ddccb61e60f89094afe634ef1d02b965969396e43f1a43d21627c
 SHA512:
-  metadata.gz: 570685d5cfef170c128a0c759c48c2e045991fccf0a1be0ecfc9f5cdc9f5ce1078594af2d895d0c68170aab4e6240fba593c5a5c38a3b43b7eb2478694691c25
-  data.tar.gz: 4d2076f93a517969f2eb21142eb5455d0376dc4d9e57526dcde1919bd16acc36772becf4b7bac25b8628e4aa4c908073dbcd37cafe0542df90291403e21b64a7
+  metadata.gz: acfaec212fea40cf693f276165c649de408ab5a6d6aabfa47ff996a94daaf09fec651d6f2eb9e03168da29df1c9a4bdec572d4aca55506b1f5058e3b175fa3bd
+  data.tar.gz: db1a088f0e15dd813034a2b1a97490de7d8b4d81a1aa5e949572c20180e2fd3ad52746d1edad02c56ddbe1b0eb3c90c9966cc3ba8d1dcc9d29a7248036ad4919

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

@@ -55,7 +55,7 @@ module OccamsRecord
           next if type.nil? or type == ""
           model = type.constantize
           ids = rows_of_type.map(&@foreign_key).uniq
-          q = base_scope(model).where(model.primary_key => ids)
+          q = base_scope(model).where(@ref.active_record_primary_key => ids)
           yield q if ids.any?
         end
       end

data/lib/occams-record/merge.rb

@@ -36,11 +36,11 @@ module OccamsRecord
       if mapping.size == 1
         target_attr, assoc_attr = target_attrs[0], assoc_attrs[0]
         assoc_rows_by_ids = assoc_rows.reduce({}) { |a, assoc_row|
-          #begin
+          begin
             id = assoc_row.send assoc_attr
-          #rescue NoMethodError => e
-          #  raise MissingColumnError.new(assoc_row, e.name)
-          #end
+          rescue NoMethodError => e
+            raise MissingColumnError.new(assoc_row, e.name)
+          end
           a[id] ||= assoc_row
           a
         }

data/lib/occams-record/results/results.rb

@@ -26,7 +26,9 @@ module OccamsRecord
         self.associations = association_names.map(&:to_s)
         self.model_name = model ? model.name : nil
         self.table_name = model ? model.table_name : nil
-        self.primary_key = model&.primary_key&.to_s
+        self.primary_key = if model&.primary_key and (pkey = model.primary_key.to_s) and columns.include?(pkey)
+                             pkey
+                           end
 
         # Build getters & setters for associations. (We need setters b/c they're set AFTER the row is initialized
         attr_accessor(*association_names)

data/lib/occams-record/version.rb

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

metadata

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