occams-record 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c5eba9d662af4ceea78d6d50d9649dc88faebb18ab8f2d9e0704f4fe5367985
-  data.tar.gz: cd5aa76eeb6a5f89ed65bd10549e468173dc2f8aa896346925b4b3752cf7858e
+  metadata.gz: 216f5b9aff38034e5bcaab036d4a5a20add7053062546eb827bd12269d49c766
+  data.tar.gz: f481e52c6d3390b7a3f5aa7497ac15d78774ef93f5d295dca472c75f558db9d2
 SHA512:
-  metadata.gz: d48d4389624f627302877ca6bcda1e7b1dc19facd4b54b4d255bb11b75d1f79149c1e79aff271b715eca0f43e03819e5aaaebc2897a7b0b29696eb20e0bcc4fc
-  data.tar.gz: ab8fdfddb10f751aa74274efc6229e5c24d32ec968fe8c88f30fd9af760652d9a75a2cc2bc17c29e3afcdd41b2d6f78e7cda60d485b6844458267beda2839aa2
+  metadata.gz: ee45536cbf4ea6a317647e73ac30788416bebfb3b152350fdcb4ab7d6e6e747ef1eb1763ef2aec731e11a9fb5925a8b234787933418c8c74f0724dd3b1ee1b9e
+  data.tar.gz: 30ab20cdd8611e0fec40a7a2e1b3d516ac153a5d283a393860650588c2d6f1bc93f02c43f125bb1675824ef019a29e276a05e0900899e311b838eab87a186db4

data/README.md

@@ -297,15 +297,25 @@ bundle install
 bundle exec rake test
 ```
 
+**Specify ActiveRecord version**
+
 By default, bundler will install the latest (supported) version of ActiveRecord. To specify a version to test against, run:
 
 ```bash
 AR=5.2 bundle update activerecord
-bundle exec rake test
+AR=5.2 bundle exec rake test
 ```
 
 Look inside `Gemfile` to see all testable versions.
 
+**Run against Postgres**
+
+By default the tests run against an in-memory Sqlite3 database. Use the following env var to force running against a Postgres database:
+
+```bash
+TEST_DATABASE_URL=postgres://postgres@localhost:5432/occams_record bundle exec rake test
+```
+
 # License
 
 MIT License. See LICENSE for details.

data/lib/occams-record/batches.rb

@@ -7,8 +7,9 @@ module OccamsRecord
     # Load records in batches of N and yield each record to a block if given. If no block is given,
     # returns an Enumerator.
     #
-    # NOTE Unlike ActiveRecord's find_each, ORDER BY is respected. It will be run inside
-    # of a transaction to ensure batch integrity.
+    # NOTE Unlike ActiveRecord's find_each, ORDER BY is respected. The primary key will be appended
+    # to the ORDER BY clause to help ensure consistent batches. Additionally, it will be run inside
+    # of a transaction.
     #
     # @param batch_size [Integer]
     # @param use_transaction [Boolean] Ensure it runs inside of a database transaction
@@ -80,10 +81,15 @@ module OccamsRecord
 
       offset = scope.offset_value || 0
       out_of_records, count = false, 0
+      pkey_regex = /#{model.primary_key}|\*/ # NOTE imperfect
+      order_by_pkey = !!model.primary_key &&
+        (scope.select_values.empty? || scope.select_values.any? { |v| v.to_s =~ pkey_regex })
 
       until out_of_records
         l = limit && batch_size > limit - count ? limit - count : batch_size
-        q = scope.offset(offset).limit(l)
+        q = scope
+        q = q.order(model.primary_key.to_sym) if order_by_pkey
+        q = q.offset(offset).limit(l)
         results = Query.new(q, use: @use, query_logger: @query_logger, eager_loaders: @eager_loaders).run
 
         y.yield results if results.any?

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

@@ -20,6 +20,7 @@ module OccamsRecord
             raise MissingColumnError.new(row, e.name)
           end
         }.compact.uniq
+        ids.sort! if $occams_record_test
 
         q = base_scope.where(@ref.association_primary_key => ids)
         yield q if ids.any?

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

@@ -20,6 +20,7 @@ module OccamsRecord
             raise MissingColumnError.new(row, e.name)
           end
         }.compact.uniq
+        ids.sort! if $occams_record_test
 
         q = base_scope.where(@ref.foreign_key => ids)
         q.where!(@ref.type => rows[0].class&.model_name) if @ref.options[:as]

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

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

data/lib/occams-record/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: occams-record
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2020-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -81,8 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The missing high-efficiency query API for ActiveRecord