kiba-plus 0.2.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0828c6c1f68719602e7da95022b0903b04ec26de2aef90b5a3ed965cdf4c803a'
-  data.tar.gz: 015ce68daf808b52dd582d42e15774d5eb4f8d8ed788a407f6cdf6ceece8f9d5
+  metadata.gz: 2cf354ffae037a7f1896a4221b2f5d150a39c5711d775f30f47cb1348cf13322
+  data.tar.gz: 54a3787ed4ecbe17c9799a1c669aa7bec75dd1b8c8fc6e7cc68f0e273c3d18e9
 SHA512:
-  metadata.gz: 8e6c4db4898719071ba940b0d0abc9784f4acb84937fb6ae0ae3c3de89f21fc112cb6593d8f5d3b85099b3f107c54084ff6e9b38509673dcf2fc49dcd69d374a
-  data.tar.gz: 9d247bed23b59922a5bc2aa4f6c3e2e42fa22c8acb20dbee46cf8c3595fc4c4b3324916f281633b516dfba477d22ddc82684144c34f6b66a52d5810beff777a1
+  metadata.gz: 97535e0b00949251877e23bd1e34c093917697b224794dd3fb118a631b109b4ed9fbc1cc146eda020e5974a27a325e3b36ebad247d2977c49bb0645cdbcd6124
+  data.tar.gz: bf5bc5977edf10480269edf0623acae8b34d25c5deb3630d2e8caed01a96a48bbdfa172a1be87e9b028bc7421a8db8323201f67e1dad961263f471544e8db705

data/kiba-plus.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "kiba", "~> 1.0.0"
+  spec.add_runtime_dependency "kiba", "~> 2.0.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"

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

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

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

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

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

@@ -44,20 +44,6 @@ module Kiba::Plus::Destination
       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 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}"
-      format_sql sql
-    end
-
     def merge_to_target_table
       sql = merge_to_target_table_sql
       Kiba::Plus.logger.info sql
@@ -68,7 +54,7 @@ module Kiba::Plus::Destination
       sets = columns.map{|x| "#{x} = excluded.#{x}" }.join(', ')
       sql = <<~SQL
         INSERT INTO #{table_name} (SELECT * FROM #{staging_table_name})
-        ON CONFLICT (#{unique_by.join(", ")})
+        ON CONFLICT (#{Array(unique_by).join(", ")})
         DO UPDATE SET #{sets}
       SQL
       format_sql sql

data/lib/kiba/plus/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kiba-plus
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Hooopo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-22 00:00:00.000000000 Z
+date: 2019-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kiba
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement