database_sanitizer 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 816ccf39b00e6e58b01d27e9641101df1be308d9
-  data.tar.gz: 8527b8bb3d4ae9939e97004d7c11d5c4df953076
+  metadata.gz: 14b6f7afbfbfb4760626dfad121e423a2d9e323b
+  data.tar.gz: e50230516670cd61e8dcf7a5e0cc8564c8f649c8
 SHA512:
-  metadata.gz: c5e5a21fd47e697898a02b865d252c838119ddaec369e541ed17a25ac4695ddddb5f4b8554a589ef9141e41b21fb67012b2fd9fbeda4d9da469daa6077220641
-  data.tar.gz: 9110e79e2c1bf8251f6ba44665c622391a1aef4443e1a20c5bcdc26ef9ee98558147976cb2140c468f8e2d16bb9c77cd5c643d9dce979f342ed5186ae8ebb1a9
+  metadata.gz: b0e653000e3e6be25c6361b46d263fce5fc8bd3fde2165f0591e397a3ba1a3630b09b3e1fd0955220a0961793703d08c2ba230bc72593703bb5f460f481ec792
+  data.tar.gz: 21d96d72a6527adbd16d03a03b9515fbe4323d1069941febce96a76a8ad0db84096ba7489fb5ca4c28d5582011ea3fd3b8f72f34eb3ce05cc80a9f1a89e36704

data/bin/database_sanitizer

@@ -28,10 +28,10 @@ begin
   db = ENV['SOURCE']
   DatabaseSanitizer::Source.establish_connection(DBCONF[db]).connection
   db = ENV['TARGET']
-  ActiveRecord::Base.establish_connection(DBCONF[db]).connection
+  DatabaseSanitizer::Destination.establish_connection(DBCONF[db]).connection
 rescue StandardError
   abort "Couldn't connect to #{options[:dbconf]}[#{db}]: #{$!}"
 end
 
-DatabaseSanitizer.export DatabaseSanitizer::Source.connection, ActiveRecord::Base.connection, tables: options[:tables], exclude: options[:exclude_tables], schema: options[:schema]
+DatabaseSanitizer.export tables: options[:tables], exclude: options[:exclude_tables], schema: options[:schema]
 

data/database_sanitizer.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10'
   spec.add_development_dependency 'pg', '~> 0.17'
 
-  spec.add_runtime_dependency 'activerecord', '>= 3.0'
+  spec.add_runtime_dependency 'activerecord', '>= 3'
   spec.add_runtime_dependency 'activerecord-comments', '~> 0'
   spec.add_runtime_dependency 'progress', '~> 3'
   spec.add_runtime_dependency 'iconv', '~> 1'

data/lib/database_sanitizer.rb

@@ -6,6 +6,8 @@ module DatabaseSanitizer
   CHUNK_SIZE = (ENV['CHUNK_SIZE'] || "1000").to_i
   class Source < ActiveRecord::Base
   end
+  class Destination < ActiveRecord::Base
+  end
 end
 
 require 'database_sanitizer/transformers'
@@ -16,9 +18,9 @@ module DatabaseSanitizer
 
     def extract_order comment; comment ? comment[/order_by: ?(\w+)/,1] : nil; end
 
-    def read_comments conn, tables
+    def read_comments tables
       tables.inject({}) do |transformers, table|
-        transformers[table.to_sym] = conn.retrieve_column_comments(table.to_sym).inject({}) do |table_transformers, column|
+        transformers[table.to_sym] = Source.connection.retrieve_column_comments(table.to_sym).inject({}) do |table_transformers, column|
           transformer_key = extract_transformer column[1]
           unless transformer_key.nil? || Transformers.include?(transformer_key)
             abort "Transformer '#{transformer_key}' not found (#{table}.#{column[0]})"
@@ -41,12 +43,11 @@ module DatabaseSanitizer
       else
         puts 'Reading schema SQL...'
         schema_src = IO.read File.expand_path(schema, Dir.pwd)
-        ActiveRecord::Migration.suppress_messages { ActiveRecord::Base.connection.exec_query schema_src }
+        ActiveRecord::Migration.suppress_messages { Destination.connection.execute schema_src }
       end
     end
 
-    def get_chunks table
-      conn = Source.connection
+    def get_chunks conn, table
       query = "SELECT count(*) FROM #{conn.quote_table_name table}"
       pg_query = "SELECT reltuples::bigint FROM pg_class WHERE relname=#{conn.quote table}"
       res = conn.adapter_name == 'PostgreSQL' ? (conn.exec_query(pg_query) rescue false) : false
@@ -57,17 +58,19 @@ module DatabaseSanitizer
       res.rows[0][0].to_i / CHUNK_SIZE + 1
     end
 
-    def export src, dest, opts={}
+    def export opts={}
+      src = Source.connection
+      dest = Destination.connection
       duplicate_schema opts[:schema]
       tables = (opts[:tables] || src.tables.collect(&:to_s)) - (opts[:exclude] || [])
-      transformers = read_comments dest, tables
+      transformers = read_comments tables
       max_tbl_name_len = transformers.keys.map(&:length).sort.last || 0
 
       tables.with_progress('Exporting').each do |table|
         q_table = dest.quote_table_name table
         s_table = table.to_sym
 
-        get_chunks(table).times_with_progress(table.rjust max_tbl_name_len) do |chunk_i|
+        get_chunks(src, table).times_with_progress(table.rjust max_tbl_name_len) do |chunk_i|
           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
@@ -75,6 +78,7 @@ module DatabaseSanitizer
     end
 
     def insert_query q_table, s_table, transformers, result
