active_record_upsert 0.2.0-java → 0.3.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33fda4d6b0483e92f75a5fac3fa909e69402a2d8
-  data.tar.gz: 5883d2dfb77533208d1515f298a09fedde100678
+  metadata.gz: 3a0bcdf80e0a32511f128657a665774fe7cb13bb
+  data.tar.gz: 7ea7295702c5fbb5d69cecda17c6734fc7d20233
 SHA512:
-  metadata.gz: bd0a5a6f839557ff1f091e78ba0225905d488264026998da0bc374d213250207f4360a02bdcd1f06a7a67714ed03658b34cc7d6b7312794a288e701f20468653
-  data.tar.gz: 0b7950b7f37325a6be8a4681b4df1e3248b8e515c2373361467dbf51b72469bd3bc88b6295d95d90cb62bce6e4cfc1edeac0af4dcb2741e6bd5530a06f782378
+  metadata.gz: 86e4ea1f8d452bec401e7595275ce588bb78f2a7047cd617dc970a14c84feff8a68fe183fb2dcf13e6538fa83a5f2b914f9b5f4358cc16a659fb7bfa684f8115
+  data.tar.gz: 530ce0b3ad1a67a4f44527ed0f1db6daad600266d9684e082ccdf84d16d331d2f471aa066f14fc9e108537c4e27c1e08e98b0db51328f4c34d26b6c8399ac3eb

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
+  - jruby-9.0.5.0
   - 2.3.0
 before_install: gem install bundler -v 1.11.2

data/Gemfile

@@ -2,3 +2,10 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in active_record_upsert.gemspec
 gemspec
+
+gem 'activerecord-jdbc-adapter', github: 'jensnockert/activerecord-jdbc-adapter', branch: 'activerecord-50'
+
+gem 'activerecord-jdbcpostgresql-adapter',
+    github: 'jensnockert/activerecord-jdbc-adapter',
+    branch: 'activerecord-50',
+    platform: :jruby

data/README.md

@@ -2,6 +2,19 @@
 
 Real upsert for PostgreSQL 9.5+ and ActiveRecord. Uses ON CONFLICT DO UPDATE.
 
+## Main points
+
+- Does upsert on a single record using `ON CONFLICT DO UPDATE`
+- Updates timestamps as you would expect in ActiveRecord
+- For partial upserts, loads any existing data from the database
+
+## Prerequisites
+
+- PostgreSQL 9.5+
+- ActiveRecord ~> 5
+- For MRI: pg
+- For JRuby: You need to use a fork of `activerecord-jdbcpostgresql-adapter`
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -10,6 +23,20 @@ Add this line to your application's Gemfile:
 gem 'active_record_upsert'
 ```
 
+If you use JRuby, also add the following:
+
+```ruby
+gem 'activerecord-jdbc-adapter',
+    github: 'jensnockert/activerecord-jdbc-adapter',
+    branch: 'activerecord-50',
+    platform: :jruby
+
+gem 'activerecord-jdbcpostgresql-adapter',
+    github: 'jensnockert/activerecord-jdbc-adapter',
+    branch: 'activerecord-50',
+    platform: :jruby
+```
+
 And then execute:
 
     $ bundle
@@ -42,3 +69,9 @@ r.upsert
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/jesjos/active_record_upsert.
 
+## Contributors
+
+- Jesper Josefsson
+- Jens Nockert
+- Olle Jonsson
+- Simon Dahlbacka

data/active_record_upsert.gemspec

@@ -8,8 +8,9 @@ Gem::Specification.new do |spec|
   spec.version       = ActiveRecordUpsert::VERSION
   spec.authors       = ["Jesper Josefsson"]
   spec.email         = ["jesper.josefsson@gmail.com"]
+  spec.homepage      = "https://github.com/jesjos/active_record_upsert/"
 
-  spec.summary       = %q{Real PostgreSQL upserts using ON CONFLICT for ActiveRecord}
+  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.bindir        = "exe"
@@ -24,7 +25,7 @@ Gem::Specification.new do |spec|
     spec.add_runtime_dependency 'activerecord-jdbcpostgresql-adapter', '> 0'
   else
     spec.platform = Gem::Platform::RUBY
-    spec.add_runtime_dependency 'pg', '> 0'
+    spec.add_runtime_dependency 'pg', '~> 0.18'
   end
 
   spec.add_development_dependency "bundler", "~> 1.11"

data/lib/active_record_upsert/active_record.rb

@@ -3,3 +3,7 @@ require 'active_record/connection_adapters/postgresql_adapter'
 Dir.glob(File.join(__dir__, 'active_record/**/*.rb')) do |f|
   require f
 end
+
+module ActiveRecord
+  RecordSavedError = Class.new(ActiveRecordError)
+end

data/lib/active_record_upsert/active_record/persistence.rb

@@ -3,7 +3,8 @@ module ActiveRecordUpsert
     module PersistenceExtensions
 
       def upsert
-        raise ReadOnlyRecord, "#{self.class} is marked as readonly" if readonly?
+        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

data/lib/active_record_upsert/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordUpsert
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_upsert
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: java
 authors:
 - Jesper Josefsson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-02-20 00:00:00.000000000 Z
+date: 2016-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -158,7 +158,7 @@ files:
 - lib/active_record_upsert/arel/on_conflict_do_update_manager.rb
 - lib/active_record_upsert/arel/visitors/to_sql.rb
 - lib/active_record_upsert/version.rb
-homepage:
+homepage: https://github.com/jesjos/active_record_upsert/
 licenses: []
 metadata: {}
 post_install_message:
@@ -180,5 +180,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
-summary: Real PostgreSQL upserts using ON CONFLICT for ActiveRecord
+summary: Real PostgreSQL 9.5+ upserts using ON CONFLICT for ActiveRecord
 test_files: []