database_sanitizer 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fc14e337b32eb2d1d3d4ce3aada4e918eecf439
-  data.tar.gz: 53eef3f8ce2e81c7f4cf9ebceaa26a641af4ae66
+  metadata.gz: 816ccf39b00e6e58b01d27e9641101df1be308d9
+  data.tar.gz: 8527b8bb3d4ae9939e97004d7c11d5c4df953076
 SHA512:
-  metadata.gz: 98faa8701b6e71bbadc5fa64bcf65858856fe832d2f4299dabadaaca202845a4269a326b8777ad0afe25a9d8133146c2051eb214c8a06544754d52084e530ece
-  data.tar.gz: 8ed2284d1224a3003730f6c338bb3462da957bec20be1a0bbc6266a369da978b02312e959af0a761753fd8e371664ca486da979a343c5ecd9f7865d10e281888
+  metadata.gz: c5e5a21fd47e697898a02b865d252c838119ddaec369e541ed17a25ac4695ddddb5f4b8554a589ef9141e41b21fb67012b2fd9fbeda4d9da469daa6077220641
+  data.tar.gz: 9110e79e2c1bf8251f6ba44665c622391a1aef4443e1a20c5bcdc26ef9ee98558147976cb2140c468f8e2d16bb9c77cd5c643d9dce979f342ed5186ae8ebb1a9

data/lib/database_sanitizer/version.rb

@@ -1,3 +1,3 @@
 module DatabaseSanitizer
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 end

data/lib/database_sanitizer.rb

@@ -14,6 +14,8 @@ module DatabaseSanitizer
   class << self
     def extract_transformer comment; comment ? comment[/sanitize: ?(\w+)/,1] : nil; end
 
+    def extract_order comment; comment ? comment[/order_by: ?(\w+)/,1] : nil; end
+
     def read_comments conn, tables
       tables.inject({}) do |transformers, table|
         transformers[table.to_sym] = conn.retrieve_column_comments(table.to_sym).inject({}) do |table_transformers, column|
@@ -64,22 +66,41 @@ module DatabaseSanitizer
       tables.with_progress('Exporting').each do |table|
         q_table = dest.quote_table_name table
         s_table = table.to_sym
-        sel_query = "SELECT * FROM #{q_table} LIMIT #{CHUNK_SIZE} OFFSET "
+
         get_chunks(table).times_with_progress(table.rjust max_tbl_name_len) do |chunk_i|
-          offset = chunk_i * CHUNK_SIZE
-          result = src.exec_query sel_query + offset.to_s
-          cols = result.columns.map { |col| dest.quote_column_name col }.join ','
-          ins_query_part = "INSERT INTO #{q_table} (#{cols}) VALUES ("
-          ins_query = StringIO.new
-          result.rows.each_with_index do |src_row, row_i|
-            values = result.columns.each_with_index.map do |col, col_i|
-              transformer = transformers[s_table][col.to_sym]
-              dest.quote transformer ? transformer.(offset + row_i, src_row[col_i]) : src_row[col_i]
-            end
-            ins_query << ins_query_part << values.join(',') << '); '
-          end
-          dest.exec_query ins_query.string
+          result = src.exec_query select_query q_table, s_table, (chunk_i * CHUNK_SIZE)
+          dest.exec_query insert_query q_table, s_table, transformers, result
+        end
+      end
+    end
+
+    def insert_query q_table, s_table, transformers, result
+      cols = result.columns.map { |col| dest.quote_column_name col }.join ','
+      ins_query_part = "INSERT INTO #{q_table} (#{cols}) VALUES ("
+      ins_query = StringIO.new
+      result.rows.each_with_index do |src_row, row_i|
+        values = result.columns.each_with_index.map do |col, col_i|
+          transformer = transformers[s_table][col.to_sym]
+          dest.quote transformer ? transformer.(offset + row_i, src_row[col_i]) : src_row[col_i]
         end
+        ins_query << ins_query_part << values.join(',') << '); '
+      end
+    end
+
+    def select_query q_table, s_table, offset
+      "SELECT * FROM #{q_table} #{order_clause_for_table(s_table)} LIMIT #{CHUNK_SIZE} OFFSET #{offset}"
+    end
+    
+    def order_clause s_table
+      conn = Source.connection
+      order_sql = 'ORDER BY '
+      order_by = extract_order conn.retrieve_table_comment s_table
+      if order_by
+        order_sql + conn.quote_table_name(order_by)
+      elsif conn.column_exists? s_table, :id
+        order_sql + 'id'
+      else
+        nil
       end
     end
   end

data/spec/database_exporter_spec.rb

@@ -21,6 +21,26 @@ describe DatabaseSanitizer do
     end
   end
 
+  describe '#extract_order', nodb: true do
+    context 'should return nil for no order' do
+      ['no order comment', nil, '', 'order_by no tag'].each do |comment|
+        it { expect(described_class.extract_order comment).to be_nil }
+      end
+    end
+
+    context 'should return order' do
+      [
+       'order_by: test_col',
+       'random order_by: test_col comment',
+       'some order_by: test_col, order_by: other',
+       'without order_by:test_col space',
+       'trailing order_by: test_col'
+      ].each do |comment|
+        it { expect(described_class.extract_order comment).to eq('test_col') }
+      end
+    end
+  end
+
   describe '#read_comments' do
     before do
       ActiveRecord::Migration.suppress_messages do
@@ -56,4 +76,34 @@ describe DatabaseSanitizer do
       end
     end
   end
+
+  describe '#order_clause' do
+    context 'no order comment' do
+      context 'and no id' do
+        before do
+          ActiveRecord::Migration.suppress_messages do
+            ActiveRecord::Schema.define { remove_column :test, :id }
+          end
+        end
+
+        it 'should not order' do
+          expect(described_class.order_clause :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')
+        end
+      end
+    end
+  end
+
+  context 'order comment' do
+    before { ActiveRecord::Base.connection.set_table_comment :test, 'order_by: field2' }
+
+    it 'should order by comment' do
+      expect(described_class.order_clause :test).to end_with(ActiveRecord::Base.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.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Marton Somogyi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler