occams-record 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 466aabbac2317ba6b65e5d02c4f244f317640bbbea08a2949c4b4ebe59be5bfb
-  data.tar.gz: cd50c8465764d9f811acccd1d833357ced98e2ba5812e3c5d12a3f2534495fb1
+  metadata.gz: f20725f84205589f6d7f9f11b54870e7cdc4697020863133e8669f80ef9c601d
+  data.tar.gz: 3abfc4b311d439d866ff40c512f8a7ce478c0f938483fb6805dad1a1ac4c1ebc
 SHA512:
-  metadata.gz: d5935484d5a729eb82fa12eb6402b48d7a54f54d9d8fe2986694eada3af26296c88536c78bbf2a05239483d66deb2c0a7bd6f70097b51547d95d5ded77bbec11
-  data.tar.gz: b0162c9054e18a8c1c265de9e47b5cd2bb00dcc53bd7406a166d67b3c4a390389a0e06f80e345fff8ed89fc2b7edb2b87a9e30a4fc165c6a4f9be2541bbebd71
+  metadata.gz: 03272f59314447452b174e24c0e8b334fbd9ce0a03ef29b54d353710b29f08b679a8d3b8e5e6108593a10019a84a7069519810e37c7598e79d3002f7314f7ede
+  data.tar.gz: e9b99f0ef4e60c0ac1e70d431dc40ac9e2f0d265e4687eba9dbf8163ce89894baca4b50c2e34b3e8cecbc99727800039b404eedb0e156a2b887b5e9736d20780

data/README.md

@@ -12,14 +12,14 @@ OccamsRecord is a high-efficiency, advanced query library for use alongside Acti
 
 ### 2) Supercharged querying & eager loading
 
-Continue using ActiveRecord's query builder, but let Occams take over eager loading and raw SQL calls. None of the examples below are possible with ActiveRecord, but OccamsRecord won't limit you. (More complete examples are shown later, but these should whet your appetite.)
+Continue using ActiveRecord's query builder, but let Occams take over running them, eager loading, and raw SQL calls. None of the examples below are possible with ActiveRecord, but OccamsRecord makes them trivial. (More complete examples are shown later, but these should whet your appetite.)
 
 **Customize the SQL used to eager load associations**
 
 ```ruby
 OccamsRecord.
   query(User.active).
-  eager_load(:orders, ->(q) { q.where("created_at >= ?", date })
+  eager_load(:orders, ->(q) { q.where("created_at >= ?", date).order("created_at DESC") })
 ```
 
 **Use `ORDER BY` with `find_each`/`find_in_batches`**

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

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

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

@@ -152,7 +152,7 @@ module OccamsRecord
       def define_ids_reader!(assoc)
         model = self.class._model
         ref = model.reflections[assoc]
-        pkey = ref.association_primary_key.to_sym
+        pkey = ref.klass.primary_key.to_sym
 
         self.class.class_eval do
           define_method "#{assoc.singularize}_ids" do

data/lib/occams-record/version.rb

@@ -3,5 +3,5 @@
 #
 module OccamsRecord
   # Library version
-  VERSION = "1.1.6".freeze
+  VERSION = "1.1.7".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: occams-record
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-14 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord