bulk_importer 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b35f73c6f0ad696286c181ec46e0b8cc00334b6
-  data.tar.gz: 5666a2358e00501877413c17783d6dc4de2d1246
+  metadata.gz: 874a0a632ea28fb994d76931bf16ca5ae51c8d95
+  data.tar.gz: a08b75cbaab59bda7d5f2bf4a207e7b37cfecae2
 SHA512:
-  metadata.gz: c72a504a6946cff11319fb0ca0825ff345d6717c782daf6662a9717f399ca9ed5af9a231ae339713e2072eb6a73ca89197b687322529d119f73d2a42808ba0b2
-  data.tar.gz: 9e20be8acc80d4892237b6c57c6b8d373a852300ee42884ae8e9ae2139a66acb0340c15f41572812fdb772b7ee58753042bf3a82d1e4427481e58c4fd91b911f
+  metadata.gz: f84fb1c6dfbc32074607d4637ad35666d105a5129f159c66d95a7eb9c7a85126fc3429437159f5e86a422ba4a4575c04e49bf69f44e65c7e56ed04fb6736241a
+  data.tar.gz: 8a4020a4f9e6e3ac1087a2e790a472e7a9e8fdb52525abf0b21b46597533dc7a11e8b2c9519e7ed95089a92954bdf7ec4959c0a1ba11f14ef38a6b8ba9703f4e

data/lib/bulk_importer/version.rb

@@ -1,3 +1,3 @@
 module BulkImporter
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/bulk_importer.rb

@@ -71,7 +71,7 @@ module BulkImporter
       return -1
     ensure
       # Drop temporary table (if exists)
-      #ActiveRecord::Base.connection.execute "DROP TABLE IF EXISTS #{temp_name}"
+      ActiveRecord::Base.connection.execute "DROP TABLE IF EXISTS #{temp_name}"
     end
   end
 
@@ -171,7 +171,7 @@ module BulkImporter
     sql << "SELECT #{self.keys_to_list(columns.keys, 'o', types)}"
     sql << "FROM #{origin} o"
     sql << "LEFT JOIN #{destination} d"
-    sql << "ON (#{self.keys_to_list(keys.keys, 'o')}) = "
+    sql << "ON (#{self.keys_to_list(keys.keys, 'o', types)}) = "
     sql << "(#{self.keys_to_list(keys.values, 'd')})"
     sql << "WHERE (#{self.keys_to_list(keys.values, 'd')}) is null"
 
@@ -200,15 +200,25 @@ module BulkImporter
     pg_types = PostgresqlModule.get_column_types destination
     columns.values.each { |i| types[columns.invert[i]] = pg_types[i] }
 
+    o_columns_without_keys = columns.keys.delete_if { |i| keys.has_key? i }
+    d_columns_without_keys = columns.values.delete_if { |i| keys.has_value? i }
+
+    sql << "WITH #{origin}_prexistent_modified AS ("
+    sql << "SELECT o.* FROM #{origin} o JOIN #{destination} d"
+    sql << "ON (#{self.keys_to_list(keys.keys, 'o', types)}) = "
+    sql << "(#{self.keys_to_list(keys.values, 'd')}) AND "
+    sql << "(#{self.keys_to_list(o_columns_without_keys, 'o', types)}) != "
+    sql << "(#{self.keys_to_list(d_columns_without_keys, 'd')})"
+    sql << ")"
     sql << "UPDATE #{destination} d SET"
     set = []
     columns.delete_if { |item| columns[item].nil? }.keys.each do |column|
       set << "#{columns[column]} = o.#{column}::#{types[column]}"
     end
     sql << set.join(',')
-    sql << "FROM #{origin} o"
-    sql << "WHERE (#{self.keys_to_list(keys.keys, 'o')})"
-    sql << "IN (#{self.keys_to_list(keys.values, 'd')})"
+    sql << "FROM #{origin}_prexistent_modified o"
+    sql << "WHERE (#{self.keys_to_list(keys.keys, 'o', types)}) = "
+    sql << "(#{self.keys_to_list(keys.values, 'd')})"
 
     q << sql.join(' ')
 
@@ -250,8 +260,7 @@ module BulkImporter
   #
   def self.make_create_temp_table_sql(name, columns)
     columns = columns.map { |i| i + ' text' }
-    #"CREATE TEMPORARY TABLE #{name} (#{columns.join(',')})"
-    "CREATE TABLE #{name} (#{columns.join(',')})"
+    "CREATE TEMPORARY TABLE #{name} (#{columns.join(',')})"
   end
 
   # Translate an array of keys in a list with an optional prefix.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bulk_importer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Abel M. Osorio