upsert 2.1.0 → 2.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8a8d49c15022e8faa065c2f060349210b28998b9
-  data.tar.gz: 3814d296ef548257347af887ca39a04b801ceb91
+SHA256:
+  metadata.gz: 5d3ee917c4d930fdfb8be20d6838b49f88142ffb35122ed9c84724ceb498df16
+  data.tar.gz: f8186de9b5a77c3b5dd58ac23b14a7280a27f8a37d2dd3e0305f9dd725846ae4
 SHA512:
-  metadata.gz: e3a2553e8a0d143bb90592d1dc7f5a4ccd9224386fdce394dceef2ad2f46e186a853e61560ef1d6ea93f52b5bb7e948659c62398c60cc6c5d8c5887bdd9c6d0f
-  data.tar.gz: 864fcc5434d104ae1c4d5e8d68a8e8546217612be2d710b01a8ecfbd5e25435f2181a8c59afd7f6224b388762276f93256be6c7cec4ea5e18e994129ba1b396d
+  metadata.gz: 9e874aed50b2fd6d15e9591764f2d16656d0e1a22d44474fb2c279cd2bb508098b81aa2482a1605c0dfcbb7ec356eae65d8a70b1d1763f709f8c9694b78c8862
+  data.tar.gz: a7f35d0e6b5c423b5676c740d9285e7a32134486edc811d184bd35c4f6c97f20024a4db8847fbfd9adecd6a9e8731993e5047528d12fb19387809e306b8067a5

data/.ruby-version

@@ -0,0 +1 @@
+2.5.5

data/.standard.yml

@@ -0,0 +1 @@
+ruby_version: 2.2.4

data/.travis.yml

@@ -1,15 +1,63 @@
+dist: xenial
 language: ruby
-global:
-  - USERNAME=travis
-    PASSWORD=
+cache: bundler
+services:
+  - docker
 rvm:
-  - 2.2.0
-  - 2.1.0
-  - 2.0.0
-  - 1.9.3
-  - 1.9.2
-  - 1.8.7
-  - rbx-2
+  - 2.6
+  - 2.5
+  - 2.4
+  - 2.3
+  - 2.2
+  - jruby-9.1.14.0
+  - jruby-9.1.17.0
+  - jruby-9.2.7.0
 env:
-  - DB=postgresql
-  - DB=mysql
+  global:
+  - USERNAME=travis
+  - PASSWORD=
+  - DB_USER=upsert_test
+  - DB_PASSWORD=upsert_test
+  - DB_NAME=upsert_test
+  matrix:
+    - DB=postgresql DB_VERSION=postgres:9.4
+    - DB=postgresql DB_VERSION=postgres:9.5
+    - DB=postgresql DB_VERSION=postgres:9.6
+    - DB=postgresql DB_VERSION=postgres:10
+    - DB=postgresql DB_VERSION=postgres:11
+    - DB=postgresql DB_VERSION=postgres:12
+    - DB=postgresql DB_VERSION=postgres:9.4 UNIQUE_CONSTRAINT=true
+    - DB=postgresql DB_VERSION=postgres:9.5 UNIQUE_CONSTRAINT=true
+    - DB=postgresql DB_VERSION=postgres:9.6 UNIQUE_CONSTRAINT=true
+    - DB=postgresql DB_VERSION=postgres:10 UNIQUE_CONSTRAINT=true
+    - DB=postgresql DB_VERSION=postgres:11 UNIQUE_CONSTRAINT=true
+    - DB=postgresql DB_VERSION=postgres:12 UNIQUE_CONSTRAINT=true
+    - DB=mysql DB_VERSION=mysql:5.6
+    - DB=mysql DB_VERSION=mysql:5.7
+    - DB=mysql DB_VERSION=mysql:8
+matrix:
+  exclude:
+    - rvm: 2.6
+      env: DB=postgresql DB_VERSION=postgres:9.4
+    - rvm: 2.6
+      env: DB=postgresql DB_VERSION=postgres:9.5
+    - rvm: 2.6
+      env: DB=postgresql DB_VERSION=postgres:9.4 UNIQUE_CONSTRAINT=true
+    - rvm: 2.6
+      env: DB=postgresql DB_VERSION=postgres:9.5 UNIQUE_CONSTRAINT=true
+    - rvm: jruby-9.2.7
+      env: DB=postgresql DB_VERSION=postgres:9.4
+    - rvm: jruby-9.2.7
+      env: DB=postgresql DB_VERSION=postgres:9.5
+    - rvm: jruby-9.2.7
+      env: DB=postgresql DB_VERSION=postgres:9.4 UNIQUE_CONSTRAINT=true
+    - rvm: jruby-9.2.7
+      env: DB=postgresql DB_VERSION=postgres:9.5 UNIQUE_CONSTRAINT=true
+  allow_failures:
+    - env: DB=postgresql DB_VERSION=postgres:12
+    - env: DB=postgresql DB_VERSION=postgres:12 UNIQUE_CONSTRAINT=true
+before_install:
+  - ./travis/run_docker_db.sh
+  - bundle --version
+  - gem --version
+script: ./travis/run_specs.sh

