active_record_upsert 0.6.3 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 385757b53b221b5a937972a8fae3fddc3b8d7961
-  data.tar.gz: 85c767dfb3b0256dc87e0957067d7324fca7239e
+  metadata.gz: 861dbd4abac80eae38c3644d5a982f3b4c7d95a8
+  data.tar.gz: fe700280c47b2cff78e3f8eeed2a14d966a10b72
 SHA512:
-  metadata.gz: d37843428c375432fe428096d17d9e9aa5f3c7cb5a866eb0b28a3956d5bcb79db515b6941212eaae67b9b8c2df1f4667e5c7e307f375d8d233754bfaaa3c39df
-  data.tar.gz: 6a47e3bfb52cd8fa1ea29650c044fa8d747e1c9ec695e54c6ed4146bafb08572fc377393d57a333fe248dd433eb621a2a875ef6618f012fd1aae49797a7625b0
+  metadata.gz: 3254084380ac0b9a14189ed071f53ec45e74d2701962b892720839d93b2855156e684f26e025742d19e8575031b3062e662c034bc19705caacabfafddde1a6ad
+  data.tar.gz: 859f1a55e2f6f2b64f192f18f305ae634fc50b4d24475a01bd5d0049cf4ad6d70cb931bd7215d4cfae492941046c04b4f15ca7a907fc2bbe844635bec5a0e340

data/README.md

@@ -40,21 +40,40 @@ Or install it yourself as:
 ## Usage
 Just use `ActiveRecord.upsert` or `ActiveRecord#upsert`.
 *ActiveRecordUpsert* respects timestamps.
- 
-```
+
+```ruby
 class MyRecord < ActiveRecord::Base
 end
 
 MyRecord.create(name: 'foo', wisdom: 1)
-=> #<MyRecord id: 1, name: "foo", created_at: "2016-02-20 14:15:55", updated_at: "2016-02-20 14:15:55", wisdom: 1>
+# => #<MyRecord id: 1, name: "foo", created_at: "2016-02-20 14:15:55", updated_at: "2016-02-20 14:15:55", wisdom: 1>
 
 MyRecord.upsert(id: 1, wisdom: 3)
-=> #<MyRecord id: 2, name: "foo", created_at: "2016-02-20 14:15:55", updated_at: "2016-02-20 14:18:15", wisdom: 3>
+# => #<MyRecord id: 1, name: "foo", created_at: "2016-02-20 14:15:55", updated_at: "2016-02-20 14:18:15", wisdom: 3>
 
 r = MyRecord.new(id: 1)
 r.name = 'bar'
 r.upsert
