use new args

Author: tomhanoldt

lib/db/dump_helper.rb

@@ -2,23 +2,23 @@
 
 module DumpHelper
   def self.dump_on_local()
-    args = Helper::mysql_args(['--no-create-db'])
+    args = Helper::mysql_dump_args
 
     run_locally do
       execute "mysqldump #{args} > #{fetch(:db_local_dump)}"
     end
   end
 
   def self.dump_on_server_and_download()
-    args = Helper::mysql_args(['--no-create-db'])
+    args = Helper::mysql_dump_args
 
     execute "mysqldump #{args} > #{fetch(:db_remote_dump)}"
 
     download!(fetch(:db_remote_dump), fetch(:db_local_dump))
   end
 
   def self.dump_on_container_and_download(container)
-    args = Helper::mysql_args(['--no-create-db'])
+    args = Helper::mysql_dump_args
 
     container.execute("mysqldump #{args} > #{fetch(:db_remote_dump)}")
 

lib/db/helper.rb

@@ -1,14 +1,25 @@
 module Helper
-  def self.mysql_args(additional_args=[])
-    command = " -u #{fetch(:db_user)}"
-    command+= " -p#{fetch(:db_pass)}" unless fetch(:db_pass).empty?
-    command+= " #{additional_args.join(' ')} "
+  def self.mysql_dump_args
+    command = mysql_auth_args
+    command+= " #{fetch(:db_additional_dump_args).join(' ')} "
+    command+= " #{fetch(:db_name)}" unless fetch(:db_name).empty?
+    command
+  end
 
-    # dont use --database statement, so no use '...' will be generated
+  def self.mysql_restore_args
+    command = mysql_auth_args
+    command+= " #{fetch(:db_additional_restore_args).join(' ')} "
     command+= " #{fetch(:db_name)}" unless fetch(:db_name).empty?
     command
   end
 
+  def self.mysql_auth_args
+    command = " -u #{fetch(:db_user)}"
+    command+= " -p#{fetch(:db_pass)}" unless fetch(:db_pass).empty?
+    command+= " #{fetch(:db_additional_auth_args).join(' ')} "
+    command
+  end
+
   def self.append_stage_to_filename(file_name, stage = 'local')
     splitted  = file_name.split('.')
     extension = splitted.pop
@@ -26,13 +37,16 @@ def self.local_stage?
     fetch(:local_stage_name).to_sym == fetch(:stage).to_sym
   end
 
-  def execute_local_or_remote(cmd)
-    if local_stage?
-      run_locally do
-        execute cmd
+  def self.execute_db_command_autodetect(cmd)
+    cmd = "mysql #{Helper::mysql_auth_args} -e \"#{cmd}\""
+
+    if fetch(:db_is_container)
+      db_container = container_by_name fetch(:db_container_name)
+      on_container db_container do |container|
+        container.execute cmd
       end
     else
-      execute cmd
+      execute_local_or_remote cmd
     end
   end
 end

lib/db/load_helper.rb

@@ -1,21 +1,22 @@
 require_relative "helper.rb"
+require 'capistrano/container'
 
 module LoadHelper
   def self.import_on_local()
     run_locally do
-      execute "mysql #{Helper::mysql_args} < #{fetch(:db_local_dump)}"
+      execute "mysql #{Helper::mysql_restore_args} < #{fetch(:db_local_dump)}"
     end
   end
 
   def self.import_on_container(container)
     container.upload!(fetch(:db_local_dump), fetch(:db_remote_dump))
 
-    container.execute("mysql #{Helper::mysql_args} < #{fetch(:db_remote_dump)}")
+    container.execute "mysql #{Helper::mysql_restore_args} < #{fetch(:db_remote_dump)}"
   end
 
   def self.import_on_server()
     upload!(fetch(:db_local_dump), fetch(:db_remote_dump))
 
-    execute("mysql #{Helper::mysql_args} < #{fetch(:db_remote_dump)}")
+    execute("mysql #{Helper::mysql_restore_args} < #{fetch(:db_remote_dump)}")
   end
 end