myreplicator 1.1.28 → 1.1.29

data/lib/exporter/mysql_exporter.rb

@@ -121,7 +121,8 @@ module Myreplicator
           :source_schema => @export_obj.source_schema,
           :table => @export_obj.table_name,
           :filepath => filepath,
-          :destination_schema => @export_obj.destination_schema}
+          :destination_schema => @export_obj.destination_schema,
+          :enclosed_by => Myreplicator.configs[@export_obj.source_schema]["enclosed_by"]}
 
         schema_status = Myreplicator::MysqlExporter.schema_changed?(options)
         Kernel.p "===== schema_status ====="
@@ -132,7 +133,7 @@ module Myreplicator
           options[:incremental_col] = @export_obj.incremental_column
           options[:incremental_col_type] = @export_obj.incremental_column_type
           #options[:incremental_val] = @export_obj.max_incremental_value
-          options[:incremental_val] = [@export_obj.destination_max_incremental_value, @export_obj.max_incremental_value].min            
+          options[:incremental_val] = [@export_obj.destination_max_incremental_value, @export_obj.max_incremental_value].min
         end
 
         #Kernel.p "===== incremental_export_into_outfile OPTIONS ====="

data/lib/exporter/sql_commands.rb

@@ -123,8 +123,12 @@ module Myreplicator
       Kernel.p options
       sql = "SELECT * INTO OUTFILE '#{options[:filepath]}' " 
       
-      #sql += " FIELDS TERMINATED BY '\\0' ESCAPED BY '' OPTIONALLY ENCLOSED BY '\\\"'  LINES TERMINATED BY ';~~;\n'"
-      sql += " FIELDS TERMINATED BY '\\0' ESCAPED BY '' LINES TERMINATED BY ';~~;\n'"
+      if options[:enclosed_by].blank?
+        sql += " FIELDS TERMINATED BY '\\0' ESCAPED BY '' LINES TERMINATED BY ';~~;\n'"
+      else
+        sql += " FIELDS TERMINATED BY '\\0' ESCAPED BY '' OPTIONALLY ENCLOSED BY '\\\"'  LINES TERMINATED BY ';~~;\n'"
+      end
+      
       sql += "FROM #{options[:db]}.#{options[:table]} "
 
       if !options[:incremental_col].blank? && !options[:incremental_val].blank?

data/lib/loader/vertica/vertica_loader.rb

@@ -86,7 +86,7 @@ module Myreplicator
         puts options
         # How not to hard code the vertica connection config ?
         vertica_options = ActiveRecord::Base.configurations["vertica"]
-
+        enclosed_by = Myreplicator.configs[options[:source_schema]]['enclosed_by']
         options.reverse_merge!(:host => vertica_options["host"],
                               :user => vertica_options["username"],
                               :pass => vertica_options["password"],
@@ -97,7 +97,7 @@ module Myreplicator
                               :delimiter => "\\0",
                               :null_value => "NULL",
                               :line_terminate => ";~~;\n",
-                              :enclosed => '')
+                              :enclosed => "#{Myreplicator.configs[options[:source_schema]]['enclosed_by']}")
                               #:enclosed => '\"')
       # working now but should fix this 
         if !vertica_options["vsql"].blank?
@@ -130,6 +130,7 @@ module Myreplicator
         ops = {:mysql_schema => schema_check[:mysql_schema],
           :vertica_db => options[:db],
           :vertica_schema => options[:destination_schema],
+          :source_schema => options[:source_schema],
           :table => options[:table_name],
           :export_id => options[:export_id],
           :filepath => options[:filepath]

data/lib/myreplicator/version.rb

@@ -1,3 +1,3 @@
 module Myreplicator
-  VERSION = "1.1.28"
+  VERSION = "1.1.29"
 end

data/test/dummy/config/myreplicator.yml

@@ -15,6 +15,7 @@ okl_dev:
   ssh_user: lnguyen
   ssh_password: 'H!13lPa:'
   ssh_tmp_dir: /Users/lnguyen/tmp
+  enclosed_by: '\"'
 
 okl_test:
   ssh_host: 54.243.176.8

data/test/dummy/log/development.log

@@ -8848,3 +8848,17 @@ Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myreplicator
 version: !ruby/object:Gem::Version
-  version: 1.1.28
+  version: 1.1.29
   prerelease: 
 platform: ruby
 authors:
@@ -359,7 +359,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -766025267442710139
+      hash: -530255392242392839
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -368,7 +368,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -766025267442710139
+      hash: -530255392242392839
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24