umbrellio-sequel-plugins 0.3.1.69 → 0.3.1.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 70852475f6cb8cdfb7523276d0477d121e9d0151
-  data.tar.gz: a2748b365400fb0f7f81cb2fe5a32df81718c6ee
+SHA256:
+  metadata.gz: 4f45fa7dda328379013d3df5e1d54c0972744408576028bfee1ef4e7b5ce0a83
+  data.tar.gz: e3265443bc9044e398e5eb15b793be942c32298b2969de0ad42c0b6afa95d256
 SHA512:
-  metadata.gz: 1ce6cdfa71094d71107491a75b5ced6ab79a31b765856159cefd95ed091205e1a735e3caa13824b29888dc534ccde36f8bc50dc4219ebfd6288ed61046fb49a3
-  data.tar.gz: 999662fce1882b2ce76abf9dfacff89f7ad509b67808806bd9ee31cd3f01d67f0a338a2801379e992b2a0275489640baa4a8ec5628937592d8ae48454a4dee86
+  metadata.gz: 4160f5dac702415ad606d361d6e88af80e1129551f941e9a780ec66f01c3f06834b9050fe308a5d4b0a561c3da466696d8b319d85a3136581e71dca82e2499b8
+  data.tar.gz: 1d7ccd55314a601c1b09932e036b50e99fd67399918fece58d5a3d6da3ea75a827fc3df0f872490ae42f927ccf1fd82b51163476fa926d87bb2229562a4e55e7

data/.gitignore

@@ -11,3 +11,5 @@
 .rspec_status
 
 Gemfile.lock
+
+log

data/lib/sequel/plugins/upsert.rb

@@ -11,13 +11,14 @@ module Sequel::Plugins::Upsert
     # @return [Sequel::Dataset] dataset
     def upsert_dataset(target: primary_key)
       cols = columns - Array(primary_key)
+
       update_spec = cols.map { |x| [x, Sequel[:excluded][x]] }
-      where_spec = cols.map { |x| [Sequel[table_name][x], Sequel[:excluded][x]] }
+      where_spec = cols.map { |x| Sequel::Plugins::Upsert.distinct_expr(table_name, x) }.reduce(:|)
 
       dataset.insert_conflict(
         target: target,
         update: update_spec,
-        update_where: Sequel.~(where_spec),
+        update_where: where_spec,
       )
     end
 
@@ -57,4 +58,8 @@ module Sequel::Plugins::Upsert
       @upsert_model ||= Sequel::Model(table_name)
     end
   end
+
+  def self.distinct_expr(table_name, col)
+    Sequel.lit("? IS DISTINCT FROM ?", Sequel[table_name][col], Sequel[:excluded][col])
+  end
 end

data/utils/database.rb

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
-::DB ||= Sequel.connect(ENV["DB_URL"] || "postgres://localhost/sequel_plugins")
+require "logger"
+
+DB = Sequel.connect(ENV["DB_URL"] || "postgres://localhost/sequel_plugins")
+DB.logger = Logger.new("log/db.log")
+
 Sequel::Model.db = DB
+
 DB.extension :pg_array
 DB.extension :pg_json
 DB.extension :pg_range

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umbrellio-sequel-plugins
 version: !ruby/object:Gem::Version
-  version: 0.3.1.69
+  version: 0.3.1.77
 platform: ruby
 authors:
 - nulldef
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-03 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -185,6 +185,7 @@ files:
 - lib/tasks/sequel/undo.rake
 - lib/umbrellio-sequel-plugins.rb
 - lib/umbrellio_sequel_plugins.rb
+- log/.keep
 - umbrellio-sequel-plugins.gemspec
 - utils/database.rb
 homepage: https://github.com/umbrellio/umbrellio-sequel-plugins
@@ -207,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Sequel plugins