myreplicator 1.1.9 → 1.1.10

data/lib/exporter/sql_commands.rb

@@ -127,7 +127,7 @@ module Myreplicator
       
       sql += "FROM #{options[:db]}.#{options[:table]} "
 
-      if options[:incremental_col] && !options[:incremental_val].blank?
+      if !options[:incremental_col].blank? && !options[:incremental_val].blank?
         if options[:incremental_col_type] == "datetime"
           sql += "WHERE #{options[:incremental_col]} >= '#{options[:incremental_val]}'"
         else

data/lib/loader/vertica/vertica_loader.rb

@@ -41,7 +41,7 @@ module Myreplicator
                                      :vertica_schema => options[:vertica_schema],
                                      :table => temp_table,
                                      :mysql_table => options[:table]})
-
+        table = options[:table]
         export_id = options[:export_id]
         new_options = prepare_options options
         new_options[:file] = options[:filepath]
@@ -50,13 +50,15 @@ module Myreplicator
         
          
         vertica_copy new_options
+        
         Kernel.p "+++++++++++++++++ new_options "
         puts new_options
+        options[:table] = table
         puts options
-        
+        # drop the old table
         sql = "DROP TABLE IF EXISTS #{options[:vertica_db]}.#{options[:vertica_schema]}.#{options[:table]} CASCADE;"
         VerticaDb::Base.connection.execute sql
-        #rename
+        # rename
         sql = "ALTER TABLE #{options[:vertica_db]}.#{options[:vertica_schema]}.#{temp_table} RENAME TO #{options[:table]};"
         VerticaDb::Base.connection.execute sql
 
@@ -75,7 +77,8 @@ module Myreplicator
       end
    
       def prepare_options *args
-        options = args.extract_options!.clone
+        #options = args.extract_options!.clone
+        options = args.extract_options!
         Kernel.p "===== OPTION  [options[:db]] ====="
         puts options
         # How not to hard code the vertica connection config ?

data/lib/myreplicator/version.rb

@@ -1,3 +1,3 @@
 module Myreplicator
-  VERSION = "1.1.9"
+  VERSION = "1.1.10"
 end

data/test/dummy/config/database.yml

@@ -1,13 +1,20 @@
 # SQLite version 3.x
-#   gem install sqlite3
+# gem install sqlite3
 #
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
+# Ensure the SQLite 3 gem is defined in your Gemfile
+# gem 'sqlite3'
+vertica:
+  adapter: vertica
+  database: test
+  username: jferris
+  password: okl
+  host: ec2-23-22-175-247.compute-1.amazonaws.com
+  vsql: /Users/lnguyen/opt/vertica/bin/vsql
 development:
   adapter: mysql2
   database: myreplicator
-  username: sas
-  password: sasan
+  username:
+  password:
   host: 127.0.0.1
 
 okl_dev:
@@ -16,7 +23,6 @@ okl_dev:
   username: sas
   password: sasan
   host: 127.0.0.1
-  socket: /home/sasan/mysql.sock
   myreplicator: true
 
 okl_test:
@@ -34,13 +40,6 @@ myreplicator:
   password: sasan
   host: 127.0.0.1
 
-vertica:
-  adapter: vertica
-  host: ec2-23-22-175-247.compute-1.amazonaws.com
-  username: jferris
-  password: okl
-  database: test
-
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
@@ -54,4 +53,4 @@ production:
   adapter: sqlite3
   database: db/production.sqlite3
   pool: 5
-  timeout: 5000
+  timeout: 5000

data/test/dummy/config/myreplicator.yml

@@ -1,28 +1,24 @@
 myreplicator:
   tmp_path: 
-  mysqldump: mysqldump
-  mysqlimport: mysqlimport
-  mysql: mysql
+  mysqldump: /usr/local/mysql/bin/mysqldump
+  mysqlimport: /usr/local/mysql/bin/mysqlimport
+  mysql: /usr/local/mysql/bin/mysql
   outfile_location: /tmp/myreplicator
   escape_by: '"'
   terminate_by: '\t'
   enclosed_by: '"'
   lines_terminate_by: '\n'
-
-  ssh_host: localhost
-  ssh_user: guest
-  ssh_password: sasanguest
-  ssh_tmp_dir: /home/guest/tmp
+  login_redirect: /
 
 okl_dev:
   ssh_host: localhost
-  ssh_user: guest
-  ssh_password: sasanguest
-  ssh_tmp_dir: /home/guest/tmp
-  
+  ssh_user: lnguyen
+  ssh_password: 'H!13lPa:'
+  ssh_tmp_dir: /Users/lnguyen/tmp
+
 okl_test:
   ssh_host: 54.243.176.8
   ssh_user: ubuntu
   ssh_db_host: 127.0.0.1
-  ssh_private_key: ~/.ssh/oklbi-team.pem
-  ssh_tmp_dir: /home/ubuntu/myreplicator_tmp
+  ssh_private_key: ~/oklbi-team.pem
+  ssh_tmp_dir: /tmp

data/test/dummy/console.out

@@ -0,0 +1,3 @@
+ => #<File:console.out> 
+ => true 
+ => false