upsert 2.2.0 → 2.9.10

data/spec/speed_spec.rb

@@ -6,7 +6,7 @@ describe Upsert do
         assert_faster_than 'find + new/set/save', lotsa_records do |records|
           records.each do |selector, setter|
             if pet = Pet.where(selector).first
-              pet.update_attributes setter, :without_protection => true
+              pet.update_attributes(setter)
             else
               pet = Pet.new
               selector.each do |k, v|
@@ -24,51 +24,21 @@ describe Upsert do
         assert_faster_than 'find_or_create + update_attributes', lotsa_records do |records|
           dynamic_method = nil
           records.each do |selector, setter|
-            dynamic_method ||= "find_or_create_by_#{selector.keys.join('_or_')}"
-            pet = Pet.send(dynamic_method, *selector.values)
-            pet.update_attributes setter, :without_protection => true
+            Pet.find_or_create_by(selector).update_attributes(setter)
           end
         end
       end
       it "is faster than create + rescue/find/update" do
         assert_faster_than 'create + rescue/find/update', lotsa_records do |records|
-          dynamic_method = nil
           records.each do |selector, setter|
-            dynamic_method ||= "find_or_create_by_#{selector.keys.join('_or_')}"
             begin
               Pet.create selector.merge(setter), :without_protection => true
             rescue
-              pet = Pet.send(dynamic_method, *selector.values)
-              pet.update_attributes setter, :without_protection => true
+              Pet.find_or_create_by(selector).update_attributes(setter)
             end
           end
         end
       end
     end
-
-    # FIXME apparently no longer faster?
-    # if ENV['DB'] == 'mysql' && RUBY_VERSION >= '1.9'
-    #   describe 'compared to activerecord-import' do
-    #     it "is faster than faking upserts with activerecord-import" do
-    #       assert_faster_than 'faking upserts with activerecord-import', lotsa_records do |records|
-    #         columns = nil
-    #         all_values = []
-    #         records.each do |selector, setter|
-    #           columns ||= (selector.keys + setter.keys).uniq
-    #           all_values << columns.map do |k|
-    #             if setter.has_key?(k)
-    #               # prefer the setter so that you can change rows
-    #               setter[k]
-    #             else
-    #               selector[k]
-    #             end
-    #           end
-    #         end
-    #         Pet.import columns, all_values, :timestamps => false, :on_duplicate_key_update => columns
-    #       end
-    #     end
-    #   end
-    # end
-
   end
 end

data/spec/threaded_spec.rb

@@ -1,18 +1,21 @@
 require 'spec_helper'
 describe Upsert do
+  Thread.abort_on_exception = true
   describe "is thread-safe" do
     it "is safe to use one-by-one" do
       upsert = Upsert.new $conn, :pets
       assert_creates(Pet, [{:name => 'Jerry', :gender => 'neutered'}]) do
         ts = []
         10.times do
-          ts << Thread.new do
-            sleep 0.2
-            upsert.row({:name => 'Jerry'}, :gender => 'male')
-            upsert.row({:name => 'Jerry'}, :gender => 'neutered')
-          end
-          ts.each { |t| t.join }
+          ts << Thread.new {
+            ActiveRecord::Base.connection_pool.with_connection do |conn|
+              sleep 0.2
+              upsert.row({name: "Jerry"}, gender: "male")
+              upsert.row({name: "Jerry"}, gender: "neutered")
+            end
+          }
         end
+        ts.each { |t| t.join(3) }
       end
     end
     it "is safe to use batch" do
@@ -20,14 +23,34 @@ describe Upsert do
         Upsert.batch($conn, :pets) do |upsert|
           ts = []
           10.times do
-            ts << Thread.new do
-              sleep 0.2
-              upsert.row({:name => 'Jerry'}, :gender => 'male')
-              upsert.row({:name => 'Jerry'}, :gender => 'neutered')
-            end
-            ts.each { |t| t.join }
+            ts << Thread.new {
+              ActiveRecord::Base.connection_pool.with_connection do |conn|
+                sleep 0.2
+                upsert.row({name: "Jerry"}, gender: "male")
+                upsert.row({name: "Jerry"}, gender: "neutered")
+              end
+            }
           end
+          ts.each { |t| t.join(3) }
+        end
+      end
+    end
+
+    it "is safe to use with the entire block instead the thread" do
+      assert_creates(Pet, [{name: "Jerry", gender: "neutered"}]) do
+        ts = []
+        10.times do
+          ts << Thread.new {
+            ActiveRecord::Base.connection_pool.with_connection do |conn|
+              sleep 0.1
+              Upsert.batch(conn, :pets) do |upsert|
+                upsert.row({name: "Jerry"}, gender: "male")
+                upsert.row({name: "Jerry"}, gender: "neutered")
+              end
+            end
+          }
         end
+        ts.each { |t| t.join(3) }
       end
     end
   end

data/spec/type_safety_spec.rb

@@ -2,10 +2,11 @@ require 'spec_helper'
 describe Upsert do
   describe "type safety" do
     it "does not attempt to typecast values" do
+      error_class = RUBY_PLATFORM == 'java' ? org.postgresql.util.PSQLException : PG::InvalidTextRepresentation
       upsert = Upsert.new $conn, :pets
       lambda do
         upsert.row :tag_number => ''
-      end.should raise_error
+      end.should raise_error error_class
     end
   end
 end if ENV['DB'] == 'postgresql'

data/travis/run_docker_db.sh

@@ -0,0 +1,20 @@
+docker network create -d bridge --subnet 	172.25.0.0/16 --gateway 172.25.0.1 upsert_test
+
+case "$DB" in
+  postgresql)
+      docker run --tmpfs /var/lib/postgresql/data:rw --rm --name upsert_test_db_server \
+        -e POSTGRES_USER=$DB_USER -e POSTGRES_PASSWORD=$DB_PASSWORD -e POSTGRES_DB=$DB_NAME \
+        -p 5432:5432 -d \
+        $DB_VERSION
+      sleep 10
+    ;;
+  mysql)
+      docker run --network upsert_test --ip 172.25.0.2 --tmpfs /var/lib/mysql:rw --rm --name upsert_test_db_server \
+        -e MYSQL_ROOT_PASSWORD=root -e MYSQL_USER=$DB_USER -e MYSQL_PASSWORD=$DB_PASSWORD -e MYSQL_DATABASE=$DB_NAME \
+        -p 3306:3306 -d \
+        $DB_VERSION \
+        --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --default-authentication-plugin=mysql_native_password --default-time-zone=+00:00
+      sleep 10
+      docker run --network upsert_test --rm $DB_VERSION mysql -h172.25.0.2 -uroot -proot -e "GRANT ALL ON *.* TO '$DB_USER'"
+    ;;
+esac

data/upsert-java.gemspec

@@ -0,0 +1,13 @@
+Gem::Specification.load(File.expand_path("upsert.gemspec.common", __dir__)).dup.tap do |gem|
+  gem.instance_exec do
+    self.name = "upsert"
+    self.platform = "java"
+    add_development_dependency "jruby-openssl"
+    add_development_dependency "jdbc-postgres"
+    add_development_dependency "jdbc-mysql"
+    add_development_dependency "jdbc-sqlite3"
+    add_development_dependency "activerecord-jdbc-adapter"
+
+    add_development_dependency "pry-nav"
+  end
+end

data/upsert.gemspec

@@ -1,60 +1,11 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/upsert/version', __FILE__)
-
-Gem::Specification.new do |gem|
-  gem.authors       = ["Seamus Abshere", "Phil Schalm"]
-  gem.email         = ["seamus@abshere.net"]
-  t = %{Make it easy to upsert on MySQL, PostgreSQL, and SQLite3. Transparently creates merge functions for MySQL and PostgreSQL; on SQLite3, uses INSERT OR IGNORE.}
-  gem.description   = t
-  gem.summary       = t
-  gem.homepage      = "https://github.com/seamusabshere/upsert"
-
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "upsert"
-  gem.require_paths = ["lib"]
-  gem.version       = Upsert::VERSION
-
-  # NOTE: no runtime dependencies!
-
-  gem.add_development_dependency 'rspec-core'
-  gem.add_development_dependency 'rspec-expectations'
-  gem.add_development_dependency 'rspec-mocks'
-
-  gem.add_development_dependency 'activerecord', '~>3'
-  gem.add_development_dependency 'active_record_inline_schema'
-  gem.add_development_dependency 'faker'
-  gem.add_development_dependency 'yard'
-  gem.add_development_dependency 'pry'
-  gem.add_development_dependency 'pg-hstore', ">=1.1.3"
-  gem.add_development_dependency 'sequel'
-  gem.add_development_dependency 'rake', '~>10.1.1'
-
-  if RUBY_VERSION >= '1.9'
-    gem.add_development_dependency 'activerecord-import', '0.11.0' # 0.12 and up were failing
-  else
-    gem.add_development_dependency 'orderedhash'
-  end
-
-  if RUBY_PLATFORM == 'java'
-    gem.add_development_dependency 'jruby-openssl'
-    gem.add_development_dependency 'jdbc-postgres'
-    gem.add_development_dependency 'jdbc-mysql'
-    gem.add_development_dependency 'jdbc-sqlite3'
-    gem.add_development_dependency 'activerecord-jdbcsqlite3-adapter'
-    gem.add_development_dependency 'activerecord-jdbcmysql-adapter'
-    gem.add_development_dependency 'activerecord-jdbcpostgresql-adapter'
-  else
-    gem.add_development_dependency 'activerecord-postgresql-adapter'
-    gem.add_development_dependency 'sqlite3'
-    gem.add_development_dependency 'mysql2', '~> 0.3.10'
-    gem.add_development_dependency 'pg', '~> 0.18.0'
-    # github-flavored markdown
-    if RUBY_VERSION >= '1.9'
-      gem.add_development_dependency 'redcarpet'
-    else
-      gem.add_development_dependency 'redcarpet', '~> 2.3.0'
-    end
+Gem::Specification.load(File.expand_path("upsert.gemspec.common", __dir__)).dup.tap do |gem|
+  gem.instance_exec do
+    self.name = "upsert"
+    add_development_dependency "activerecord-postgresql-adapter"
+    add_development_dependency "sqlite3"
+    add_development_dependency "mysql2", "~> 0.5"
+    add_development_dependency "pg", "~> 1.1"
+
+    add_development_dependency "pry-byebug"
   end
 end

data/upsert.gemspec.common

@@ -0,0 +1,107 @@
+require File.expand_path("../lib/upsert/version", __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.authors       = ["Seamus Abshere", "Phil Schalm"]
+  gem.email         = ["seamus@abshere.net", "pnomolos@gmail.com"]
+  t = %{Make it easy to upsert on MySQL, PostgreSQL, and SQLite3. Transparently creates merge functions for MySQL and PostgreSQL; on SQLite3, uses INSERT OR IGNORE.}
+  gem.description   = t
+  gem.summary       = t
+  gem.homepage      = "https://github.com/seamusabshere/upsert"
+  gem.license       = "MIT"
+  gem.platform      = (Gem::Platform::CURRENT.index("java") ? Gem::Platform::CURRENT : "")
+
+  # We no longer use `git ls-files` here because it breaks on some version of jruby...
+  # For some slightly related information:
+  # - https://github.com/jruby/jruby/issues/4515
+  # - https://github.com/jruby/jruby/issues/5249
+  #
+  gem.files = %w[
+    .gitignore
+    .ruby-version
+    .standard.yml
+    .travis.yml
+    .yardopts
+    CHANGELOG
+    Gemfile
+    LICENSE
+    README.md
+    Rakefile
+    lib/upsert.rb
+    lib/upsert/active_record_upsert.rb
+    lib/upsert/binary.rb
+    lib/upsert/column_definition.rb
+    lib/upsert/column_definition/mysql.rb
+    lib/upsert/column_definition/postgresql.rb
+    lib/upsert/column_definition/sqlite3.rb
+    lib/upsert/connection.rb
+    lib/upsert/connection/Java_ComMysqlJdbc_JDBC4Connection.rb
+    lib/upsert/connection/Java_OrgPostgresqlJdbc_PgConnection.rb
+    lib/upsert/connection/Java_OrgSqlite_Conn.rb
+    lib/upsert/connection/Mysql2_Client.rb
+    lib/upsert/connection/PG_Connection.rb
+    lib/upsert/connection/SQLite3_Database.rb
+    lib/upsert/connection/jdbc.rb
+    lib/upsert/connection/postgresql.rb
+    lib/upsert/connection/sqlite3.rb
+    lib/upsert/merge_function.rb
+    lib/upsert/merge_function/Java_ComMysqlJdbc_JDBC4Connection.rb
+    lib/upsert/merge_function/Java_OrgPostgresqlJdbc_PgConnection.rb
+    lib/upsert/merge_function/Java_OrgSqlite_Conn.rb
+    lib/upsert/merge_function/Mysql2_Client.rb
+    lib/upsert/merge_function/PG_Connection.rb
+    lib/upsert/merge_function/SQLite3_Database.rb
+    lib/upsert/merge_function/mysql.rb
+    lib/upsert/merge_function/postgresql.rb
+    lib/upsert/merge_function/sqlite3.rb
+    lib/upsert/row.rb
+    lib/upsert/version.rb
+    spec/active_record_upsert_spec.rb
+    spec/binary_spec.rb
+    spec/correctness_spec.rb
+    spec/database_functions_spec.rb
+    spec/database_spec.rb
+    spec/hstore_spec.rb
+    spec/jruby_spec.rb
+    spec/logger_spec.rb
+    spec/misc/get_postgres_reserved_words.rb
+    spec/misc/mysql_reserved.txt
+    spec/misc/pg_reserved.txt
+    spec/multibyte_spec.rb
+    spec/postgresql_spec.rb
+    spec/precision_spec.rb
+    spec/reserved_words_spec.rb
+    spec/sequel_spec.rb
+    spec/spec_helper.rb
+    spec/speed_spec.rb
+    spec/threaded_spec.rb
+    spec/timezones_spec.rb
+    spec/type_safety_spec.rb
+    travis/install_postgres.sh
+    travis/run_docker_db.sh
+    travis/tune_mysql.sh
+    upsert-java.gemspec
+    upsert.gemspec
+    upsert.gemspec.common
+  ]
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "upsert"
+  gem.require_paths = ["lib"]
+  gem.version       = Upsert::VERSION
+
+  # NOTE: no runtime dependencies!
+
+  gem.add_development_dependency 'rspec-core'
+  gem.add_development_dependency 'rspec-expectations'
+  gem.add_development_dependency 'rspec-mocks'
+
+  gem.add_development_dependency 'activerecord', '~> 5'
+  gem.add_development_dependency 'yard'
+  gem.add_development_dependency 'pry'
+  gem.add_development_dependency 'pg-hstore', ">=1.1.3"
+  gem.add_development_dependency 'sequel'
+  gem.add_development_dependency 'rake', '~> 10'
+
+  gem.add_development_dependency "activerecord-import", "~> 1"
+  gem.add_development_dependency "faker"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upsert
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.9.10
 platform: ruby
 authors:
 - Seamus Abshere
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-14 00:00:00.000000000 Z
+date: 2019-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -59,16 +59,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '5'
 - !ruby/object:Gem::Dependency
-  name: active_record_inline_schema
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -82,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faker
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,21 +96,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: pg-hstore
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -124,61 +124,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg-hstore
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.3
-- !ruby/object:Gem::Dependency
-  name: sequel
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: activerecord-import
+  name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord-postgresql-adapter
   requirement: !ruby/object:Gem::Requirement
@@ -213,30 +199,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.10
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.10
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -253,11 +239,14 @@ description: Make it easy to upsert on MySQL, PostgreSQL, and SQLite3. Transpare
   creates merge functions for MySQL and PostgreSQL; on SQLite3, uses INSERT OR IGNORE.
 email:
 - seamus@abshere.net
+- pnomolos@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
+- ".standard.yml"
 - ".travis.yml"
 - ".yardopts"
 - CHANGELOG
@@ -274,7 +263,7 @@ files:
 - lib/upsert/column_definition/sqlite3.rb
 - lib/upsert/connection.rb
 - lib/upsert/connection/Java_ComMysqlJdbc_JDBC4Connection.rb
-- lib/upsert/connection/Java_OrgPostgresqlJdbc4_Jdbc4Connection.rb
+- lib/upsert/connection/Java_OrgPostgresqlJdbc_PgConnection.rb
 - lib/upsert/connection/Java_OrgSqlite_Conn.rb
 - lib/upsert/connection/Mysql2_Client.rb
 - lib/upsert/connection/PG_Connection.rb
@@ -284,7 +273,7 @@ files:
 - lib/upsert/connection/sqlite3.rb
 - lib/upsert/merge_function.rb
 - lib/upsert/merge_function/Java_ComMysqlJdbc_JDBC4Connection.rb
-- lib/upsert/merge_function/Java_OrgPostgresqlJdbc4_Jdbc4Connection.rb
+- lib/upsert/merge_function/Java_OrgPostgresqlJdbc_PgConnection.rb
 - lib/upsert/merge_function/Java_OrgSqlite_Conn.rb
 - lib/upsert/merge_function/Mysql2_Client.rb
 - lib/upsert/merge_function/PG_Connection.rb
@@ -316,10 +305,14 @@ files:
 - spec/timezones_spec.rb
 - spec/type_safety_spec.rb
 - travis/install_postgres.sh
+- travis/run_docker_db.sh
 - travis/tune_mysql.sh
+- upsert-java.gemspec
 - upsert.gemspec
+- upsert.gemspec.common
 homepage: https://github.com/seamusabshere/upsert
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -337,7 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Make it easy to upsert on MySQL, PostgreSQL, and SQLite3. Transparently creates