data/CHANGELOG

@@ -1,3 +1,42 @@
+-- no version -- / 2019-06-05
+
+* Enhancements
+
+  * Bump development Ruby version to 2.5 since Ruby 2.2 is no longer supported.
+  This should not affect usage of the gem, only local development for people
+  working *on* the gem. Ruby 2.2 is also not dropped from Upsert compatibility
+  at this time but you should consider upgrading to newer Ruby versions anyway.
+
+2.2.1 / 2017-04-20
+
+* Bug fixes
+
+  * Fix unique constraint detection on pg >9.5.5 (@pnomolos https://github.com/seamusabshere/upsert/pull/99)
+  * Fix Ruby 1.9 tests
+
+2.2.0 / 2017-04-14
+
+* Enhancements
+
+  * Use native "upsert" on Postgres 9.5+! (thanks to @pnomolos https://github.com/seamusabshere/upsert/pull/79)
+  * More modern CI tests
+
+2.1.2 / 2016-02-25
+
+* Enhancements
+
+  * Test on Ruby 2.3 - thanks @Ch4s3 https://github.com/seamusabshere/upsert/pull/70
+
+* Bug fixes
+
+  * Stop using Thread.exclusive - thanks @hpetru https://github.com/seamusabshere/upsert/pull/67
+
+2.1.1 / 2016-02-12
+
+* Enhancements
+
+  * Assume function exists to avoid huge amounts of recreation
+
 2.1.0 / 2015-03-13
 
 * Bug fixes

data/Gemfile

@@ -2,4 +2,15 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in upsert.gemspec
 
-gemspec
+gemspec name: RUBY_PLATFORM == "java" ? "upsert-java" : "upsert"
+
+case RUBY_PLATFORM
+when "java"
+  gem "ffi", platforms: :jruby
+else
+  gem "ffi"
+end
+
+group "test" do
+  gem "testmetrics_rspec"
+end

data/LICENSE

@@ -1,4 +1,6 @@
-Copyright (c) 2013 Seamus Abshere
+Copyright (c) 2013-2019 Seamus Abshere
+Copyright (c) 2017-2019 Philip Schalm
+Portions Copyright (c) 2019 The JRuby Team
 
 MIT License
 

data/README.md

@@ -23,7 +23,7 @@ You pass a __selector__ that uniquely identifies a row, whether it exists or not
 Syntax inspired by [mongo-ruby-driver's update method](http://api.mongodb.org/ruby/1.6.4/Mongo/Collection.html#update-instance_method).
 
 ### Basic
-    
+
 ```ruby
 connection = Mysql2::Client.new([...])
 table_name = :pets
@@ -57,6 +57,14 @@ end
 
 Batch mode is tested to be about 80% faster on PostgreSQL, MySQL, and SQLite3 than other ways to emulate upsert (see the tests, which fail if they are not faster).
 
+### Native Postgres upsert
+
+`INSERT ... ON CONFLICT DO UPDATE` is used when Postgres 9.5+ is detected and *unique constraint are in place.*
+
+**Note: ** You must have a **unique constraint** on the column(s) you're using as a selector.  A unique index won't work.  See https://github.com/seamusabshere/upsert/issues/98#issuecomment-295341405 for more information and some ways to check.
+
+If you don't have unique constraints, it will fall back to the classic Upsert gem user-defined function, which does not require a constraint.
+
 ### ActiveRecord helper method
 
 ```ruby
@@ -115,7 +123,10 @@ See below for details about what SQL MERGE trick (emulation of upsert) is used,
 
 ### Rails / ActiveRecord
 
-(assuming that one of the other three supported drivers is being used under the covers)
+(Assuming that one of the other three supported drivers is being used under the covers).
+
+* add "upsert" to your Gemfile and 
+* run bundle install
 
 ```ruby
 Upsert.new Pet.connection, Pet.table_name
@@ -167,7 +178,7 @@ BEGIN
   DECLARE done BOOLEAN;
   REPEAT
     BEGIN
-      -- If there is a unique key constraint error then 
+      -- If there is a unique key constraint error then
       -- someone made a concurrent insert. Reset the sentinel
       -- and try again.
       DECLARE ER_DUP_UNIQUE CONDITION FOR 23000;
@@ -175,7 +186,7 @@ BEGIN
       DECLARE CONTINUE HANDLER FOR ER_DUP_UNIQUE BEGIN
         SET done = FALSE;
       END;
-      
+
       DECLARE CONTINUE HANDLER FOR ER_INTEG BEGIN
         SET done = TRUE;
       END;
@@ -185,7 +196,7 @@ BEGIN
       -- Race condition here. If a concurrent INSERT is made after
       -- the SELECT but before the INSERT below we'll get a duplicate
       -- key error. But the handler above will take care of that.
-      IF @count > 0 THEN 
+      IF @count > 0 THEN
         -- UPDATE table_name SET b = b_SET WHERE a = a_SEL;
         UPDATE `pets` SET `name` = `name_set`, `tag_number` = `tag_number_set` WHERE `name` = `name_sel` AND `tag_number` = `tag_number_sel`;
       ELSE
@@ -224,6 +235,15 @@ require 'pg_hstore'
 upsert.row({:name => 'Bill'}, :mydata => {:a => 1, :b => 2})
 ```
 
+#### PostgreSQL notes
+
+- Upsert doesn't do any type casting, so if you attempt to do something like the following:
+    `upsert.row({ :name => 'A Name' }, :tag_number => 'bob')`
+    you'll get an error which reads something like:
+    `invalid input syntax for integer: "bob"`
+
+
+
 #### Speed
 
 From the tests (updated 9/21/12):
@@ -361,10 +381,31 @@ If you're using MySQL, make sure server/connection timezone is UTC. If you're us
 
 In general, run some upserts and make sure datetimes get persisted like you expect.
 
+### Clearning all library-generated functions
+
+Place the following in to a rake task (so you don't globally redefine the `NAME_PREFIX` constant)
+
+```ruby
+Upsert::MergeFunction::NAME_PREFIX = "upsert"
+
+# ActiveRecord
+Upsert.clear_database_functions(ActiveRecord::Base.connection)
+
+# Sequel
+DB.synchronize do |conn|
+  Upsert.clear_database_functions(conn)
+end
+```
+
 ### Doesn't work with transactional fixtures
 
 Per https://github.com/seamusabshere/upsert/issues/23 you might have issues if you try to use transactional fixtures and this library.
 
+##
+Testmetrics - https://www.testmetrics.app/seamusabshere/upsert
+
 ## Copyright
 
-Copyright 2014 Seamus Abshere
+Copyright 2013-2019 Seamus Abshere
+Copyright 2017-2019 Philip Schalm
+Portions Copyright (c) 2019 The JRuby Team

data/Rakefile

@@ -1,5 +1,11 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
+require "bundler/gem_helper"
+case RUBY_PLATFORM
+when "java"
+  Bundler::GemHelper.install_tasks name: "upsert-java"
+else
+  Bundler::GemHelper.install_tasks name: "upsert"
+end
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec) do |t|

data/lib/upsert.rb

@@ -14,11 +14,12 @@ class Upsert
     # What logger to use.
     # @return [#info,#warn,#debug]
     attr_writer :logger
-    
+    MUTEX_FOR_PERFORM = Mutex.new
+
     # The current logger
     # @return [#info,#warn,#debug]
     def logger
-      @logger || Thread.exclusive do
+      @logger || MUTEX_FOR_PERFORM.synchronize do
         @logger ||= if defined?(::Rails) and (rails_logger = ::Rails.logger)
           rails_logger
         elsif defined?(::ActiveRecord) and ::ActiveRecord.const_defined?(:Base) and (ar_logger = ::ActiveRecord::Base.logger)
@@ -36,6 +37,31 @@ class Upsert
       end
     end
 
+    def mutex_for_row(upsert, row)
+      retrieve_mutex(upsert.table_name, row.selector.keys)
+    end
+
+    def mutex_for_function(upsert, row)
+      retrieve_mutex(upsert.table_name, row.selector.keys, row.setter.keys)
+    end
+
+    # TODO: Rewrite this to use the thread_safe gem, perhaps?
+    def retrieve_mutex(*args)
+      # ||= isn't an atomic operation
+      MUTEX_FOR_PERFORM.synchronize do
+        @mutex_cache ||= {}
+      end
+
+      @mutex_cache.fetch(args.flatten.join('::')) do |k|
+        MUTEX_FOR_PERFORM.synchronize do
+          # We still need the ||= because this block could have
+          # theoretically been entered simultaneously by two threads
+          # but the actual assignment is protected by the mutex
+          @mutex_cache[k] ||= Mutex.new
+        end
+      end
+    end
+
     # @param [Mysql2::Client,Sqlite3::Database,PG::Connection,#metal] connection A supported database connection.
     #
     # Clear any database functions that may have been created.
@@ -182,9 +208,9 @@ class Upsert
   # @param [Mysql2::Client,Sqlite3::Database,PG::Connection,#metal] connection A supported database connection.
   # @param [String,Symbol] table_name The name of the table into which you will be upserting.
   # @param [Hash] options
-  # @option options [TrueClass,FalseClass] :assume_function_exists (false) Assume the function has already been defined correctly by another process.
+  # @option options [TrueClass,FalseClass] :assume_function_exists (true) Assume the function has already been defined correctly by another process.
   def initialize(connection, table_name, options = {})
-    @table_name = table_name.to_s
+    @table_name = self.class.normalize_table_name(table_name)
     metal = Upsert.metal connection
     @flavor = Upsert.flavor metal
     @adapter = Upsert.adapter metal
@@ -195,7 +221,10 @@ class Upsert
     @connection = Connection.const_get(adapter).new self, metal
     @merge_function_class = MergeFunction.const_get adapter
     @merge_function_cache = {}
-    @assume_function_exists = options.fetch :assume_function_exists, false
+    @assume_function_exists = options.fetch :assume_function_exists, @flavor != "Postgresql"
+
+    @merge_function_mutex = Mutex.new
+    @row_mutex = Mutex.new
   end
 
   # Upsert a row given a selector and a setter.
@@ -215,27 +244,41 @@ class Upsert
   #   upsert.row({:name => 'Pierre'}, :breed => 'tabby')
   def row(selector, setter = {}, options = nil)
     row_object = Row.new(selector, setter, options)
-    merge_function(row_object).execute(row_object)
-    nil
+    self.class.mutex_for_row(self, row_object).synchronize do
+      merge_function(row_object).execute(row_object)
+      nil
+    end
   end
 
   # @private
   def clear_database_functions
     merge_function_class.clear connection
   end
-  
+
   def merge_function(row)
     cache_key = [row.selector.keys, row.setter.keys]
-    @merge_function_cache[cache_key] ||= merge_function_class.new(self, row.selector.keys, row.setter.keys, assume_function_exists?)
+    self.class.mutex_for_function(self, row).synchronize do
+      @merge_function_cache[cache_key] ||=
+        merge_function_class.new(self, row.selector.keys, row.setter.keys, assume_function_exists?)
+    end
   end
 
   # @private
   def quoted_table_name
-    @quoted_table_name ||= connection.quote_ident table_name
+    @quoted_table_name ||= table_name.map { |t| connection.quote_ident(t) }.join(".")
   end
 
   # @private
   def column_definitions
-    @column_definitions ||= ColumnDefinition.const_get(flavor).all connection, table_name
+    @column_definitions ||= ColumnDefinition.const_get(flavor).all connection, quoted_table_name
+  end
+
+  # @private
+  def self.normalize_table_name(table_name)
+    if defined?(Sequel) && table_name.is_a?(::Sequel::SQL::QualifiedIdentifier)
+      [table_name.table, table_name.column]
+    else
+      [*table_name].map(&:to_s)
+    end
   end
 end

data/lib/upsert/column_definition/mysql.rb

@@ -3,8 +3,8 @@ class Upsert
     # @private
     class Mysql < ColumnDefinition
       class << self
-        def all(connection, table_name)
-          connection.execute("SHOW COLUMNS FROM #{connection.quote_ident(table_name)}").map do |row|
+        def all(connection, quoted_table_name)
+          connection.execute("SHOW COLUMNS FROM #{quoted_table_name}").map do |row|
             # {"Field"=>"name", "Type"=>"varchar(255)", "Null"=>"NO", "Key"=>"PRI", "Default"=>nil, "Extra"=>""}
             name = row['Field'] || row['COLUMN_NAME'] || row[:Field] || row[:COLUMN_NAME]
             type = row['Type'] || row['COLUMN_TYPE'] || row[:Type] || row[:COLUMN_TYPE]

data/lib/upsert/column_definition/postgresql.rb

@@ -4,14 +4,14 @@ class Upsert
     class Postgresql < ColumnDefinition
       class << self
         # activerecord-3.2.5/lib/active_record/connection_adapters/postgresql_adapter.rb#column_definitions
-        def all(connection, table_name)
+        def all(connection, quoted_table_name)
           res = connection.execute <<-EOS
-SELECT a.attname AS name, format_type(a.atttypid, a.atttypmod) AS sql_type, d.adsrc AS default
-FROM pg_attribute a LEFT JOIN pg_attrdef d
+  SELECT a.attname AS name, format_type(a.atttypid, a.atttypmod) AS sql_type, d.adsrc AS default
+  FROM pg_attribute a LEFT JOIN pg_attrdef d
   ON a.attrelid = d.adrelid AND a.attnum = d.adnum
-WHERE a.attrelid = '#{connection.quote_ident(table_name)}'::regclass
-AND a.attnum > 0 AND NOT a.attisdropped
-EOS
+  WHERE a.attrelid = '#{quoted_table_name}'::regclass
+  AND a.attnum > 0 AND NOT a.attisdropped
+  EOS
           res.map do |row|
             new connection, row['name'], row['sql_type'], row['default']
           end.sort_by do |cd|
@@ -19,7 +19,7 @@ EOS
           end
         end
       end
-      
+
       # NOTE not using this because it can't be indexed
       # def equality(left, right)
       #   "#{left} IS NOT DISTINCT FROM #{right}"
@@ -40,7 +40,8 @@ EOS
         if hstore?
           'text'
         else
-          super
+          # JDBC uses prepared statements and properly sends date objects (which are otherwise escaped)
+          RUBY_PLATFORM == "java" ? sql_type : super
         end
       end