database_sanitizer 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa2e988b212e373683438dbdae3e9e6ccb2e05bc
-  data.tar.gz: 2396855b8ff999f66d4a98ce485a4bf06c5fabd1
+  metadata.gz: 77d9e46bfe3e7f9f5bd05c51eb1925384a0eb69d
+  data.tar.gz: 7ca1d69283a346ec4faecf93ea7c1e648c1a39ec
 SHA512:
-  metadata.gz: 3c3086cc1d9a61bca8a7ae9a8ac6f66f12334824742778ab1b73818d1c68a24dfee4f0a5beda99daebedebbab64f851230df5b3750378caf024e929c8a4be08d
-  data.tar.gz: dc8d3fadf65091fec225270929023892f7dc605a09c2bf4e43b414ac4bd2aa0bf7d42d1cbbb4e3c7e50c55055c147f4807aa22785ef20b9792406581258fdcc4
+  metadata.gz: b0acd414b98a2100ec34b58520ac52e11927c8b4ba7981f6ab2ffec1ec85cea8c798d85913c7382a1ad9a17148086a87f3469097f1fe31daa22b9a8a855e77f0
+  data.tar.gz: 53c1293ab81f599e72688cdf94c15d6846d760c0cb11bd38dc2c91da89ac13d29e60f2d0b8d9adc1a069e1d0fc5a0838d56b104ef5a0a7744660bc37e39e0980

data/lib/database_sanitizer.rb

@@ -69,11 +69,15 @@ module DatabaseSanitizer
       tables.with_progress('Exporting').each do |table|
         q_table = dest.quote_table_name table
         s_table = table.to_sym
+        order_column = order_column_for s_table
+        last_value = nil
 
         get_chunks(src, table).times_with_progress(table.rjust max_tbl_name_len) do |chunk_i|
           offset = chunk_i * CHUNK_SIZE
-          result = src.exec_query select_query q_table, s_table, offset
+          result = src.exec_query select_query q_table, order_column, last_value, offset
           dest.execute insert_query q_table, s_table, transformers, result, offset
+
+          last_value = result.last[order_column] if result.any?
         end
       end
     end
@@ -93,18 +97,22 @@ module DatabaseSanitizer
       ins_query.string
     end
 
-    def select_query q_table, s_table, offset
-      "SELECT * FROM #{q_table} #{order_clause s_table} LIMIT #{CHUNK_SIZE} OFFSET #{offset}"
+    def select_query q_table, order_column, last_value, offset
+      query = "SELECT * FROM #{q_table} "
+      query << "WHERE #{order_column} > #{last_value} " if last_value.present?
+      query << "ORDER BY #{order_column} " if order_column.present?
+      query << "LIMIT #{CHUNK_SIZE} "
+      query << "OFFSET #{offset} " unless order_column.present?
+      query
     end
-    
-    def order_clause s_table
-      order_sql = 'ORDER BY '
+
+    def order_column_for s_table
       src = Source.connection
       order_by = extract_order src.retrieve_table_comment s_table
       if order_by
-        order_sql + src.quote_table_name(order_by)
+        src.quote_table_name(order_by)
       elsif src.column_exists? s_table, :id
-        order_sql + 'id'
+        'id'
       else
         nil
       end

data/lib/database_sanitizer/version.rb

@@ -1,3 +1,3 @@
 module DatabaseSanitizer
-  VERSION = '0.0.15'
+  VERSION = '0.0.16'
 end

data/spec/database_sanitizer_spec.rb

@@ -82,7 +82,7 @@ SQL
     end
   end
 
-  describe '#order_clause' do
+  describe '#order_column_for' do
     context 'no order comment' do
       context 'and no id' do
         before do
@@ -90,13 +90,13 @@ SQL
         end
 
         it 'should not order' do
-          expect(described_class.order_clause :test).to be_nil
+          expect(described_class.order_column_for :test).to be_nil
         end
       end
 
       context 'and id' do
         it 'should order by id' do
-          expect(described_class.order_clause :test).to end_with('id')
+          expect(described_class.order_column_for :test).to eq('id')
         end
       end
     end
@@ -106,7 +106,7 @@ SQL
     before { DatabaseSanitizer::Source.connection.set_table_comment :test, 'order_by: field2' }
 
     it 'should order by comment' do
-      expect(described_class.order_clause :test).to end_with(DatabaseSanitizer::Source.connection.quote_table_name 'field2')
+      expect(described_class.order_column_for :test).to eq(DatabaseSanitizer::Source.connection.quote_table_name 'field2')
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_sanitizer
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Marton Somogyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-29 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler