kiba-plus 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b92d471a5e4b16eb461128e8fce8c650f1168bdd566d8dc86f088a2588b04ba6
-  data.tar.gz: 47968f523c74c2649a590ffac8ff065820602ee6b322c9488306305522a4a605
+  metadata.gz: '0828c6c1f68719602e7da95022b0903b04ec26de2aef90b5a3ed965cdf4c803a'
+  data.tar.gz: 015ce68daf808b52dd582d42e15774d5eb4f8d8ed788a407f6cdf6ceece8f9d5
 SHA512:
-  metadata.gz: 1c5a75e3efea8461564b4e26d7d65c44bdef7ffee8941e53471e9be3aa4423debb3b278148ea49861c15481942f3509bbff8af10df7355e6c8bfb3f37fe383e8
-  data.tar.gz: 76e13f396303c0b0c7552cafe3a72f14badd54fc77af900d13726ae49f8f4db584d099d0eec6331f96a396201dbacd7a792a59ff5efdedac2bfe505855f37d33
+  metadata.gz: 8e6c4db4898719071ba940b0d0abc9784f4acb84937fb6ae0ae3c3de89f21fc112cb6593d8f5d3b85099b3f107c54084ff6e9b38509673dcf2fc49dcd69d374a
+  data.tar.gz: 9d247bed23b59922a5bc2aa4f6c3e2e42fa22c8acb20dbee46cf8c3595fc4c4b3324916f281633b516dfba477d22ddc82684144c34f6b66a52d5810beff777a1

data/lib/kiba/plus/destination/pg_bulk.rb

@@ -32,7 +32,7 @@ module Kiba::Plus::Destination
         drop_staging_table
         create_staging_table
         copy_to_staging_table
-        delete_before_insert
+        #delete_before_insert
         merge_to_target_table
         drop_staging_table
       else

data/lib/kiba/plus/destination/pg_bulk2.rb

@@ -44,7 +44,7 @@ module Kiba::Plus::Destination
       @conn.put_copy_end
       @conn.get_last_result
       if incremental
-        delete_before_insert
+        #delete_before_insert
         merge_to_target_table
         drop_staging_table
       end

data/lib/kiba/plus/destination/pg_bulk_utils.rb

@@ -43,14 +43,15 @@ module Kiba::Plus::Destination
       sql = "TRUNCATE TABLE #{table_name}"
       format_sql sql
     end
-
+    
+    # TODO remove it
     def delete_before_insert
       sql = delete_before_insert_sql
       Kiba::Plus.logger.info sql
       @conn.exec(sql)
     end
 
-    # TODO add where condition to speed up deleting.
+    # TODO remove it
     def delete_before_insert_sql
       where = Array(unique_by).map{|x| ["#{staging_table_name}.#{x}", "#{table_name}.#{x}"].join(" = ") }.join(" AND ")
       sql = "DELETE FROM #{table_name} USING #{staging_table_name} WHERE #{where}"
@@ -64,7 +65,12 @@ module Kiba::Plus::Destination
     end
 
     def merge_to_target_table_sql
-      sql = "INSERT INTO #{table_name} (SELECT * FROM #{staging_table_name})"
+      sets = columns.map{|x| "#{x} = excluded.#{x}" }.join(', ')
+      sql = <<~SQL
+        INSERT INTO #{table_name} (SELECT * FROM #{staging_table_name})
+        ON CONFLICT (#{unique_by.join(", ")})
+        DO UPDATE SET #{sets}
+      SQL
       format_sql sql
     end
 

data/lib/kiba/plus/version.rb

@@ -1,5 +1,5 @@
 module Kiba
   module Plus
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kiba-plus
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Hooopo