upsert 2.1.0 → 2.9.10

data/lib/upsert/merge_function/sqlite3.rb

@@ -2,6 +2,16 @@ class Upsert
   class MergeFunction
     # @private
     module Sqlite3
+      def self.included(klass)
+        klass.extend ClassMethods
+      end
+
+      module ClassMethods
+        def clear(*)
+          # not necessary
+        end
+      end
+
       attr_reader :quoted_setter_names
       attr_reader :quoted_update_names
       attr_reader :quoted_selector_names

data/lib/upsert/version.rb

@@ -1,3 +1,3 @@
 class Upsert
-  VERSION = '2.1.0'
+    VERSION = "2.9.10"
 end

data/spec/active_record_upsert_spec.rb

@@ -11,6 +11,16 @@ describe Upsert do
           Pet.upsert({:name => 'Jerry'}, :good => true)
         end
       end
+
+      it "doesn't fail inside a transaction" do
+        Upsert.clear_database_functions(Pet.connection)
+        expect {
+          Pet.transaction do
+            Pet.upsert({name: 'Simba'}, good: true)
+          end
+        }.to_not raise_error
+        expect(Pet.first.name).to eq('Simba')
+      end
     end
   end
 end

data/spec/correctness_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 describe Upsert do
   describe 'clever correctness' do
@@ -11,7 +13,8 @@ describe Upsert do
       u = Upsert.new($conn, :pets)
       selector = {:name => 'Jerry', :tag_number => 6}
       u.row(selector)
-      Pet.find_by_name('Jerry').tag_number.should == 5
+      p.reload.tag_number.should == 5
+      next
 
       # won't change anything because selector is wrong
       u = Upsert.new($conn, :pets)
@@ -78,6 +81,18 @@ describe Upsert do
       end
     end
 
+    it "works with utf-8 data" do
+      u = Upsert.new($conn, :pets)
+      records = [
+        {:name => '你好', :home_address => '人'},
+        {:name => 'Здравствуйте', :home_address => 'человек'},
+        {:name => '😀', :home_address => '😂'},
+      ]
+      assert_creates(Pet, records) do
+        records.each { |rec| u.row(rec) }
+      end
+    end
+
     it "tells you if you request a column that doesn't exist" do
       u = Upsert.new($conn, :pets)
       lambda { u.row(:gibberish => 'ba') }.should raise_error(/invalid col/i)
@@ -86,6 +101,15 @@ describe Upsert do
       lambda { u.row(:name => 'Jerry', :gibberish => 'ba', :gender => 'male') }.should raise_error(/invalid col/i)
     end
 
+    it "works with a long setter hash" do
+      Upsert.batch($conn, :alphabets) do |batch|
+        10_000.times do |time|
+          setter = Hash[("a".."z").map { |letter| ["the_letter_#{letter}".to_sym, rand(100)] }]
+          selector = Hash[("a".."z").map { |letter| ["the_letter_#{letter}".to_sym, rand(100)] }]
+          batch.row(setter, selector)
+        end
+      end
+    end
   end
 
   describe "is just as correct as other ways" do
@@ -93,8 +117,8 @@ describe Upsert do
       it "is as correct as than new/set/save" do
         assert_same_result lotsa_records do |records|
           records.each do |selector, setter|
-            if pet = Pet.where(selector).first
-              pet.update_attributes setter, :without_protection => true
+            if (pet = Pet.where(selector).first)
+              pet.update_attributes(setter)
             else
               pet = Pet.new
               selector.each do |k, v|
@@ -134,12 +158,15 @@ describe Upsert do
       # end
     end
 
-    if ENV['DB'] == 'mysql' && RUBY_VERSION >= '1.9'
+    if ENV['DB'] == 'mysql' || (UNIQUE_CONSTRAINT && ENV["DB"] == "postgresql")
       describe 'compared to activerecord-import' do
         it "is as correct as faking upserts with activerecord-import" do
           assert_same_result lotsa_records do |records|
             columns = nil
             all_values = []
+            # Reverse because we want to mimic an 'overwrite' of previous values
+            records = records.reverse.uniq { |s, _| s } if ENV['DB'] == "postgresql"
+
             records.each do |selector, setter|
               columns ||= (selector.keys + setter.keys).uniq
               all_values << columns.map do |k|
@@ -151,7 +178,9 @@ describe Upsert do
                 end
               end
             end
-            Pet.import columns, all_values, :timestamps => false, :on_duplicate_key_update => columns
+
+            conflict_update = ENV['DB'] == "postgresql" ? {conflict_target: records.first.first.keys, columns: columns} : columns
+            Pet.import columns, all_values, :timestamps => false, :on_duplicate_key_update => conflict_update
           end
         end
       end

data/spec/database_functions_spec.rb

@@ -1,7 +1,15 @@
 require 'spec_helper'
 require 'stringio'
+require 'upsert/merge_function/postgresql'
+
 describe Upsert do
   describe 'database functions' do
+    version = 'postgresql' == ENV['DB'] ? Upsert::MergeFunction::Postgresql.extract_version(
+      Pet.connection.select_value("SHOW server_version")
+    ) : 0
+    before(:each) {
+      skip "Not using DB functions" if 'postgresql' == ENV['DB'] && UNIQUE_CONSTRAINT && version >= 90500
+    }
     it "does not re-use merge functions across connections" do
       begin
         io = StringIO.new
@@ -15,7 +23,7 @@ describe Upsert do
         # clear, create (#2)
         Upsert.clear_database_functions($conn_factory.new_connection)
         Upsert.new($conn_factory.new_connection, :pets).row :name => 'hello'
-        
+
         io.rewind
         hits = io.read.split("\n").grep(/Creating or replacing/)
         hits.length.should == 2
@@ -23,13 +31,13 @@ describe Upsert do
         Upsert.logger = old_logger
       end
     end
-    
+
     it "does not re-use merge functions even when on the same connection" do
       begin
         io = StringIO.new
         old_logger = Upsert.logger
         Upsert.logger = Logger.new io, Logger::INFO
-        
+
         connection = $conn_factory.new_connection
 
         # clear, create (#1)
@@ -39,7 +47,7 @@ describe Upsert do
         # clear, create (#2)
         Upsert.clear_database_functions(connection)
         Upsert.new(connection, :pets).row :name => 'hello'
-        
+
         io.rewind
         hits = io.read.split("\n").grep(/Creating or replacing/)
         hits.length.should == 2
@@ -47,7 +55,7 @@ describe Upsert do
         Upsert.logger = old_logger
       end
     end
-    
+
     it "re-uses merge functions within batch" do
       begin
         io = StringIO.new
@@ -56,13 +64,13 @@ describe Upsert do
 
         # clear
         Upsert.clear_database_functions($conn_factory.new_connection)
-        
+
         # create
         Upsert.batch($conn_factory.new_connection, :pets) do |upsert|
           upsert.row :name => 'hello'
           upsert.row :name => 'world'
         end
-        
+
         io.rewind
         hits = io.read.split("\n").grep(/Creating or replacing/)
         hits.length.should == 1
@@ -79,7 +87,7 @@ describe Upsert do
 
         # clear
         Upsert.clear_database_functions($conn_factory.new_connection)
-        
+
         # tries, "went missing", creates
         Upsert.new($conn_factory.new_connection, :pets, :assume_function_exists => true).row :name => 'hello'
 
@@ -94,6 +102,5 @@ describe Upsert do
         Upsert.logger = old_logger
       end
     end
-
   end
 end if %w{ postgresql mysql }.include?(ENV['DB'])

data/spec/database_spec.rb

@@ -83,6 +83,13 @@ describe Upsert do
           upsert.row({:id => jerry.id}, :gender => :male)
         end
       end
+
+      it "works for column names with spaces in them" do
+        upsert = Upsert.new $conn, :people
+        assert_creates(Person, [{:"First Name" => 'Major', :"Last Name" => 'Major'}]) do
+          upsert.row({:"First Name" => 'Major'}, :"Last Name" => 'Major')
+        end
+      end
     end
     describe :batch do
       it "works for multiple rows (base case)" do

data/spec/hstore_spec.rb

@@ -3,7 +3,22 @@ require 'spec_helper'
 describe Upsert do
   describe 'hstore on pg' do
     require 'pg_hstore'
-    Pet.connection.execute 'CREATE EXTENSION HSTORE'
+
+    let(:deserializer) do
+      klass = PgHstore.dup
+      if RUBY_PLATFORM == "java"
+        # activerecord-jdbc-adapter has native support for hstore
+        klass.class_eval do
+          def self.parse(obj)
+            obj
+          end
+        end
+      end
+
+      klass
+    end
+
+    Pet.connection.execute 'CREATE EXTENSION IF NOT EXISTS HSTORE'
     Pet.connection.execute "ALTER TABLE pets ADD COLUMN crazy HSTORE"
     Pet.connection.execute "ALTER TABLE pets ADD COLUMN cool HSTORE"
 
@@ -11,27 +26,26 @@ describe Upsert do
       Pet.delete_all
     end
 
+    let(:upsert) { Upsert.new $conn, :pets }
+
     it "works for ugly text" do
-      upsert = Upsert.new $conn, :pets
       uggy = <<-EOS
 {"results":[{"locations":[],"providedLocation":{"location":"3001 STRATTON WAY, MADISON, WI 53719 UNITED STATES"}}],"options":{"ignoreLatLngInput":true,"maxResults":1,"thumbMaps":false},"info":{"copyright":{"text":"© 2012 MapQuest, Inc.","imageUrl":"http://api.mqcdn.com/res/mqlogo.gif","imageAltText":"© 2012 MapQuest, Inc."},"statuscode":0,"messages":[]}}
 EOS
       upsert.row({:name => 'Uggy'}, :crazy => {:uggy => uggy})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Uggy'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'uggy' => uggy }
     end
 
     it "just works" do
-      upsert = Upsert.new $conn, :pets
-
       upsert.row({:name => 'Bill'}, :crazy => nil)
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       row['crazy'].should == nil
 
       upsert.row({:name => 'Bill'}, :crazy => {:a => 1})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'a' => '1' }
 
       upsert.row({:name => 'Bill'}, :crazy => nil)
@@ -40,31 +54,29 @@ EOS
 
       upsert.row({:name => 'Bill'}, :crazy => {:a => 1})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'a' => '1' }
 
       upsert.row({:name => 'Bill'}, :crazy => {:whatdat => 'whodat'})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'a' => '1', 'whatdat' => 'whodat' }
 
       upsert.row({:name => 'Bill'}, :crazy => {:whatdat => "D'ONOFRIO"})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'a' => '1', 'whatdat' => "D'ONOFRIO" }
 
       upsert.row({:name => 'Bill'}, :crazy => {:a => 2})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'a' => '2', 'whatdat' => "D'ONOFRIO" }
     end
 
     it "can nullify entire hstore" do
-      upsert = Upsert.new $conn, :pets
-
       upsert.row({:name => 'Bill'}, :crazy => {:a => 1})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'a' => '1' }
 
       upsert.row({:name => 'Bill'}, :crazy => nil)
@@ -73,174 +85,163 @@ EOS
     end
 
     it "deletes keys that are nil" do
-      upsert = Upsert.new $conn, :pets
-
       upsert.row({:name => 'Bill'}, :crazy => nil)
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       row['crazy'].should == nil
 
       upsert.row({:name => 'Bill'}, :crazy => {:a => 1})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'a' => '1' }
 
       upsert.row({:name => 'Bill'}, :crazy => {})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'a' => '1' }
 
       upsert.row({:name => 'Bill'}, :crazy => {:a => nil})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == {}
 
       upsert.row({:name => 'Bill'}, :crazy => {:a => 1, :b => 5})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'a' => '1', 'b' => '5' }
 
       upsert.row({:name => 'Bill'}, :crazy => {})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'a' => '1', 'b' => '5' }
 
       upsert.row({:name => 'Bill'}, :crazy => {:a => nil})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'b' => '5' }
 
       upsert.row({:name => 'Bill'}, :crazy => {:a => 1, :b => 5})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'a' => '1', 'b' => '5' }
 
       upsert.row({:name => 'Bill'}, :crazy => {:a => nil, :b => nil, :c => 12})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'c' => '12' }
     end
 
     it "takes dangerous keys" do
