ar-ondemand 1.0.3 → 1.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGQxNGNjMTg4NzdkYjU2M2RiYTAyM2I3OTdiZDUyMzVjYTI3N2M5OQ==
+    MDYxMjI1MWU0YTFkNmI1YzBkYTY1NWI2OTY0OWM4YThiMmZjODhkMw==
   data.tar.gz: !binary |-
-    Y2FjNGMzMjNjZDRiNjlmNDBjY2IxYWNkNTJjMDI0ODM1ODBhYTFhZQ==
+    M2JkMTFjZmExNWVhZDUyNzc0ODRhNDM5N2VlYjJlMGM2YmJkNzUwZg==
 SHA512:
   metadata.gz: !binary |-
-    OTRmYjk4ODgxYWEzNzNlZDk1ZGVlNDFmYzY1NGY5ODEyNTFlZTQxOTg1YWRm
-    ZWI0MjkzYjg3NGU3ODc3Mzc3YzViNWM4YzgyZjM1NDMwMTkzNmI1NDYzZGEz
-    ZTE4MmZmYzc0MmU3OTI0NTQ3ZmNhODM4MWM4MWM2ZTc3M2Q5NTQ=
+    OGJmYTJlZGI1N2UzOTUyYTUzMWNmOGJjYmZkYTMxYTUzNWYwMzM0NzFiNDUw
+    ODBhNzM5ODZmNWNhNWFkNzNiNTc5NzQyNTU3OTk2MmU3NTMyZTkwYzQzNWE1
+    NGRjNzg5Mzc3YTE1NjUwMmE4MWM5MzYzZWNkNjU5OTA0ZjcwYjc=
   data.tar.gz: !binary |-
-    OGRlMTcyOWRiZGU3MjZiMWJiZjFmNTEzZGU1ZTRlZDFlOGQ4ZWQwZjI2MzVl
-    YzlmMThhYzM5ODU4NzkwNTZiNDBmNjkxNDUxNmM2MDE4OWJmOTkwZmI0Mzhk
-    NDA0N2JiYWU0MTNlMGQ1NGM4YmNkMGVhMWE0OGNiMGRjZGU2N2U=
+    NzY5NjMwZTA2NDU3ODZhZTY4ODg4MzkxYmJmMzlhZjc0ZTIxYWExYjlhYmFj
+    YzkyZTlmMTJkMDJjMTdlMjE1MTY0NTgwMmQ1OTc4MGNhMDA5YzgzZGM2MjFi
+    MDhmNTE5NDkxZTI5Yzc0MTM5NTJjZGRkOThkOWNjNGNlYTdmM2E=

data/lib/ar-ondemand/delete_all_by_pk.rb

@@ -14,7 +14,7 @@ module ActiveRecord
         end
 
         if (finder_options = options.except(:start, :batch_size)).present?
-          raise "You can't specify an order, it's forced to be #{batch_order}" if options[:order].present?
+          raise "You can't specify an order, it's forced to be #{batch_order_delete_all_by_pk}" if options[:order].present?
           raise "You can't specify a limit, it's forced to be the batch_size"  if options[:limit].present?
 
           relation = apply_finder_options(finder_options)
@@ -23,8 +23,8 @@ module ActiveRecord
         start = options.delete(:start)
         batch_size = options.delete(:batch_size)
 
-        relation = relation.reorder(batch_order).limit(batch_size) if batch_size
-        records = start ? query(relation.where(table[primary_key].gteq(start))) : query(relation)
+        relation = relation.reorder(batch_order_delete_all_by_pk).limit(batch_size) if batch_size
+        records = query_delete_all_by_pk(start ? relation.where(table[primary_key].gteq(start)) : relation)
 
         while records.any?
           records_size = records.size
@@ -34,18 +34,18 @@ module ActiveRecord
 
           break if batch_size.nil? || records_size < batch_size
 
-          records = query relation.where(table[primary_key].gt(primary_key_offset))
+          records = query_delete_all_by_pk relation.where(table[primary_key].gt(primary_key_offset))
         end
       end
 
       private
 
-      def query(ar)
+      def query_delete_all_by_pk(ar)
         results = ::ActiveRecord::Base.connection.exec_query ar.select([table[primary_key]]).to_sql
         results.rows.flatten
       end
 
-      def batch_order
+      def batch_order_delete_all_by_pk
         "#{quoted_table_name}.#{quoted_primary_key} ASC"
       end
     end

data/lib/ar-ondemand/for_reading.rb

@@ -18,7 +18,7 @@ module ActiveRecord
         end
 
         if (finder_options = options.except(:start, :batch_size)).present?
-          raise "You can't specify an order, it's forced to be #{batch_order}" if options[:order].present?
+          raise "You can't specify an order, it's forced to be #{batch_order_for_reading}" if options[:order].present?
           raise "You can't specify a limit, it's forced to be the batch_size"  if options[:limit].present?
 
           relation = apply_finder_options(finder_options)
@@ -27,8 +27,8 @@ module ActiveRecord
         start = options.delete(:start)
         batch_size = options.delete(:batch_size) || 1000
 
-        relation = relation.reorder(batch_order).limit(batch_size)
-        records = start ? query(relation.where(table[primary_key].gteq(start))) : query(relation)
+        relation = relation.reorder(batch_order_for_reading).limit(batch_size)
+        records = query_for_reading(start ? relation.where(table[primary_key].gteq(start)) : relation)
 
         while records.any?
           records_size = records.size
@@ -39,7 +39,7 @@ module ActiveRecord
           break if records_size < batch_size
 
           if primary_key_offset
-            records = query relation.where(table[primary_key].gt(primary_key_offset))
+            records = query_for_reading relation.where(table[primary_key].gt(primary_key_offset))
           else
             raise "Primary key not included in the custom select clause"
           end
@@ -48,12 +48,12 @@ module ActiveRecord
 
       private
 
-      def query(ar)
+      def query_for_reading(ar)
         results = ::ActiveRecord::Base.connection.exec_query ar.to_sql
         ::ActiveRecord::OnDemand::ResultSet.new self.arel.engine, results
       end
 
-      def batch_order
+      def batch_order_for_reading
         "#{quoted_table_name}.#{quoted_primary_key} ASC"
       end
     end

data/lib/ar-ondemand/version.rb

@@ -1,3 +1,3 @@
 module ArOnDemand
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ar-ondemand
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Steve Frank