upsert 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfb6bea0fbe024f56a107ddb4db99ef247b5ebdb
-  data.tar.gz: 6a3f979f4b136debf07b327073b2e774fdd60322
+  metadata.gz: d0268cf71d5cdccb6336100af2ab5269affbec4c
+  data.tar.gz: 889d7278a2b046ab5848c76cec79a94d1dfa4ec6
 SHA512:
-  metadata.gz: 850b04b05fab5c9ec30b9c27253fe8b751beef9dbbc7718abdd6cfbe93d6054796361cde49543018dd3afaf1c59ffe0c8baca1f2874b58053a94726cbf444112
-  data.tar.gz: 49db75e385e5d9cb3960e9f8d8927e8fa0657932e8422fe5ee7f77bcaf77a8dfc5b844b28c8a061953a285590b0c6ed9a1e8f87afb6c7c3ab1ba0d8dbdb8e312
+  metadata.gz: 60420f2b09bf34a80277104589cb7ef3cf376548c2f65fcef2a3bed6b11559b50e42bb4cbdf358d850f305b962dc421f4cb873da0fb5ab4b14c6edc372ef498c
+  data.tar.gz: b4cbb08f7546fb13eb5eb784eb85c7ed3ecd93008f9cc0be31e05c17cc74ac160d5ea36bd0b7f39bd800982d35eff9bfeee00357b027d74142459fd99e7ed099

data/CHANGELOG

@@ -1,3 +1,10 @@
+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

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
@@ -59,9 +59,11 @@ Batch mode is tested to be about 80% faster on PostgreSQL, MySQL, and SQLite3 th
 
 ### Native Postgres upsert
 
-`INSERT ... ON CONFLICT DO UPDATE` is used when Postgres 9.5+ is detected and *unique indexes are in place.*
+`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 indexes, it will fall back to the classic Upsert gem user-defined function, which does not require indexes.
+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
 
@@ -173,7 +175,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;
@@ -181,7 +183,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;
@@ -191,7 +193,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

data/lib/upsert/merge_function/PG_Connection.rb

@@ -15,9 +15,9 @@ class Upsert
         return @unique_index_on_selector if defined?(@unique_index_on_selector)
 
         type_map = PG::TypeMapByColumn.new([PG::TextDecoder::Array.new])
-        schema_query.type_map = type_map
+        res = schema_query.tap { |r| r.type_map = type_map }
 
-        @unique_index_on_selector = schema_query.values.any? do |row|
+        @unique_index_on_selector = res.values.any? do |row|
           row.first.sort == selector_keys.sort
         end
       end

data/lib/upsert/version.rb

@@ -1,3 +1,3 @@
 class Upsert
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end

data/upsert.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |gem|
 
   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"
@@ -57,4 +56,10 @@ Gem::Specification.new do |gem|
       gem.add_development_dependency 'redcarpet', '~> 2.3.0'
     end
   end
+
+  if RUBY_VERSION <= '1.9.3'
+    gem.add_development_dependency 'faker', '1.6.3'
+  else
+    gem.add_development_dependency 'faker'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upsert
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 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: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -81,20 +81,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faker
-  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: yard
   requirement: !ruby/object:Gem::Requirement
@@ -249,6 +235,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faker
+  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'
 description: Make it easy to upsert on MySQL, PostgreSQL, and SQLite3. Transparently
   creates merge functions for MySQL and PostgreSQL; on SQLite3, uses INSERT OR IGNORE.
 email: