db_dumper 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 558cf65a63bbc27071a6b680172a07db13bee874e7a34b2dbe8cc4e63b3b41ea
-  data.tar.gz: 15d9356a1a54c5481a7d6054e8d0f47b98dffbadab7db2a317ef64ed9eaf0e43
+  metadata.gz: ed06d69d92559ef72d5d35f59dcf349dc41b77d88cdc6cb5e52463586fb3de31
+  data.tar.gz: bdeb2734063ecc60cab6bb3cd763c72c7c518a379383c6baa3b4a3f598ac372b
 SHA512:
-  metadata.gz: d65a9bc589e97f3c78d602555ab7c5cad0ba550b58be24228f4832bb8cf12f33953c1730361fe137644382d0a5253fd0ef667ccb80c99b97af6489b4dc3472f1
-  data.tar.gz: 9a9d98d0e9463fd9fe97633f9349778e9bc5c536f70177e73c792b65a14fe8d4080cf480fd79b949acfa2f6e84f5ed4dbb5caa6e916213633addc9503fc53a5d
+  metadata.gz: 682c19468845eb7b8990d17de0464f6d47c6b33cc5299d5de3fc3e7855949e8c4e3dd0bcb66c965757aa9f06f2583d95e6639bc6a172ba4c7f4866bf1b60f0bc
+  data.tar.gz: a27fb374bcfef21c04f504eb98f3744869b3b606af13441b82cad5f6c3dd5b4ec01e4148d6150f90c6d33115b8c46813d2fd84333e0611ace2f38a8916a002d7

data/README.md

@@ -28,11 +28,13 @@ gemfile do
 end
 
 DbDumper.dump do
+  dump 'roles'
+
   user_id = 1
-  dump q('users').where(id: user_id)
+  copy q('users').where(id: user_id)
   campaigns_q = q('campaigns').where('user_id = ? OR for_all IS TRUE', user_id)
-  dump campaigns_q
-  dump q('offices').where(campaign_id: campaigns_q.ar)
+  copy campaigns_q
+  copy q('offices').where(campaign_id: campaigns_q.ar)
 end
 ```
 

data/lib/db_dumper.rb

@@ -11,9 +11,10 @@ require_relative 'db_dumper/query_builder'
 require_relative 'db_dumper/remote_machine'
 
 module DbDumper
-  module_function def dump(config_file_path = 'config/application.yml', &block)
+  module_function def dump(config_file_path = 'config/dumper.yml', &block)
     config = Configuration.new(config_file_path)
-    sql = QueryBuilder.to_sql(config, &block)
-    RemoteMachine.new(config, sql).dump
+    query = QueryBuilder.build(config, &block)
+
+    RemoteMachine.new(config, query.dumping_tables, query.copy_commands).dump
   end
 end

data/lib/db_dumper/configuration.rb

@@ -6,11 +6,11 @@ require_relative 'configuration/postgres'
 module DbDumper
 
   # Configuration class, by default loads from config/application.yml file
-  # see config/application.sample.yml for format details
+  # see config/dumper.sample.yml for format details
   class Configuration
     SshUser = Struct.new(:name, :host, :ssh_keys, :passphrase, keyword_init: true)
     RemoteDB = Struct.new(:adapter, :host, :port, :database, :username, :password,
-                          :dump_schema_options, :dump_data_options,
+                          :dump_schema_options, :dump_data_options, :dump_copy_options,
                           keyword_init: true)
     RemoteMachine = Struct.new(:dest_path, keyword_init: true) do
       def data_path

data/lib/db_dumper/configuration/postgres.rb

@@ -9,8 +9,13 @@ module DbDumper
         util_command('pg_dump', "#{db_config.dump_schema_options} -f #{dump_schema_file_path}")
       end
 
+      def dump_table_data_command(dumped_tables, dump_table_data_file_path)
+        joined_tables = "-t #{dumped_tables.join(' -t ')}"
+        util_command('pg_dump', "#{db_config.dump_data_options} #{joined_tables} -f #{dump_table_data_file_path}")
+      end
+
       def dump_data_command(dump_data_file_path)
-        util_command('psql', "#{db_config.dump_data_options} -f #{dump_data_file_path}")
+        util_command('psql', "#{db_config.dump_copy_options} -c \"#{dump_data_file_path}\"")
       end
 
       private

data/lib/db_dumper/query_builder.rb

@@ -6,19 +6,31 @@ module DbDumper
   class QueryBuilder
     attr_reader :config
 
-    def self.to_sql(config, &block)
+    def self.build(config, &block)
       establish_connection
 
-      new(config).yield_self do |instance|
+      new(config).tap do |instance|
         instance.instance_eval(&block)
-        instance.send(:to_sql)
       end
     end
 
+    def dumping_tables
+      @dumping_tables ||= []
+    end
+
+    def copy_commands
+      queries.map(&method(:build_copy_command))
+    end
+
     # DSL start
 
+    # Dump whole table to sql file
+    def dump(table_name)
+      dumping_tables << table_name
+    end
+
     # add query to current dump
-    def dump(query)
+    def copy(query)
       queries << query
     end
 
@@ -39,10 +51,6 @@ module DbDumper
 
     private
 
-    def to_sql
-      queries.map(&method(:build_copy_command)).join("\n")
-    end
-
     def initialize(config)
       @config = config
     end

data/lib/db_dumper/remote_machine.rb

@@ -2,20 +2,16 @@ require_relative 'remote_machine/ssh_agent'
 
 module DbDumper
   class RemoteMachine
-    attr_reader :config, :copy_commands_sql
+    attr_reader :config, :dumped_tables, :copy_commands
 
-    def initialize(config, copy_commands_sql)
+    def initialize(config, dumped_tables, copy_commands)
       @config = config
-      @copy_commands_sql = copy_commands_sql
+      @dumped_tables = dumped_tables
+      @copy_commands = copy_commands
     end
 
     def dump
-      config.log('save sql commands to local machine')
-      save_commands_sql_to_tmp_file
-
       with_ssh do |ssh|
-        upload_commands_sql_to_remote_machine(ssh)
-
         dump_schema(ssh)
         dump_data(ssh)
 
@@ -33,23 +29,17 @@ module DbDumper
       yield(ssh_agent)
     end
 
-    def save_commands_sql_to_tmp_file
-      File.open(local_commands_sql_file_path, 'w') do |file|
-        file.write(copy_commands_sql)
-      end
-    end
-
-    def upload_commands_sql_to_remote_machine(ssh)
-      ssh.upload!(local_commands_sql_file_path, remote_commands_sql_file_path)
-    end
-
     def dump_schema(ssh)
       ssh.exec!(db_utils.dump_schema_command(remote_machine_schema_file_path))
     end
 
     def dump_data(ssh)
       ssh.exec!("mkdir -p #{remote_machine_data_path}")
-      ssh.exec!(db_utils.dump_data_command(remote_commands_sql_file_path))
+
+      ssh.exec!(db_utils.dump_table_data_command(dumped_tables, remote_machine_tables_data_file_path))
+      copy_commands.each do |copy_command|
+        ssh.exec!(db_utils.dump_data_command(copy_command))
+      end
     end
 
     def download_schema(ssh)
@@ -58,14 +48,13 @@ module DbDumper
 
     def download_data(ssh)
       ssh.download!(remote_machine_data_path, dest_path, recursive: true)
+      ssh.download!(remote_machine_tables_data_file_path, dest_path)
     end
 
     def clean(ssh)
-      ssh.exec! "rm #{remote_commands_sql_file_path}"
       ssh.exec! "rm #{remote_machine_schema_file_path}"
+      ssh.exec! "rm #{remote_machine_tables_data_file_path}"
       ssh.exec! "rm -rf #{remote_machine_data_path}"
-
-      File.delete(local_commands_sql_file_path)
     end
 
     def db_utils
@@ -76,12 +65,8 @@ module DbDumper
       "#{remote_machine_dest_path}/#{dump_schema_fname}"
     end
 
-    def remote_commands_sql_file_path
-      "#{remote_machine_dest_path}/#{commands_sql_fname}"
-    end
-
-    def local_commands_sql_file_path
-      "#{dest_path}/#{commands_sql_fname}"
+    def remote_machine_tables_data_file_path
+      "#{remote_machine_dest_path}/#{dump_data_fname}"
     end
 
     def remote_machine_data_path
@@ -96,12 +81,12 @@ module DbDumper
       config.local_machine.dest_path
     end
 
-    def commands_sql_fname
-      @commands_sql_fname ||= "#{Digest::MD5.hexdigest(copy_commands_sql)}.sql"
-    end
-
     def dump_schema_fname
       'schema_dump.sql'
     end
+
+    def dump_data_fname
+      'data_dump.sql'
+    end
   end
 end

data/lib/db_dumper/version.rb

@@ -1,3 +1,3 @@
 module DbDumper
-  VERSION = '0.5.5'
+  VERSION = '0.5.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: db_dumper
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Alexey Lukyanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-28 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -138,7 +138,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/alukyanov/db_dumper/issues
   changelog_uri: https://github.com/alukyanov/db_dumper/CHANGELOG.md
-  documentation_uri: http://www.rubydoc.info/gems/db_dumper/0.5.5
+  documentation_uri: http://www.rubydoc.info/gems/db_dumper/0.5.6
   homepage_uri: https://github.com/alukyanov/db_dumper
   source_code_uri: https://github.com/alukyanov/db_dumper
   wiki_uri: https://github.com/alukyanov/db_dumper/wiki