-=> #<MyRecord id: 2, name: "bar", created_at: "2016-02-20 14:17:50", updated_at: "2016-02-20 14:18:49", wisdom: 3>
+# => #<MyRecord id: 1, name: "bar", created_at: "2016-02-20 14:15:55", updated_at: "2016-02-20 14:18:49", wisdom: 3>
+```
+
+Also, it's possible to specify which columns should be used for the conflict clause. **These must comprise a unique index in Postgres.**
+
+```ruby
+class Vehicle < ActiveRecord::Base
+  upsert_keys [:make, :name]
+end
+
+Vehicle.upsert(make: 'Ford', name: 'F-150', doors: 4)
+# => #<Vehicle id: 1, make: 'Ford', name: 'Focus', doors: 2>
+
+Vehicle.create(make: 'Ford', name: 'Focus', doors: 4)
+# => #<Vehicle id: 2, make: 'Ford', name: 'Focus', doors: 4>
+
+r = Vehicle.new(make: 'Ford', name: 'F-150')
+r.doors = 2
+r.upsert
+# => #<Vehicle id: 1, make: 'Ford', name: 'Focus', doors: 2>
 ```
 
 ## Tests
@@ -77,3 +96,4 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/jesjos
 - Jens Nockert
 - Olle Jonsson
 - Simon Dahlbacka
+- Paul Hoffer

data/active_record_upsert.gemspec

@@ -12,21 +12,15 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Real PostgreSQL 9.5+ upserts using ON CONFLICT for ActiveRecord}
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin|test|spec|features)/}) } -
+                       %w[.gitignore .rspec .travis.yml Dockerfile Gemfile Gemfile.docker docker-compose.yml]
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'activerecord', '>= 5.0', '< 5.1'
-  spec.add_runtime_dependency "arel", "~>7.0"
-
   spec.platform = Gem::Platform::RUBY
-  spec.add_runtime_dependency 'pg', '~> 0.18'
 
-  spec.add_development_dependency "bundler", ">= 1.13"
-  spec.add_development_dependency "rake", ">= 10.0"
-  spec.add_development_dependency "rspec", ">= 3.0", "< 4"
-  spec.add_development_dependency "pry", "> 0"
-  spec.add_development_dependency "database_cleaner", "~> 1.5.3"
-  spec.add_development_dependency 'rails', '>= 5.0', '< 5.1'
+  spec.add_runtime_dependency 'activerecord', '>= 5.0', '< 5.2'
+  spec.add_runtime_dependency 'arel', '> 7.0', '< 9.0'
+  spec.add_runtime_dependency 'pg', '~> 0.18'
 end

data/lib/active_record_upsert/active_record/persistence.rb

@@ -2,12 +2,16 @@ module ActiveRecordUpsert
   module ActiveRecord
     module PersistenceExtensions
 
-      def upsert
+      def upsert(attribute_names=nil)
         raise ::ActiveRecord::ReadOnlyRecord, "#{self.class} is marked as readonly" if readonly?
         raise ::ActiveRecord::RecordSavedError, "Can't upsert a record that has already been saved" if persisted?
         values = run_callbacks(:save) {
           run_callbacks(:create) {
-            _upsert_record
+            attribute_names ||= changed
+            attribute_names = attribute_names.map(&:to_s) +
+              timestamp_attributes_for_create_in_model +
+              timestamp_attributes_for_update_in_model
+            _upsert_record(attribute_names.uniq)
           }
         }
         assign_attributes(values.first.to_h)
@@ -28,9 +32,14 @@ module ActiveRecordUpsert
           if attributes.is_a?(Array)
             attributes.collect { |hash| upsert(hash, &block) }
           else
-            new(attributes, &block).upsert
+            new(attributes, &block).upsert(attributes.keys)
           end
         end
+        def upsert_keys(*keys)
+          return @_upsert_keys if keys.empty?
+          keys = keys.first if keys.size == 1 # support single string/symbol, multiple string/symbols, and array
+          @_upsert_keys = Array(keys).map(&:to_s)
+        end
       end
     end
   end

data/lib/active_record_upsert/active_record/relation.rb

@@ -14,11 +14,13 @@ module ActiveRecordUpsert
         im.into arel_table
 
         substitutes, binds = substitute_values values
+        column_arr = self.klass.upsert_keys || [primary_key]
+        column_name = column_arr.join(',')
 
         cm = arel_table.create_on_conflict_do_update
-        cm.target = arel_table[primary_key]
+        cm.target = arel_table[column_name]
+        filter = ->(o) { [*column_arr, 'created_at'].include?(o.name) }
 
-        filter = ->(o) { [primary_key, 'created_at'].include?(o.name) }
         cm.set(substitutes.reject { |s| filter.call(s.first) })
         on_conflict_binds = binds.reject(&filter)
 
@@ -29,8 +31,8 @@ module ActiveRecordUpsert
         @klass.connection.upsert(
           im,
           'SQL',
-          primary_key,
-          primary_key_value,
+          primary_key,       # not used
+          primary_key_value, # not used
           nil,
           binds + on_conflict_binds)
       end

data/lib/active_record_upsert/active_record/timestamp.rb

@@ -5,7 +5,7 @@ module ActiveRecordUpsert
         if self.record_timestamps
           current_time = current_time_from_proper_timezone
 
-          all_timestamp_attributes.each do |column|
+          all_timestamp_attributes_in_model.each do |column|
             column = column.to_s
             if has_attribute?(column) && !attribute_present?(column)
               write_attribute(column, current_time)

data/lib/active_record_upsert/arel/visitors/to_sql.rb

@@ -13,7 +13,7 @@ module ActiveRecordUpsert
 
         def visit_Arel_Nodes_OnConflict o, collector
           collector << "ON CONFLICT "
-          collector << " (#{quote_column_name o.target.name}) "
+          collector << " (#{quote_column_name o.target.name}) ".gsub(',', '","')
           maybe_visit o.action, collector
         end
 

data/lib/active_record_upsert/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordUpsert
-  VERSION = "0.6.3"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_upsert
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.7.0
 platform: ruby
 authors:
 - Jesper Josefsson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-17 00:00:00.000000000 Z
+date: 2017-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -20,7 +20,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,21 +30,27 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
         version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -59,102 +65,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.13'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.5.3
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.1'
 description: 
 email:
 - jesper.josefsson@gmail.com
@@ -163,21 +73,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- Dockerfile
-- Gemfile
-- Gemfile.docker
 - README.md
 - Rakefile
 - active_record_upsert.gemspec
-- bin/console
-- bin/release
-- bin/run_docker_test.sh
-- bin/run_rails.sh
-- bin/setup
-- docker-compose.yml
 - lib/active_record_upsert.rb
 - lib/active_record_upsert/active_record.rb
 - lib/active_record_upsert/active_record/connection_adapters/abstract/database_statements.rb
@@ -218,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Real PostgreSQL 9.5+ upserts using ON CONFLICT for ActiveRecord

data/.gitignore

@@ -1,10 +0,0 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/spec/dummy/log/*.log

data/.rspec

@@ -1,3 +0,0 @@
---require spec_helper
---format documentation
---color

data/.travis.yml

@@ -1,16 +0,0 @@
-sudo: required
-dist: trusty
-language: ruby
-env:
-  - DATABASE_URL="postgresql://postgres@localhost/upsert_test"
-rvm:
-  - 2.3.1
-before_script:
-  - createdb --echo -U postgres upsert_test
-  - psql -U postgres upsert_test < spec/dummy/db/structure.sql
-
-before_install: gem install bundler -v 1.13.3
-
-addons:
-  postgresql: "9.5"
-

data/Dockerfile

@@ -1,18 +0,0 @@
-FROM quay.io/travisci/travis-ruby
-RUN apt-add-repository ppa:brightbox/ruby-ng
-RUN apt-get update
-RUN apt-get install ruby2.3 ruby2.3-dev
-RUN ruby --version
- 
-ENV BUNDLE_GEMFILE=/app/Gemfile.docker
-RUN gem install nokogiri
-RUN gem install bundler
-COPY Gemfile* *.gemspec /app/
-RUN mkdir -p /app/lib/active_record_upsert
-COPY lib/active_record_upsert/version.rb /app/lib/active_record_upsert/
-WORKDIR /app
-RUN bundle install
-COPY . /app
-CMD bin/run_docker_test.sh
-
-

data/Gemfile

@@ -1,5 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in active_record_upsert.gemspec
-gemspec
-

data/Gemfile.docker

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in active_record_upsert.gemspec
-gemspec

data/bin/console

@@ -1,18 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require 'active_record'
-require 'active_record/connection_adapters/postgresql_adapter'
-require "active_record_upsert"
-require File.join(__dir__, '../spec/setup')
-ActiveRecord::Base.logger = Logger.new(STDOUT)
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start

data/bin/release

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-set -e
-OUR_RUBY=2.3.1
-
-rvm $OUR_RUBY do bundle check
-rvm $OUR_RUBY do bundle exec rake release 
-

data/bin/run_docker_test.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-pushd spec/dummy
-RAILS_ENV=test rails db:migrate
-popd
-RAILS_ENV=test bundle exec rspec

data/bin/run_rails.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-pushd spec/dummy
-RAILS_ENV=test bundle exec rails $@
-popd

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/docker-compose.yml

@@ -1,14 +0,0 @@
-version: '2'
-services:
-  db:
-    image: postgres:9.5
-    ports:
-      - "5432:5432"
-  app:
-    environment:
-      - DATABASE_URL=postgresql://postgres@db/active_record_upsert_test
-    build: .
-    depends_on:
-      - db
-    links:
-      - db