+      dest = Destination.connection
       cols = result.columns.map { |col| dest.quote_column_name col }.join ','
       ins_query_part = "INSERT INTO #{q_table} (#{cols}) VALUES ("
       ins_query = StringIO.new
@@ -85,19 +89,20 @@ module DatabaseSanitizer
         end
         ins_query << ins_query_part << values.join(',') << '); '
       end
+      ins_query.string
     end
 
     def select_query q_table, s_table, offset
-      "SELECT * FROM #{q_table} #{order_clause_for_table(s_table)} LIMIT #{CHUNK_SIZE} OFFSET #{offset}"
+      "SELECT * FROM #{q_table} #{order_clause 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
+      src = Source.connection
+      order_by = extract_order src.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 + src.quote_table_name(order_by)
+      elsif src.column_exists? s_table, :id
         order_sql + 'id'
       else
         nil

data/lib/database_sanitizer/version.rb

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

data/spec/{database_exporter_spec.rb → database_sanitizer_spec.rb}

@@ -43,25 +43,23 @@ describe DatabaseSanitizer do
 
   describe '#read_comments' do
     before do
-      ActiveRecord::Migration.suppress_messages do
-        ActiveRecord::Schema.define do
-          change_table :test do |t|
-            t.string :field3
-            t.string :field4
-          end
-        end
-      end
+      DatabaseSanitizer::Source.connection.execute <<-SQL
+ALTER TABLE test
+  ADD COLUMN field3 character varying(255),
+  ADD COLUMN field4 character varying(255)
+;
+SQL
       comments = {
         field1: 'comment no tag',
         field2: nil,
         field3: 'comment sanitize: name',
         field4: 'sanitize:email'
-      }.each { |col, com| ActiveRecord::Base.connection.set_column_comment :test, col, com }
+      }.each { |col, com| DatabaseSanitizer::Source.connection.set_column_comment :test, col, com }
     end
 
     context 'some defined' do
       it 'should get transformers' do
-        transformers = described_class.read_comments(ActiveRecord::Base.connection, [:test])[:test]
+        transformers = described_class.read_comments([:test])[:test]
         expect(transformers[:field1]).to be_nil
         expect(transformers[:field2]).to be_nil
         expect(transformers[:field3]).to be_kind_of(Proc)
@@ -70,20 +68,25 @@ describe DatabaseSanitizer do
     end
 
     context 'some undefined' do
-      before { ActiveRecord::Base.connection.set_column_comment :test, :field2, 'sanitize:undef' }
+      before { DatabaseSanitizer::Source.connection.set_column_comment :test, :field2, 'sanitize:undef' }
       it 'should abort' do
-        expect(lambda {described_class.read_comments ActiveRecord::Base.connection, [:test]}).to raise_error(SystemExit)
+        expect(lambda {described_class.read_comments [:test]}).to raise_error(SystemExit)
       end
     end
   end
 
+  describe '#insert_query' do
+    context 'empty db' do
+      let(:result) { Struct.new(:rows, :columns).new([], []) }
+      it { expect(described_class.insert_query '"test"', :test, {}, result).to eq('') }
+    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
+          DatabaseSanitizer::Source.connection.execute 'ALTER TABLE test DROP COLUMN IF EXISTS id;'
         end
 
         it 'should not order' do
@@ -100,10 +103,10 @@ describe DatabaseSanitizer do
   end
 
   context 'order comment' do
-    before { ActiveRecord::Base.connection.set_table_comment :test, 'order_by: field2' }
+    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(ActiveRecord::Base.connection.quote_table_name 'field2')
+      expect(described_class.order_clause :test).to end_with(DatabaseSanitizer::Source.connection.quote_table_name 'field2')
     end
   end
 end

data/spec/spec_helper.rb

@@ -7,22 +7,24 @@ require 'database_sanitizer'
 
 DBCONF = YAML::load(IO.read(File.expand_path('../config/database.yml', __FILE__)))
 ENV['DB'] ||= 'postgres'
-ActiveRecord::Base.establish_connection DBCONF[ENV['DB']]
+src_conf = DBCONF[ENV['DB']]
+dest_conf = src_conf.update({'datbase' => "#{src_conf['database']}_sanitized"})
+DatabaseSanitizer::Source.establish_connection(src_conf).connection
+DatabaseSanitizer::Destination.establish_connection(dest_conf).connection
 
 RSpec.configure do |c|
   c.around(:each) do |ex|
     unless ex.metadata[:nodb]
-      ActiveRecord::Migration.suppress_messages do
-        ActiveRecord::Schema.define do
-          create_table :test do |t|
-            t.string :field1
-            t.integer :field2
-          end
-        end
-      end
+      DatabaseSanitizer::Source.connection.execute <<-SQL
+CREATE TABLE test (
+  id integer NOT NULL,
+  field1 character varying(255),
+  field2 integer
+);
+SQL
     end
     ex.run
-    ActiveRecord::Migration.suppress_messages { ActiveRecord::Schema.define { drop_table :test } } unless ex.metadata[:nodb]
+    DatabaseSanitizer::Source.connection.drop_table :test unless ex.metadata[:nodb]
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: database_sanitizer
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Marton Somogyi
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: activerecord-comments
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +127,7 @@ files:
 - lib/database_sanitizer/transformers.rb
 - lib/database_sanitizer/version.rb
 - spec/config/database.yml
-- spec/database_exporter_spec.rb
+- spec/database_sanitizer_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/mcbuddha/database_sanitizer
 licenses:
@@ -155,5 +155,5 @@ specification_version: 4
 summary: Export your SQL database
 test_files:
 - spec/config/database.yml
-- spec/database_exporter_spec.rb
+- spec/database_sanitizer_spec.rb
 - spec/spec_helper.rb