upsert 1.2.0 → 2.0.0

data/CHANGELOG

@@ -1,3 +1,10 @@
+2.0.0 / 2013-07-24
+
+* Breaking changes
+
+  * For Postgres Hstore, null keys are deliberately deleted - so there's no way to set "foo" => NULL - "foo" will just get deleted as a key
+  * Name merge functions "upsert1_2_0" instead of "upsert_"
+
 1.2.0 / 2013-04-04
 
 * Breaking changes

data/README.md

@@ -66,10 +66,17 @@ Pet.upsert({:name => 'Jerry'}, :breed => 'beagle')
 Pull requests for any of these would be greatly appreciated:
 
 1. Cache JDBC PreparedStatement objects.
-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.
+1. [@antage](https://github.com/antage)'s idea for "true" upserting: (from https://github.com/seamusabshere/upsert/issues/17)
+
+```ruby
+selector = { id: 15 }
+update_setter = { count: Upsert.sql('count + 1') }
+insert_setter = { count: 1 }
+upsert.row_with_two_setter(update_setter, insert_setter, selector)
+```
 
 ## Real-world usage
 

data/lib/upsert.rb

@@ -153,10 +153,11 @@ class Upsert
   UTC_TZ = '+00:00'
   NULL_WORD = 'NULL'
   METAL_CLASS_ALIAS = {
-    'PGConn'           => 'PG::Connection',
-    'org.sqlite.Conn'  => 'Java::OrgSqliteConn' # for some reason, org.sqlite.Conn doesn't have a ruby class name
+    'PGConn'                     => 'PG::Connection',
+    'org.sqlite.Conn'            => 'Java::OrgSqlite::Conn', # for some reason, org.sqlite.Conn doesn't have a ruby class name
+    'Sequel::Postgres::Adapter'  => 'PG::Connection',      # Only the Postgres adapter needs an alias
   }
-  CREATED_COL_REGEX = /\Acreated_(at|on)\Z/
+  CREATED_COL_REGEX = /\Acreated_(at|on)\z/
 
   # @return [Upsert::Connection]
   attr_reader :connection

data/lib/upsert/column_definition/sqlite3.rb

@@ -6,6 +6,9 @@ class Upsert
         def all(connection, table_name)
           # activerecord-3.2.13/lib/active_record/connection_adapters/sqlite_adapter.rb
           connection.execute("PRAGMA table_info(#{connection.quote_ident(table_name)})").map do |row|#, 'SCHEMA').to_hash
+            if connection.metal.respond_to?(:results_as_hash) and not connection.metal.results_as_hash
+              row = {'name' => row[1], 'type' => row[2], 'dflt_value' => row[4]}
+            end
             default = case row["dflt_value"]
             when /^null$/i
               nil

data/lib/upsert/connection/{Java_OrgSqliteConn.rb → Java_OrgSqlite_Conn.rb}

@@ -4,7 +4,7 @@ require 'upsert/connection/sqlite3'
 class Upsert
   class Connection
     # @private
-    class Java_OrgSqliteConn < Connection
+    class Java_OrgSqlite_Conn < Connection
       include Jdbc
       include Sqlite3
 

data/lib/upsert/connection/SQLite3_Database.rb

@@ -5,7 +5,7 @@ class Upsert
     # @private
     class SQLite3_Database < Connection
       include Sqlite3
-
+      
       def execute(sql, params = nil)
         if params
           Upsert.logger.debug { %{[upsert] #{sql} with #{params.inspect}} }

data/lib/upsert/connection/jdbc.rb

@@ -8,6 +8,7 @@ class Upsert
         java.sql.Types::OTHER       => 'getString', # ?! i guess unicode text?
         java.sql.Types::BINARY      => 'getBlob',
         java.sql.Types::LONGVARCHAR => 'getString',
+        java.sql.Types::INTEGER     => 'getInt',
       }
       java.sql.Types.constants.each do |type_name|
         i = java.sql.Types.const_get type_name
@@ -69,7 +70,11 @@ class Upsert
           row = {}
           column_name_and_getter.each do |i, cg|
             column_name, getter = cg
-            row[column_name] = raw_result.send(getter, i)
+            if getter == 'getNull'
+              row[column_name] = nil
+            else
+              row[column_name] = raw_result.send(getter, i)
+            end
           end
           result << row
         end

data/lib/upsert/connection/postgresql.rb

@@ -4,6 +4,15 @@ class Upsert
     module Postgresql
       def bind_value(v)
         case v
+        when Array
+          # pg array escaping lifted from https://github.com/tlconnor/activerecord-postgres-array/blob/master/lib/activerecord-postgres-array/array.rb
+          '{' + v.map do |vv|
+            vv = vv.to_s
+            vv.gsub! /\\/, '\&\&'
+            vv.gsub! /'/, "''"
+            vv.gsub! /"/, '\"'
+            %{"#{vv}"}
+          end.join(',') + '}'
         when Hash
           # you must require 'pg_hstore' from the 'pg-hstore' gem yourself
           ::PgHstore.dump v, true

data/lib/upsert/merge_function.rb

@@ -1,9 +1,11 @@
 require 'zlib'
+require 'upsert/version'
 
 class Upsert
   # @private
   class MergeFunction
     MAX_NAME_LENGTH = 62
+    NAME_PREFIX = "upsert#{Upsert::VERSION.gsub('.', '_')}"
 
     class << self
       def execute(controller, row)
@@ -13,7 +15,7 @@ class Upsert
 
       def unique_name(table_name, selector_keys, setter_keys)
         parts = [
-          'upsert',
+          NAME_PREFIX,
           table_name,
           'SEL',
           selector_keys.join('_A_'),

data/lib/upsert/merge_function/Java_OrgPostgresqlJdbc4_Jdbc4Connection.rb

@@ -8,10 +8,14 @@ class Upsert
 
       def execute(row)
         first_try = true
-        bind_selector_values = row.selector.values.map { |v| connection.bind_value v }
-        bind_setter_values = row.setter.values.map { |v| connection.bind_value v }
+        values = []
+        values += row.selector.values
+        values += row.setter.values
+        hstore_delete_handlers.each do |hstore_delete_handler|
+          values << row.hstore_delete_keys.fetch(hstore_delete_handler.name, [])
+        end
         begin
-          connection.execute sql, (bind_selector_values + bind_setter_values)
+          connection.execute sql, values.map { |v| connection.bind_value v }
         rescue org.postgresql.util.PSQLException => pg_error
           if pg_error.message =~ /function #{name}.* does not exist/i
             if first_try

data/lib/upsert/merge_function/{Java_OrgSqliteConn.rb → Java_OrgSqlite_Conn.rb}

@@ -3,7 +3,7 @@ require 'upsert/merge_function/sqlite3'
 class Upsert
   class MergeFunction
     # @private
-    class Java_OrgSqliteConn < MergeFunction
+    class Java_OrgSqlite_Conn < MergeFunction
       include Sqlite3
     end
   end

data/lib/upsert/merge_function/PG_Connection.rb

@@ -8,10 +8,14 @@ class Upsert
 
       def execute(row)
         first_try = true
-        bind_selector_values = row.selector.values.map { |v| connection.bind_value v }
-        bind_setter_values = row.setter.values.map { |v| connection.bind_value v }
+        values = []
+        values += row.selector.values
+        values += row.setter.values
+        hstore_delete_handlers.each do |hstore_delete_handler|
+          values << row.hstore_delete_keys.fetch(hstore_delete_handler.name, [])
+        end
         begin
-          connection.execute sql, (bind_selector_values + bind_setter_values)
+          connection.execute sql, values.map { |v| connection.bind_value v }
         rescue PG::Error => pg_error
           if pg_error.message =~ /function #{name}.* does not exist/i
             if first_try
@@ -33,7 +37,15 @@ class Upsert
       def sql
         @sql ||= begin
           bind_params = []
-          1.upto(selector_keys.length + setter_keys.length) { |i| bind_params << "$#{i}" }
+          i = 1
+          (selector_keys.length + setter_keys.length).times do
+            bind_params << "$#{i}"
+            i += 1
+          end
+          hstore_delete_handlers.length.times do
+            bind_params << "$#{i}::text[]"
+            i += 1
+          end
           %{SELECT #{name}(#{bind_params.join(', ')})}
         end
       end

data/lib/upsert/merge_function/mysql.rb

@@ -9,7 +9,7 @@ class Upsert
       module ClassMethods
         # http://stackoverflow.com/questions/733349/list-of-stored-procedures-functions-mysql-command-line
         def clear(connection)
-          connection.execute("SHOW PROCEDURE STATUS WHERE Db = DATABASE() AND Name LIKE 'upsert_%'").map do |row|
+          connection.execute("SHOW PROCEDURE STATUS WHERE Db = DATABASE() AND Name LIKE '#{MergeFunction::NAME_PREFIX}%'").map do |row|
             row['Name'] || row['ROUTINE_NAME']
           end.each do |name|
             connection.execute "DROP PROCEDURE IF EXISTS #{connection.quote_ident(name)}"

data/lib/upsert/merge_function/postgresql.rb

@@ -31,7 +31,7 @@ class Upsert
             $BODY$
               LANGUAGE plpgsql;
           })
-          connection.execute(%{SELECT proname FROM pg_proc WHERE proname LIKE 'upsert_%'}).each do |row|
+          connection.execute(%{SELECT proname FROM pg_proc WHERE proname LIKE '#{MergeFunction::NAME_PREFIX}%'}).each do |row|
             k = row['proname']
             next if k == 'upsert_delfunc'
             Upsert.logger.info %{[upsert] Dropping function #{k.inspect}}
@@ -42,21 +42,69 @@ class Upsert
 
       def sql
         @sql ||= begin
-          bind_params = Array.new(selector_keys.length + setter_keys.length, '?')
+          bind_params = Array.new(selector_keys.length + setter_keys.length, '?') + Array.new(hstore_delete_handlers.length, '?::text[]')
           %{SELECT #{name}(#{bind_params.join(', ')})}
         end
       end
 
+      class HstoreDeleteHandler
+        attr_reader :merge_function
+        attr_reader :column_definition
+        def initialize(merge_function, column_definition)
+          @merge_function = merge_function
+          @column_definition = column_definition
+        end
+        def name
+          column_definition.name
+        end
+        def to_arg
+          "#{quoted_name} text[]"
+        end
+        # use coalesce(foo, '{}':text[])
+        def to_setter
+          "#{column_definition.quoted_name} = DELETE(#{column_definition.quoted_name}, #{quoted_name})"
+        end
+        def to_pgsql
+          %{
+            IF array_length(#{quoted_name}, 1) > 0 THEN
+              UPDATE #{merge_function.quoted_table_name} SET #{to_setter}
+                WHERE #{merge_function.selector_column_definitions.map(&:to_selector).join(' AND ') };
+            END IF;
+          }.gsub(/\s+/, ' ')
+        end
+        private
+        def quoted_name
+          @quoted_name ||= merge_function.connection.quote_ident "_delete_#{column_definition.name}"
+        end
+      end
+
+      def hstore_delete_handlers
+        @hstore_delete_handlers ||= setter_column_definitions.select do |column_definition|
+          column_definition.hstore?
+        end.map do |column_definition|
+          HstoreDeleteHandler.new self, column_definition
+        end
+      end
+
+      def selector_column_definitions
+        column_definitions.select { |cd| selector_keys.include?(cd.name) }
+      end
+
+      def setter_column_definitions
+        column_definitions.select { |cd| setter_keys.include?(cd.name) }
+      end
+
+      def update_column_definitions
+        setter_column_definitions.select { |cd| cd.name !~ CREATED_COL_REGEX }
+      end
+
       # the "canonical example" from http://www.postgresql.org/docs/9.1/static/plpgsql-control-structures.html#PLPGSQL-UPSERT-EXAMPLE
       # differentiate between selector and setter
       def create!
         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) }
-        update_column_definitions = setter_column_definitions.select { |cd| cd.name !~ CREATED_COL_REGEX }
         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
+          CREATE OR REPLACE FUNCTION #{name}(#{(selector_column_definitions.map(&:to_selector_arg) + setter_column_definitions.map(&:to_setter_arg) + hstore_delete_handlers.map(&:to_arg)).join(', ')}) RETURNS VOID AS
           $$
           DECLARE
             first_try INTEGER := 1;
@@ -66,6 +114,7 @@ class Upsert
               UPDATE #{quoted_table_name} SET #{update_column_definitions.map(&:to_setter).join(', ')}
                 WHERE #{selector_column_definitions.map(&:to_selector).join(' AND ') };
               IF found THEN
+                #{hstore_delete_handlers.map(&:to_pgsql).join(' ')}
                 RETURN;
               END IF;
               -- not there, so try to insert the key
@@ -73,6 +122,7 @@ class Upsert
               -- we could get a unique-key failure
               BEGIN
                 INSERT INTO #{quoted_table_name}(#{setter_column_definitions.map(&:quoted_name).join(', ')}) VALUES (#{setter_column_definitions.map(&:to_setter_value).join(', ')});
+                #{hstore_delete_handlers.map(&:to_pgsql).join(' ')}
                 RETURN;
               EXCEPTION WHEN unique_violation THEN
                 -- seamusabshere 9/20/12 only retry once

data/lib/upsert/row.rb

@@ -14,7 +14,7 @@ class Upsert
 
     attr_reader :selector
     attr_reader :setter
-
+    attr_reader :hstore_delete_keys
 
     def initialize(raw_selector, raw_setter)
       @selector = raw_selector.inject({}) do |memo, (k, v)|
@@ -22,8 +22,17 @@ class Upsert
         memo
       end
 
+      @hstore_delete_keys = {}
       @setter = raw_setter.inject({}) do |memo, (k, v)|
-        memo[k.to_s] = v
+        k = k.to_s
+        if v.is_a?(::Hash)
+          v.each do |kk, vv|
+            if vv.nil?
+              (@hstore_delete_keys[k] ||= []) << kk
+            end
+          end
+        end
+        memo[k] = v
         memo
       end
 

data/lib/upsert/version.rb

@@ -1,3 +1,3 @@
 class Upsert
-  VERSION = "1.2.0"
+  VERSION = '2.0.0'
 end

data/spec/hstore_spec.rb

@@ -5,6 +5,11 @@ describe Upsert do
     require 'pg_hstore'
     Pet.connection.execute 'CREATE EXTENSION HSTORE'
     Pet.connection.execute "ALTER TABLE pets ADD COLUMN crazy HSTORE"
+    Pet.connection.execute "ALTER TABLE pets ADD COLUMN cool HSTORE"
+
+    before do
+      Pet.delete_all
+    end
 
     it "works for ugly text" do
       upsert = Upsert.new $conn, :pets
@@ -53,5 +58,177 @@ EOS
       crazy = PgHstore.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.should == { a: '1' }
+
+      upsert.row({name: 'Bill'}, crazy: nil)
+      row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
+      row['crazy'].should == nil
+    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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.should == { a: '1', b: '9' }
+      cool = PgHstore.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.should == { a: '1' }
+      cool = PgHstore.parse row['cool'], false
+      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.should == { a: '1' }
+      cool = PgHstore.parse row['cool'], false
+      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.should == {}
+      cool = PgHstore.parse row['cool'], false
+      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.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.should == {a: '1'}
+      cool = PgHstore.parse row['cool'], false
+      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'], false
+      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'], false
+      crazy.should == { 'a' => '1', 'z' => '1' }
+    end
+
   end
 end if ENV['DB'] == 'postgresql'

data/spec/logger_spec.rb

@@ -34,9 +34,9 @@ describe Upsert do
           when /sqlite/i
             log.should =~ /insert or ignore/i
           when /mysql/i
-            log.should =~ /call upsert_pets_SEL_name/i
+            log.should =~ /call #{Upsert::MergeFunction::NAME_PREFIX}_pets_SEL_name/i
           when /p.*g/i
-            log.should =~ /select upsert_pets_SEL_name/i
+            log.should =~ /select #{Upsert::MergeFunction::NAME_PREFIX}_pets_SEL_name/i
           else
             raise "not sure"
           end

data/spec/sequel_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+require 'sequel'
+
+describe Upsert do
+  describe "Plays nice with Sequel" do
+    config = ActiveRecord::Base.connection.instance_variable_get(:@config)
+    case
+      when 'postgresql' == config[:adapter]; config[:adapter] = 'postgres'
+      when 'sqlite3' == config[:adapter]; config[:adapter] = 'sqlite'
+    end
+
+    it "Doesn't explode on connection" do
+      expect { DB = Sequel.connect config }.to_not raise_error
+    end
+
+    it "Doesn't explode when using DB.pool.hold" do
+      DB.pool.hold do |conn|
+        expect {
+          upsert = Upsert.new(conn, :pets)
+          assert_creates(Pet, [{:name => 'Jerry', :gender => 'male'}]) do
+            upsert.row({:name => 'Jerry'}, {:gender => 'male'})
+          end
+        }.to_not raise_error
+      end
+    end
+
+    it "Doesn't explode when using DB.synchronize" do
+      DB.synchronize do |conn|
+        expect {
+          upsert = Upsert.new(conn, :pets)
+          assert_creates(Pet, [{:name => 'Jerry', :gender => 'male'}]) do
+            upsert.row({:name => 'Jerry'}, {:gender => 'male'})
+          end
+        }.to_not raise_error
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -25,7 +25,8 @@ class RawConnectionFactory
       CONFIG = "jdbc:postgresql://localhost/#{DATABASE}?user=#{CURRENT_USER}"
       require 'jdbc/postgres'
       # http://thesymanual.wordpress.com/2011/02/21/connecting-jruby-to-postgresql-with-jdbc-postgre-api/
-      java.sql.DriverManager.register_driver org.postgresql.Driver.new
+      Jdbc::Postgres.load_driver
+      # java.sql.DriverManager.register_driver org.postgresql.Driver.new
       def new_connection
         java.sql.DriverManager.get_connection CONFIG
       end
@@ -44,7 +45,8 @@ class RawConnectionFactory
     if RUBY_PLATFORM == 'java'
       CONFIG = "jdbc:mysql://127.0.0.1/#{DATABASE}?user=root&password=password"
       require 'jdbc/mysql'
-      java.sql.DriverManager.register_driver com.mysql.jdbc.Driver.new
+      Jdbc::MySQL.load_driver
+      # java.sql.DriverManager.register_driver com.mysql.jdbc.Driver.new
       def new_connection
         java.sql.DriverManager.get_connection CONFIG
       end
@@ -58,7 +60,11 @@ class RawConnectionFactory
     ActiveRecord::Base.establish_connection "#{RUBY_PLATFORM == 'java' ? 'mysql' : 'mysql2'}://root:password@127.0.0.1/#{DATABASE}"
 
   when 'sqlite3'
+    CONFIG = { :adapter => 'sqlite3', :database => 'file::memory:?cache=shared' }
     if RUBY_PLATFORM == 'java'
+      # CONFIG = 'jdbc:sqlite://test.sqlite3'
+      require 'jdbc/sqlite3'
+      Jdbc::SQLite3.load_driver
       def new_connection
         ActiveRecord::Base.connection.raw_connection.connection
       end
@@ -68,7 +74,10 @@ class RawConnectionFactory
         ActiveRecord::Base.connection.raw_connection
       end
     end
-    ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:'
+    ActiveRecord::Base.establish_connection CONFIG
+
+  when 'postgres'
+    raise "please use DB=postgresql NOT postgres"
 
   else
     raise "not supported"

data/upsert.gemspec

@@ -22,13 +22,14 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec-expectations'
   gem.add_development_dependency 'rspec-mocks'
 
-  gem.add_development_dependency 'activerecord'
+  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 'activerecord-import'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'pg-hstore', ">=1.1.3"
+  gem.add_development_dependency 'sequel'
 
   unless RUBY_VERSION >= '1.9'
     gem.add_development_dependency 'orderedhash'

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: upsert
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,20 +62,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: active_record_inline_schema
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pg-hstore
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -146,13 +166,31 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.3
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +198,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -167,6 +206,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,6 +214,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -181,6 +222,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -188,6 +230,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -195,6 +238,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -202,6 +246,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -209,6 +254,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -216,6 +262,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -245,7 +292,7 @@ files:
 - lib/upsert/connection.rb
 - lib/upsert/connection/Java_ComMysqlJdbc_JDBC4Connection.rb
 - lib/upsert/connection/Java_OrgPostgresqlJdbc4_Jdbc4Connection.rb
-- lib/upsert/connection/Java_OrgSqliteConn.rb
+- lib/upsert/connection/Java_OrgSqlite_Conn.rb
 - lib/upsert/connection/Mysql2_Client.rb
 - lib/upsert/connection/PG_Connection.rb
 - lib/upsert/connection/SQLite3_Database.rb
@@ -255,7 +302,7 @@ files:
 - lib/upsert/merge_function.rb
 - lib/upsert/merge_function/Java_ComMysqlJdbc_JDBC4Connection.rb
 - lib/upsert/merge_function/Java_OrgPostgresqlJdbc4_Jdbc4Connection.rb
-- lib/upsert/merge_function/Java_OrgSqliteConn.rb
+- lib/upsert/merge_function/Java_OrgSqlite_Conn.rb
 - lib/upsert/merge_function/Mysql2_Client.rb
 - lib/upsert/merge_function/PG_Connection.rb
 - lib/upsert/merge_function/SQLite3_Database.rb
@@ -277,6 +324,7 @@ files:
 - spec/multibyte_spec.rb
 - spec/precision_spec.rb
 - spec/reserved_words_spec.rb
+- spec/sequel_spec.rb
 - spec/spec_helper.rb
 - spec/speed_spec.rb
 - spec/threaded_spec.rb
@@ -285,26 +333,27 @@ files:
 - upsert.gemspec
 homepage: https://github.com/seamusabshere/upsert
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Make it easy to upsert on MySQL, PostgreSQL, and SQLite3. Transparently creates
   merge functions for MySQL and PostgreSQL; on SQLite3, uses INSERT OR IGNORE.
 test_files:
@@ -321,6 +370,7 @@ test_files:
 - spec/multibyte_spec.rb
 - spec/precision_spec.rb
 - spec/reserved_words_spec.rb
+- spec/sequel_spec.rb
 - spec/spec_helper.rb
 - spec/speed_spec.rb
 - spec/threaded_spec.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YTE3MDYwZTVkNjkyOWUwOTc4MmNjYTFmOWI4OGNhZjFkYjk5ZjE0YQ==
-  data.tar.gz: !binary |-
-    MzY5ZDAzZGViY2E5NzQ4NThjOTJiNTg3ZmQ1NTEyMjhmMjRjMjVlNw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MzZjZjlmYmI4Y2QxZWMxMDAwYTcwMjUwMDc1YTZhMzU3MTA0YTY4MWQzNWE4
-    OWMyZDBlOTVmZGNmNTQzZTQ5MzM4NjgxNTFkNzA0MTNhYzIyYWI0N2VmYTY2
-    MDA1YjQ4NjY3Mzg5NWVjMDQ0YmViMzA2NmM1NDZjNmIxNWM2MGM=
-  data.tar.gz: !binary |-
-    MDM2ZTY0YTRlYTVhMmExZGZmMTAyYTEzMjc5YTFmYWVjNjY2MDIxZTg2ODMw
-    YzQ2OWExNmNhNmRjZmQ2YTAxNjdjOTY3NWRhZDQwMjZjNzA2Mzg0NDY0NjBj
-    ZDUzMzhhZjQzNTY5YjE5YmU3NzI0OTkzMTNlZjdmZDg0YjQ4NDE=