upsert 1.1.6 → 1.1.7

data/CHANGELOG

@@ -1,3 +1,10 @@
+1.1.7 / 2013-01-15
+
+* Enhancements
+
+  * :assume_function_exists option to avoid creating same merge function over and over
+  * Don't die on first occurrence of "tuple concurrently updated"
+
 1.1.6 / 2012-12-20
 
 * Bug fixes

data/README.md

@@ -64,7 +64,7 @@ Pet.upsert({:name => 'Jerry'}, :breed => 'beagle')
 Pull requests for any of these would be greatly appreciated:
 
 1. Cache JDBC PreparedStatement objects.
-1. Optional "assume-merge-function-exists" mode. Currently, the fact that a merge function has been created is memoized per-process.
+1. Allow "true" upserting like `upsert.row({name: 'Jerry'}, counter: Upsert.sql('counter+1'))`
 1. Sanity check my three benchmarks (four if you include activerecord-import on MySQL). Do they accurately represent optimized alternatives?
 1. Provide `require 'upsert/debug'` that will make sure you are selecting on columns that have unique indexes
 1. Test that `Upsert` instances accept arbitrary columns, even within a batch, which is what people probably expect.

data/lib/upsert.rb

@@ -67,8 +67,8 @@ class Upsert
     #     upsert.row({:name => 'Jerry'}, :breed => 'beagle')
     #     upsert.row({:name => 'Pierre'}, :breed => 'tabby')
     #   end
-    def batch(connection, table_name)
-      upsert = new connection, table_name
+    def batch(connection, table_name, options = {})
+      upsert = new connection, table_name, options
       yield upsert
     end
 
@@ -172,9 +172,16 @@ class Upsert
   # @private
   attr_reader :adapter
 
+  # @private
+  def assume_function_exists?
+    @assume_function_exists
+  end
+
   # @param [Mysql2::Client,Sqlite3::Database,PG::Connection,#metal] connection A supported database connection.
   # @param [String,Symbol] table_name The name of the table into which you will be upserting.
-  def initialize(connection, table_name)
+  # @param [Hash] options
+  # @option options [TrueClass,FalseClass] :assume_function_exists (false) Assume the function has already been defined correctly by another process.
+  def initialize(connection, table_name, options = {})
     @table_name = table_name.to_s
     metal = Upsert.metal connection
     @flavor = Upsert.flavor metal
@@ -185,6 +192,7 @@ class Upsert
     end
     @connection = Connection.const_get(adapter).new self, metal
     @merge_function_class = MergeFunction.const_get adapter
+    @assume_function_exists = options.fetch :assume_function_exists, false
   end
 
   # Upsert a row given a selector and a setter.

data/lib/upsert/merge_function.rb

@@ -34,7 +34,7 @@ class Upsert
         selector_keys = row.selector.keys
         setter_keys = row.setter.keys
         key = [controller.table_name, selector_keys, setter_keys]
-        @lookup[key] ||= new(controller, selector_keys, setter_keys)
+        @lookup[key] ||= new(controller, selector_keys, setter_keys, controller.assume_function_exists?)
       end
     end
 
@@ -42,11 +42,11 @@ class Upsert
     attr_reader :selector_keys
     attr_reader :setter_keys
 
-    def initialize(controller, selector_keys, setter_keys)
+    def initialize(controller, selector_keys, setter_keys, assume_function_exists)
       @controller = controller
       @selector_keys = selector_keys
       @setter_keys = setter_keys
-      create!
+      create! unless assume_function_exists
     end
 
     def name

data/lib/upsert/merge_function/postgresql.rb

@@ -53,6 +53,7 @@ class Upsert
         Upsert.logger.info "[upsert] Creating or replacing database function #{name.inspect} on table #{table_name.inspect} for selector #{selector_keys.map(&:inspect).join(', ')} and setter #{setter_keys.map(&:inspect).join(', ')}"
         selector_column_definitions = column_definitions.select { |cd| selector_keys.include?(cd.name) }
         setter_column_definitions = column_definitions.select { |cd| setter_keys.include?(cd.name) }
+        first_try = true
         connection.execute(%{
           CREATE OR REPLACE FUNCTION #{name}(#{(selector_column_definitions.map(&:to_selector_arg) + setter_column_definitions.map(&:to_setter_arg)).join(', ')}) RETURNS VOID AS
           $$
@@ -86,6 +87,13 @@ class Upsert
           $$
           LANGUAGE plpgsql;
         })
+      rescue
+        if first_try and $!.message =~ /tuple concurrently updated/
+          first_try = false
+          retry
+        else
+          raise $!
+        end
       end
     end
   end

data/lib/upsert/version.rb

@@ -1,3 +1,3 @@
 class Upsert
-  VERSION = "1.1.6"
+  VERSION = "1.1.7"
 end

data/spec/database_functions_spec.rb

@@ -2,6 +2,7 @@ require 'spec_helper'
 require 'stringio'
 describe Upsert do
   describe 'database functions' do
+
     it "re-uses merge functions across connections" do
       begin
         io = StringIO.new
@@ -30,5 +31,30 @@ describe Upsert do
         Upsert.logger = old_logger
       end
     end
+
+    it "assumes function exists if told to" do
+      begin
+        io = StringIO.new
+        old_logger = Upsert.logger
+        Upsert.logger = Logger.new io, Logger::INFO
+
+        # 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'
+
+        # just works
+        Upsert.new($conn_factory.new_connection, :pets, :assume_function_exists => true).row :name => 'hello'
+
+        io.rewind
+        lines = io.read.split("\n")
+        lines.grep(/went missing/).length.should == 1
+        lines.grep(/Creating or replacing/).length.should == 1
+      ensure
+        Upsert.logger = old_logger
+      end
+    end
+
   end
 end if %w{ postgresql mysql }.include?(ENV['DB'])

data/spec/hstore_spec.rb

@@ -1,10 +1,23 @@
+# -*- encoding: utf-8 -*-
 require 'spec_helper'
 describe Upsert do
   describe 'hstore on pg' do
+    require 'pg_hstore'
+    Pet.connection.execute 'CREATE EXTENSION HSTORE'
+    Pet.connection.execute "ALTER TABLE pets ADD COLUMN crazy HSTORE"
+
+    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.should == { uggy: uggy }
+    end
+
     it "just works" do
-      require 'pg_hstore'
-      Pet.connection.execute 'CREATE EXTENSION HSTORE'
-      Pet.connection.execute "ALTER TABLE pets ADD COLUMN crazy HSTORE"
       upsert = Upsert.new $conn, :pets
 
       upsert.row({name: 'Bill'}, crazy: nil)

data/upsert.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'activerecord-import'
   gem.add_development_dependency 'pry'
-  gem.add_development_dependency 'pg-hstore', ">=1.1.2"
+  gem.add_development_dependency 'pg-hstore', ">=1.1.3"
 
   unless RUBY_VERSION >= '1.9'
     gem.add_development_dependency 'orderedhash'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upsert
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement