occams-record 0.26.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2d1c4320c6ac238acbb8329b672c5bc487fa14e5
-  data.tar.gz: 38f86e3f7467fa1134b62e6500c25278a7d1be80
+SHA256:
+  metadata.gz: 9c718e8ed411d6d2a139dcc27c2c0f7fa788fc6dafb8c534d3332682c85502f6
+  data.tar.gz: 464d6e322e1a478f861cb576b4e506589da318485c29fe5ec852726fcba2a692
 SHA512:
-  metadata.gz: 3be346b9c94d373cec5955b8c0577edbc62b80b74d958b95e3ff4dcf5a768a59192a4fd9938933b50c06185d568a3467428c92fbf5921838ed6ce17a0c183918
-  data.tar.gz: f56c580afb05217f7ce219d53de678dbb8f7e098cdd62ba01557e4ebd42adc8c4dd45817a8d437f9610e840834988becd69f1071add021a727fd67ef8e79752e
+  metadata.gz: ed85408318c87e662a14cc863fe43cb2b2e1f1a5aae739ff1a1b22968957a455e771e3ac6fcb3b902b0febe9585bddad6b4c02640bfaa077a6e6a98f3a3c148d
+  data.tar.gz: 78f981128bd9fad0d6a670ed21426366cf3ac1b74169f3571a6335ae9cf1d5a5c2c790fa7f4bc1c09d4b5756a0a7850998467a779c7bef4db2dc50b1553fb330

data/README.md

@@ -7,7 +7,7 @@ Occam's Record is a high-efficiency, advanced query library for ActiveRecord app
 * 3x-5x faster than ActiveRecord queries.
 * Uses 1/3 the memory of ActiveRecord query results.
 * Eliminates the N+1 query problem.
-* Allows custom SQL when eager loading associations (use `select`, `where`, `order`, etc).
+* Customize the SQL when eager loading associations.
 * `find_each`/`find_in_batches` respects `order` and `limit`.
 * Allows eager loading of associations when querying with raw SQL.
 * Allows `find_each`/`find_in_batches` when querying with raw SQL.

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

@@ -34,9 +34,13 @@ module OccamsRecord
       #
       def run(rows, query_logger: nil)
         calc_ids(rows) { |ids|
-          binds = @binds.merge({:ids => ids})
-          assoc_rows = RawQuery.new(@sql, binds, use: @use, query_logger: query_logger, &@eval_block).model(@model).run
-          merge! assoc_rows, rows
+          assoc = if ids.any?
+                    binds = @binds.merge({:ids => ids})
+                    RawQuery.new(@sql, binds, use: @use, query_logger: query_logger, &@eval_block).model(@model).run
+                  else
+                    []
+                  end
+          merge! assoc, rows
         }
       end
 
@@ -56,7 +60,7 @@ module OccamsRecord
             raise MissingColumnError.new(row, e.name)
           end
         }.compact.uniq
-        yield ids if ids.any?
+        yield ids
       end
 
       def merge!(assoc_rows, rows)

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

@@ -29,8 +29,7 @@ module OccamsRecord
       #
       def run(rows, query_logger: nil)
         query(rows) { |*args|
-          scope = args[0]
-          assoc_rows = Query.new(scope, use: @use, query_logger: query_logger, &@eval_block).run
+          assoc_rows = args[0] ? Query.new(args[0], use: @use, query_logger: query_logger, &@eval_block).run : []
           merge! assoc_rows, rows, *args[1..-1]
         }
       end

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

@@ -13,7 +13,7 @@ module OccamsRecord
       def query(rows)
         join_rows = fetch_join_rows(rows)
         assoc_ids = join_rows.map { |row| row[1] }.compact.uniq
-        yield base_scope.where(@ref.association_primary_key => assoc_ids), join_rows if assoc_ids.any?
+        yield assoc_ids.any? ? base_scope.where(@ref.association_primary_key => assoc_ids) : nil, join_rows
       end
 
       #

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

@@ -21,7 +21,7 @@ module OccamsRecord
         }.compact.uniq
         q = base_scope.where(@ref.foreign_key => ids)
         q.where!(@ref.type => rows[0].class&.model_name) if @ref.options[:as]
-        yield q if ids.any?
+        yield ids.any? ? q : nil
       end
 
       #

data/lib/occams-record/results.rb

@@ -53,6 +53,9 @@ module OccamsRecord
     #
     # Abstract class for result rows.
     #
+    # Like ActiveRecord, Boolean columns have #field? methods. However, unlike ActiveRecord,
+    # other column types do NOT.
+    #
     class Row
       class << self
         # Array of column names

data/lib/occams-record/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: occams-record
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-27 00:00:00.000000000 Z
+date: 2018-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: The missing high-efficiency query API for ActiveRecord