myreplicator 1.1.45 → 1.1.46

data/app/models/myreplicator/export.rb

@@ -88,20 +88,21 @@ module Myreplicator
     
     def destination_max_incremental_value
       sql = SqlCommands.max_value_sql(:incremental_col => self.incremental_column,
-                                                  :db => self.destination_schema,
-                                                  :table => self.table_name)
+                                      :max_incremental_value => self.max_incremental_value,
+                                      :db => self.destination_schema,
+                                      :table => self.table_name)
       puts sql
       if self.export_to == 'vertica'
         begin
           result = Myreplicator::DB.exec_sql('vertica',sql)
-          if result.rows.first[:max].blank?
+          if result.rows.first[:COALESCE].blank?
             return "0"
           else
-            case result.rows.first[:max].class.to_s
+            case result.rows.first[:COALESCE].class.to_s
             when "DateTime"
-              return result.rows.first[:max].strftime('%Y-%m-%d %H:%M:%S')
+              return result.rows.first[:COALESCE].strftime('%Y-%m-%d %H:%M:%S')
             else
-              return result.rows.first[:max].to_s
+              return result.rows.first[:COALESCE].to_s
             end
           end
         rescue Exception => e
@@ -125,18 +126,20 @@ module Myreplicator
     
     def max_value
       sql = SqlCommands.max_value_sql(:incremental_col => self.incremental_column,
+                                      :max_incremental_value => self.max_incremental_value,
                                       :db => self.source_schema,
                                       :table => self.table_name)
       result = exec_on_source(sql)
       if result.first.nil?
         return ""
       else
-        case result.first.first.class.to_s
-        when "Symbol", "Fixnum"
-          return result.first.first.to_s
-        else
-          return result.first.first.to_s(:db)
-        end
+        #case result.first.first.class.to_s
+        #when "Symbol", "Fixnum"
+        #  return result.first.first.to_s
+        #else
+        #  return result.first.first.to_s(:db)
+        #end
+        return result.first.first
       end
     end
 

data/lib/exporter/sql_commands.rb

@@ -237,7 +237,7 @@ module Myreplicator
       sql = ""
 
       if options[:incremental_col]
-        sql = "SELECT max(#{options[:incremental_col]}) FROM #{options[:db]}.#{options[:table]}" 
+        sql = "SELECT COALESCE(max(#{options[:incremental_col]}),'#{options[:max_incremental_value]}') FROM #{options[:db]}.#{options[:table]}" 
       else
         raise Myreplicator::Exceptions::MissingArgs.new("Missing Incremental Column Parameter")
       end

data/lib/loader/loader.rb

@@ -230,7 +230,7 @@ module Myreplicator
     # Uses the values specified in the metadatta object
     ##
     def self.incremental_load metadata
-      exp = Export.find(metadata.export_id)
+      exp = Myreplicator::Export.find(metadata.export_id)
       #Loader.unzip(metadata.filename)
       #metadata.zipped = false
       

data/lib/loader/vertica/vertica_loader.rb

@@ -167,11 +167,11 @@ module Myreplicator
           # run the export. The next time loader runs, it will load the file
           exp.export
         else # incremental load
-          temp_table = create_temp_table ops
+          temp_table = Myreplicator::VerticaLoader.create_temp_table ops
           options[:table] = temp_table
           Kernel.p "===== COPY TO TEMP TABLE #{temp_table} ====="
-          vertica_copy options
-          options.reverse_merge!(:temp_table => "#{temp_table}")
+          Myreplicator::VerticaLoader.vertica_copy options
+          options[:temp_table] = "#{temp_table}"
           options[:table] = options[:table_name]
           sql = "SELECT COUNT(*) FROM #{options[:db]}.#{options[:destination_schema]}.#{options[:temp_table]};"
           result = Myreplicator::DB.exec_sql("vertica",sql)
@@ -193,7 +193,7 @@ module Myreplicator
               Myreplicator::VerticaUtils.set_grants(grants)
             elsif exp.export_type == 'incremental'
               Kernel.p "===== MERGE ====="
-              vertica_merge options
+              Myreplicator::VerticaLoader.vertica_merge options
               #drop the temp table
               Kernel.p "===== DROP TEMP TABLE ====="
               sql = "DROP TABLE IF EXISTS #{options[:db]}.#{options[:destination_schema]}.#{temp_table} CASCADE;"

data/lib/myreplicator/version.rb

@@ -1,3 +1,3 @@
 module Myreplicator
-  VERSION = "1.1.45"
+  VERSION = "1.1.46"
 end

data/test/dummy/lib/tasks/maintenance.rake

@@ -8,9 +8,12 @@ namespace :maintenance do
       Resque.remove_schedule(export.schedule_name)
     end
     
+    sql ="SELECT CLOSE_ALL_SESSIONS();"
+    Myreplicator::DB.exec_sql("vertica",sql)
+    
     Resque.remove_schedule("myreplicator_loader")
     Resque.remove_schedule("myreplicator_sweeper")
-    Resque.remove_schedule("myreplicator_transporter")
+    Resque.remove_schedule("myreplicator_transporter")					
   end
   
   task :start_dr_jobs do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: myreplicator
 version: !ruby/object:Gem::Version
-  version: 1.1.45
+  version: 1.1.46
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -328,7 +328,6 @@ files:
 - test/dummy/tmp/cache/assets/E2D/2C0/sprockets%2Ff0c2e561abf62fabc69462c2cfeef3d8
 - test/dummy/tmp/cache/assets/E76/790/sprockets%2Fdaf734b1fcabd6ca66b333ad0f0fdbf0
 - test/dummy/tmp/cache/assets/F08/560/sprockets%2F5ab2cf5fb087fdef95cfe9fe6fabf9df
-- test/dummy/tmp/pids/server.pid
 - test/fixtures/myreplicator/exports.yml
 - test/functional/myreplicator/exports_controller_test.rb
 - test/integration/navigation_test.rb
@@ -353,7 +352,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2156921709452329403
+      hash: 3606855221214584877
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -362,7 +361,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2156921709452329403
+      hash: 3606855221214584877
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -458,7 +457,6 @@ test_files:
 - test/dummy/tmp/cache/assets/E2D/2C0/sprockets%2Ff0c2e561abf62fabc69462c2cfeef3d8
 - test/dummy/tmp/cache/assets/E76/790/sprockets%2Fdaf734b1fcabd6ca66b333ad0f0fdbf0
 - test/dummy/tmp/cache/assets/F08/560/sprockets%2F5ab2cf5fb087fdef95cfe9fe6fabf9df
-- test/dummy/tmp/pids/server.pid
 - test/fixtures/myreplicator/exports.yml
 - test/functional/myreplicator/exports_controller_test.rb
 - test/integration/navigation_test.rb

data/test/dummy/tmp/pids/server.pid

@@ -1 +0,0 @@
-17877