myreplicator 1.1.30 → 1.1.31

data/lib/exporter/export_metadata.rb

@@ -205,7 +205,6 @@ module Myreplicator
 
     def set_attributes options
       options.symbolize_keys!
-
       @export_time = options[:export_time] if options[:export_time]
       @table = options[:table] if options[:table]
       @database = options[:database] if options[:database]

data/lib/loader/vertica/vertica_loader.rb

@@ -116,8 +116,9 @@ module Myreplicator
         metadata = options[:metadata]
         Kernel.p "===== metadata ====="
         Kernel.p metadata
+        Kernel.p "===== metadata.export_type ====="
+        Kernel.p metadata.export_type
         Kernel.p options
-        #options = {:table => "app_csvs", :destination_schema => "public", :source_schema => "okl_dev"}
         #options = {:table => "actucast_appeal", :destination_schema => "public", :source_schema => "raw_sources"}
         schema_check = Myreplicator::MysqlExporter.schema_changed?(:table => options[:table_name], 
                                                      :destination_schema => options[:destination_schema], 
@@ -155,15 +156,26 @@ module Myreplicator
           options[:table] = temp_table
           Kernel.p "===== COPY TO TEMP TABLE #{temp_table} ====="
           vertica_copy options
-          options.reverse_merge!(:temp_table => "#{temp_table}")
-          options[:table] = options[:table_name]
-          Kernel.p "===== MERGE ====="
-          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;"
-          #VerticaDb::Base.connection.execute sql
-          Myreplicator::DB.exec_sql("vertica",sql)
+          exp = Export.find(metadata.export_id)
+          if exp.export_type == 'incremental'
+            options.reverse_merge!(:temp_table => "#{temp_table}")
+            options[:table] = options[:table_name]
+            Kernel.p "===== MERGE ====="
+            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;"
+            Myreplicator::DB.exec_sql("vertica",sql)
+          elsif exp.export_type == 'all'
+            options.reverse_merge!(:temp_table => "#{temp_table}")
+            options[:table] = options[:table_name]
+            Kernel.p "===== DROP CURRENT TABLE ====="
+            sql = "DROP TABLE IF EXISTS #{options[:db]}.#{options[:destination_schema]}.#{options[:table]} CASCADE;"
+            Myreplicator::DB.exec_sql("vertica",sql)
+            sql = "ALTER TABLE #{options[:db]}.#{options[:destination_schema]}.#{options[:temp_table]} RENAME TO \"#{options[:table]}\";"
+            Kernel.p sql
+            Myreplicator::DB.exec_sql("vertica",sql)
+          end
         end
       end
       
@@ -315,15 +327,6 @@ module Myreplicator
         end
         sql+= "WHEN NOT MATCHED THEN "
         sql+= "INSERT "
-        #count = 1
-        #inserted_columns.each do |col|
-        #  if count < inserted_columns.size
-        #    sql+= "#{col}, "
-        #  else
-        #    sql+= "#{col} "
-        #  end
-        #  count += 1
-        #end
         count = 1
         sql+= " VALUES ("
         inserted_columns.each do |col|

data/lib/myreplicator/version.rb

@@ -1,3 +1,3 @@
 module Myreplicator
-  VERSION = "1.1.30"
+  VERSION = "1.1.31"
 end

data/test/dummy/log/development.log

@@ -8862,3 +8862,9 @@ 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.30
+  version: 1.1.31
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -359,7 +359,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2380744452726569905
+      hash: 3491987006208937872
 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: 2380744452726569905
+      hash: 3491987006208937872
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24