-      upsert = Upsert.new $conn, :pets
-
       upsert.row({:name => 'Bill'}, :crazy => nil)
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       row['crazy'].should == nil
 
       upsert.row({:name => 'Bill'}, :crazy => {:'foo"bar' => 1})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'foo"bar' => '1' }
 
       upsert.row({:name => 'Bill'}, :crazy => {})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'foo"bar' => '1' }
 
       upsert.row({:name => 'Bill'}, :crazy => {:'foo"bar' => nil})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == {}
 
       upsert.row({:name => 'Bill'}, :crazy => {:'foo"bar' => 1, :b => 5})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'foo"bar' => '1', 'b' => '5' }
 
       upsert.row({:name => 'Bill'}, :crazy => {})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'foo"bar' => '1', 'b' => '5' }
 
       upsert.row({:name => 'Bill'}, :crazy => {:'foo"bar' => nil})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'b' => '5' }
 
       upsert.row({:name => 'Bill'}, :crazy => {:'foo"bar' => 1, :b => 5})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'foo"bar' => '1', 'b' => '5' }
 
       upsert.row({:name => 'Bill'}, :crazy => {:'foo"bar' => nil, :b => nil, :c => 12})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'c' => '12' }
     end
 
     it "handles multiple hstores" do
-      upsert = Upsert.new $conn, :pets
       upsert.row({:name => 'Bill'}, :crazy => {:a => 1, :b => 9}, :cool => {:c => 12, :d => 19})
       row = Pet.connection.select_one(%{SELECT crazy, cool FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'a' => '1', 'b' => '9' }
-      cool = PgHstore.parse row['cool']
+      cool = deserializer.parse row['cool']
       cool.should == { 'c' => '12', 'd' => '19' }
     end
 
     it "can deletes keys from multiple hstores at once" do
-      upsert = Upsert.new $conn, :pets
-
       upsert.row({:name => 'Bill'}, :crazy => {:a => 1}, :cool => {5 => 9})
       row = Pet.connection.select_one(%{SELECT crazy, cool FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'a' => '1' }
-      cool = PgHstore.parse row['cool']
+      cool = deserializer.parse row['cool']
       cool.should == { '5' => '9' }
 
       # NOOP
       upsert.row({:name => 'Bill'}, :crazy => {}, :cool => {})
       row = Pet.connection.select_one(%{SELECT crazy, cool FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'a' => '1' }
-      cool = PgHstore.parse row['cool']
+      cool = deserializer.parse row['cool']
       cool.should == { '5' => '9' }
 
       upsert.row({:name => 'Bill'}, :crazy => {:a => nil}, :cool => {13 => 17})
       row = Pet.connection.select_one(%{SELECT crazy, cool FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == {}
-      cool = PgHstore.parse row['cool']
+      cool = deserializer.parse row['cool']
       cool.should == { '5' => '9', '13' => '17' }
 
       upsert.row({:name => 'Bill'}, :crazy => {:a => 1, :b => 5})
       row = Pet.connection.select_one(%{SELECT crazy, cool FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'a' => '1', 'b' => '5' }
 
       upsert.row({:name => 'Bill'}, :crazy => {:b => nil}, :cool => {5 => nil})
       row = Pet.connection.select_one(%{SELECT crazy, cool FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == {'a' => '1'}
-      cool = PgHstore.parse row['cool']
+      cool = deserializer.parse row['cool']
       cool.should == {'13' => '17' }
     end
 
     it "deletes keys whether new or existing record" do
-      upsert = Upsert.new $conn, :pets
-
       upsert.row({:name => 'Bill'}, :crazy => {:z => 1, :x => nil})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'z' => '1' }
 
       upsert.row({:name => 'Bill'}, :crazy => {:a => 1})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'a' => '1', 'z' => '1' }
     end
 
     it "can turn off eager nullify" do
-      upsert = Upsert.new $conn, :pets
-
       upsert.row({:name => 'Bill'}, {:crazy => {:z => 1, :x => nil}}, :eager_nullify => false)
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'z' => '1', 'x' => nil }
 
       upsert.row({:name => 'Bill'}, :crazy => {:a => 1})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
-      crazy = PgHstore.parse row['crazy']
+      crazy = deserializer.parse row['crazy']
       crazy.should == { 'a' => '1', 'z' => '1', 'x' => nil}
     end