db_subsetter 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cbd626cd24132c2e8db14c89ecb66c300350886
-  data.tar.gz: f7171ef20aded756e45b11a04c5072ab0303e1ec
+  metadata.gz: abf5990b7e3fd33ac74ba829e56919a5d6cc84c1
+  data.tar.gz: 3c83e352af29441d90675d8f1c924bdc80dfad14
 SHA512:
-  metadata.gz: dd3d89c74237f6a7c942bfb72561e3eaef426e34c3919f1c0b6651287e76650bebec068eb1b5b81c1dcf2c0d7959c43e1b5682be51ba6f21b62234afab1d4107
-  data.tar.gz: d9d8f8a4c5483e12fb9fe10cfee561c656fa67205c3968cc2c2cac6ca281ab7d76d9c8787b13534445434a0939f6477102ff7b2318c9e5e72effc282936280c1
+  metadata.gz: 0fb729b7e0db5e1de5133eaf082fb3e6067f4aaaa370b303a07c49d5a18bd3355f97a3a1ab43c3c41b508d470c9a126abac969d311c649fac9b0aa6bac23278e
+  data.tar.gz: f0637b18e81c8fb5414cac673b2f94d954bc8c10e1d7398ca8589c976069107ea22f5aff37d6aa7db7778f7173b76fc3056e6d3e0015931584c4f3d5d104ca0f

data/db_subsetter.gemspec

@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activerecord", "~> 4.2"
   spec.add_dependency "sqlite3", "~> 1.3"
-  spec.add_dependency "random-word"
+  spec.add_dependency "random-word", "~> 1.3"
 end
 

data/lib/db_subsetter/exporter.rb

@@ -55,6 +55,7 @@ module DbSubsetter
 
     def initialize
       @scramblers = []
+      @page_counts = {}
     end
 
     private
@@ -88,7 +89,7 @@ module DbSubsetter
     end
 
     def pages(table)
-      ( filtered_row_count(table) / select_batch_size.to_f ).ceil
+      @page_counts[table] ||= ( filtered_row_count(table) / select_batch_size.to_f ).ceil
     end
 
     def order_by(table)
@@ -134,7 +135,9 @@ module DbSubsetter
         # Need to extend this to take more than the first batch_size records
         query = query.order(arel_table[order_by(table)]) if order_by(table)
 
-        sql = query.skip(i * select_batch_size).take(select_batch_size).project( Arel.sql('*') ).to_sql
+
+        query = query.skip(i * select_batch_size).take(select_batch_size) if pages(table) > 1
+        sql = query.project( Arel.sql('*') ).to_sql
 
         records = ActiveRecord::Base.connection.select_rows( sql )
         records.each_slice(insert_batch_size) do |rows|

data/lib/db_subsetter/version.rb

@@ -1,3 +1,3 @@
 module DbSubsetter
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: db_subsetter
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Joe Francis
@@ -84,16 +84,16 @@ dependencies:
   name: random-word
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 description: 
 email:
 - joe@lostapathy.com