mysql_truck 0.5.3 → 0.5.4

data/README

@@ -0,0 +1,3 @@
+to release:
+
+rake release

data/lib/mysql_truck/loader.rb

@@ -67,39 +67,21 @@ module MysqlTruck
         index_file  = tmp_path.join("#{table}.indices.sql")
         data_file   = tmp_path.join("#{table}.data.sql")
 
-
         print " - Loading schema for #{table} ... "
-        cmd = "cat #{schema_file} | mysql #{db_connection_options}"
-        time = benchmark { `#{cmd}` }
-        print "complete (#{formatted_time time}).\n"
+        execute_sql_file(table, backup_date_str, schema_file)
+        schema_file.delete if schema_file.exist?
 
         if data_file.exist?
           print " - Importing #{schema_file.basename(".sql")} ... "
-
-          commands = ["cat #{data_file}"]
-          if config[:date_suffix]
-            commands << "sed 's/INTO #{table}/INTO #{table}_#{backup_date_str.gsub(/-/, "")}/g'"
-          end
-          commands << "mysql #{db_connection_options}"
-
-          time = benchmark do
-            `#{commands.join(" | ")}`
-          end
-          print "complete (#{formatted_time time}).\n"
+          execute_sql_file(table, backup_date_str, data_file)
         end
+        data_file.delete   if data_file.exist?
 
         if index_file.exist?
           print " - Adding indices for #{schema_file.basename(".no_index.sql")} ... "
-          cmd = "cat #{index_file} | mysql #{db_connection_options}"
-          time = benchmark do
-            `#{cmd}`
-          end
-          print "complete (#{formatted_time time}).\n"
+          execute_sql_file(table, backup_date_str, index_file)
         end
-
-        schema_file.delete if schema_file.exist?
-        index_file.delete if index_file.exist?
-        data_file.delete if data_file.exist?
+        index_file.delete  if index_file.exist?
       end
 
       puts "Backup loaded."
@@ -113,6 +95,18 @@ module MysqlTruck
       puts e.backtrace.join("\n")
     end
 
+    def execute_sql_file(table, backup_date_str, file_path)
+      cat_cmd = "cat #{file_path}"
+      sed_cmd = config[:date_suffix ] ? "sed 's/`#{table}`/`#{table}_#{backup_date_str.gsub(/-/, "")}`/g'" : nil
+      sed2_cmd = config[:date_suffix ] ? "sed 's/TABLE #{table}/TABLE #{table}_#{backup_date_str.gsub(/-/, "")}/g'" : nil
+      import_cmd =  "mysql #{db_connection_options}"
+
+      time = benchmark do
+        `#{[ cat_cmd, sed_cmd, sed2_cmd, import_cmd].compact.join(' | ')}`
+      end
+      print "complete (#{formatted_time time}).\n"
+    end
+
     def download_file(key)
       filename = File.basename(key.name)
 

data/lib/mysql_truck/version.rb

@@ -1,3 +1,3 @@
 module MysqlTruck
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysql_truck
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -40,6 +40,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- README
 - Rakefile
 - TODO
 - bin/mysql_truck