mysql_truck 0.5.4 → 0.5.5

data/lib/mysql_truck/helper.rb

@@ -71,5 +71,9 @@ module MysqlTruck
     def formatted_time(time)
       "#{"%0.5f" % time}ms"
     end
+
+    def csv_options
+      " --fields-enclosed-by=\\\" --fields-terminated-by=, "
+    end
   end
 end

data/lib/mysql_truck/loader.rb

@@ -46,12 +46,7 @@ module MysqlTruck
       # Load data
       puts "\nLoading schema and data by table"
       puts "--------------------------------"
-      if remote_host?
-        import_cmd = "mysqlimport --local --compress #{db_connection_options}"
-      else
-        import_cmd = "mysqlimport #{db_connection_options}"
-      end
-
+      
       files = Dir["#{tmp_path}/*.no_index.sql"]
       total = files.size
       count = 0
@@ -63,18 +58,23 @@ module MysqlTruck
 
         puts "\nProcessing #{table} (#{count}/#{total})"
 
-        schema_file = Pathname.new(file)
-        index_file  = tmp_path.join("#{table}.indices.sql")
-        data_file   = tmp_path.join("#{table}.data.sql")
+        schema_file   = Pathname.new(file)
+        index_file    = tmp_path.join("#{table}.indices.sql")
+        data_file     = tmp_path.join("#{table}.data.sql")
+        csv_data_file = tmp_path.join("#{table}.csv")
 
         print " - Loading schema for #{table} ... "
         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")} ... "
+          print " - Importing #{schema_file.basename(".data.sql")} ... "
           execute_sql_file(table, backup_date_str, data_file)
+        elsif csv_data_file.exist?
+          print " - Importing #{schema_file.basename(".csv")} ... "
+          import_csv_file(table, backup_date_str, csv_data_file)
         end
+
         data_file.delete   if data_file.exist?
 
         if index_file.exist?
@@ -97,8 +97,8 @@ module MysqlTruck
 
     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
+      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
@@ -107,6 +107,21 @@ module MysqlTruck
       print "complete (#{formatted_time time}).\n"
     end
 
+    def import_csv_file(table, backup_date_str, file_path)
+      if config[:date_suffix]
+        old_file_path = file_path
+        file_path = file_path.to_s.gsub(table, "#{table}_#{backup_date_str.gsub(/-/, "")}")
+        # move file
+        `mv #{old_file_path} #{file_path}`
+      end
+
+      time = benchmark do
+        `mysqlimport --local --compress #{csv_options} #{db_connection_options} #{file_path}`
+      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.4"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysql_truck
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2012-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: right_aws
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Mysql database backup tool. Dumps/Loads to/from S3.