upsert 2.2.0 → 2.9.10

data/lib/upsert/connection/Java_ComMysqlJdbc_JDBC4Connection.rb

@@ -17,9 +17,11 @@ class Upsert
 
       def bind_value(v)
         case v
-        when Time, DateTime
-          # mysql doesn't like it when you send timezone to a datetime
-          Upsert.utc_iso8601 v, false
+        when DateTime, Time
+          date = v.utc
+          java.time.LocalDateTime.of(date.year, date.month, date.day, date.hour, date.min, date.sec, date.nsec)
+        when Date
+          java.time.LocalDate.of(v.year, v.month, v.day)
         else
           super
         end

data/lib/upsert/connection/Java_OrgPostgresqlJdbc_PgConnection.rb

@@ -0,0 +1,33 @@
+require_relative "jdbc"
+require_relative "postgresql"
+
+class Upsert
+  class Connection
+    # @private
+    class Java_OrgPostgresqlJdbc_PgConnection < Connection
+      include Jdbc
+      include Postgresql
+
+      def quote_ident(k)
+        DOUBLE_QUOTE + k.to_s.gsub(DOUBLE_QUOTE, '""') + DOUBLE_QUOTE
+      end
+
+      def in_transaction?
+        # https://github.com/kares/activerecord-jdbc-adapter/commit/4d6e0e0c52d12b0166810dffc9f898141a23bee6
+        ![0, 4].include?(metal.get_transaction_state)
+      end
+
+      def bind_value(v)
+        case v
+        when DateTime, Time
+          date = v.utc
+          java.time.LocalDateTime.of(date.year, date.month, date.day, date.hour, date.min, date.sec, date.nsec)
+        when Date
+          java.time.LocalDate.of(v.year, v.month, v.day)
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/upsert/connection/PG_Connection.rb

@@ -1,3 +1,5 @@
+require_relative "postgresql"
+
 class Upsert
   class Connection
     # @private
@@ -7,6 +9,9 @@ class Upsert
       def execute(sql, params = nil)
         if params
           # Upsert.logger.debug { %{[upsert] #{sql} with #{params.inspect}} }
+          # The following will blow up if you pass a value that cannot be automatically type-casted,
+          #   such as passing a string to an integer field.  You'll get an error something along the
+          #   lines of: "invalid input syntax for <type>: <value>"
           metal.exec sql, convert_binary(params)
         else
           Upsert.logger.debug { %{[upsert] #{sql}} }

data/lib/upsert/connection/jdbc.rb

@@ -4,12 +4,14 @@ class Upsert
     module Jdbc
       # /Users/seamusabshere/.rvm/gems/jruby-head/gems/activerecord-jdbc-adapter-1.2.2.1/src/java/arjdbc/jdbc/RubyJdbcConnection.java
       GETTER = {
+        java.sql.Types::CHAR        => 'getString',
         java.sql.Types::VARCHAR     => 'getString',
         java.sql.Types::OTHER       => 'getString', # ?! i guess unicode text?
         java.sql.Types::BINARY      => 'getBlob',
         java.sql.Types::LONGVARCHAR => 'getString',
         java.sql.Types::BIGINT      => 'getLong',
         java.sql.Types::INTEGER     => 'getInt',
+        java.sql.Types::REAL        => "getLong",
         java.sql.Types::ARRAY       => ->(r, i){ r.getArray(i).array.to_ary }
       }
       java.sql.Types.constants.each do |type_name|
@@ -24,6 +26,7 @@ class Upsert
         'TrueClass'  => 'setBoolean',
         'FalseClass' => 'setBoolean',
         'Fixnum'     => 'setInt',
+        'Integer'    => 'setInt'
       )
 
       def binary(v)
@@ -44,13 +47,16 @@ class Upsert
             case v
             when Upsert::Binary
               statement.setBytes i+1, binary(v)
-            when BigDecimal
+            when Float, BigDecimal
               statement.setBigDecimal i+1, java.math.BigDecimal.new(v.to_s)
             when NilClass
               # http://stackoverflow.com/questions/4243513/why-does-preparedstatement-setnull-requires-sqltype
               statement.setObject i+1, nil
+            when java.time.LocalDateTime, java.time.Instant, java.time.LocalDate
+              statement.setObject i+1, v
             else
               setter = setters[v.class.name]
+              Upsert.logger.debug { "Setting [#{v.class}, #{v}] via #{setter}" }
               statement.send setter, i+1, v
             end
           end

data/lib/upsert/connection/postgresql.rb

@@ -8,9 +8,8 @@ class Upsert
           # 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.dup
-            vv.gsub! /\\/, '\&\&'
-            vv.gsub! /'/, "''"
-            vv.gsub! /"/, '\"'
+            vv.gsub!(/\\/, '\&\&')
+            vv.gsub!(/"/, '\"')
             %{"#{vv}"}
           end.join(',') + '}'
         when Hash

data/lib/upsert/merge_function.rb

@@ -11,7 +11,7 @@ class Upsert
       def unique_name(table_name, selector_keys, setter_keys)
         parts = [
           NAME_PREFIX,
-          table_name,
+          [*table_name].join("_").gsub(/[^\w_]+/, "_"),
           'SEL',
           selector_keys.join('_A_').gsub(" ","_"),
           'SET',
@@ -35,8 +35,9 @@ class Upsert
       @controller = controller
       @selector_keys = selector_keys
       @setter_keys = setter_keys
+      @assume_function_exists = assume_function_exists
       validate!
-      create! unless assume_function_exists
+      create! unless @assume_function_exists
     end
 
     def name

data/lib/upsert/merge_function/{Java_OrgPostgresqlJdbc4_Jdbc4Connection.rb → Java_OrgPostgresqlJdbc_PgConnection.rb}

@@ -3,7 +3,7 @@ require 'upsert/merge_function/postgresql'
 class Upsert
   class MergeFunction
     # @private
-    class Java_OrgPostgresqlJdbc4_Jdbc4Connection < MergeFunction
+    class Java_OrgPostgresqlJdbc_PgConnection < MergeFunction
       ERROR_CLASS = org.postgresql.util.PSQLException
       include Postgresql
 
@@ -18,7 +18,7 @@ class Upsert
 
       def unique_index_on_selector?
         return @unique_index_on_selector if defined?(@unique_index_on_selector)
-        @unique_index_on_selector = schema_query.any? do |row|
+        @unique_index_on_selector = unique_index_columns.any? do |row|
           row["index_columns"].sort == selector_keys.sort
         end
       end

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 = unique_index_columns.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/merge_function/postgresql.rb

@@ -66,7 +66,7 @@ class Upsert
 
         first_try = true
         begin
-          create! if connection.in_transaction? && !function_exists?
+          create! if !@assume_function_exists && (connection.in_transaction? && !function_exists?)
           execute_parameterized(sql, values.map { |v| connection.bind_value v })
         rescue self.class::ERROR_CLASS => pg_error
           if pg_error.message =~ /function #{name}.* does not exist/i
@@ -85,8 +85,7 @@ class Upsert
       end
 
       def function_exists?
-        # The ::int is a hack until jruby+jdbc is happy with bigints being returned
-        @function_exists ||= controller.connection.execute("SELECT count(*)::int AS cnt FROM pg_proc WHERE lower(proname) = lower('#{name}')").first["cnt"].to_i > 0
+        @function_exists ||= controller.connection.execute("SELECT count(*) AS cnt FROM pg_proc WHERE lower(proname) = lower('#{name}')").first["cnt"].to_i > 0
       end
 
       # strangely ? can't be used as a placeholder
@@ -107,34 +106,93 @@ class Upsert
       end
 
       def use_pg_native?
-        server_version >= 95 && unique_index_on_selector?
+        return @use_pg_native if defined?(@use_pg_native)
+
+        @use_pg_native = server_version >= 90500 && unique_index_on_selector?
+        Upsert.logger.warn "[upsert] WARNING: Not using native PG CONFLICT / UPDATE" unless @use_pg_native
+        @use_pg_native
       end
 
       def server_version
-        @server_version ||=
-          controller.connection.execute("SHOW server_version").first["server_version"].split('.')[0..1].join('').to_i
+        @server_version ||= Upsert::MergeFunction::Postgresql.extract_version(
+          controller.connection.execute("SHOW server_version").first["server_version"]
+        )
+      end
+
+      # Extracted from https://github.com/dr-itz/activerecord-jdbc-adapter/blob/master/lib/arjdbc/postgresql/adapter.rb
+      def self.extract_version(version_string)
+        # Use the same versioning format as jdbc-postgresql and libpq
+        # https://github.com/dr-itz/activerecord-jdbc-adapter/commit/fd79756374c62fa9d009995dd1914d780e6a3dbf
+        # https://github.com/postgres/postgres/blob/master/src/interfaces/libpq/fe-exec.c
+        if (match = version_string.match(/([\d\.]*\d).*?/))
+          version = match[1].split('.').map(&:to_i)
+          # PostgreSQL version representation does not have more than 4 digits
+          # From version 10 onwards, PG has changed its versioning policy to
+          # limit it to only 2 digits. i.e. in 10.x, 10 being the major
+          # version and x representing the patch release
+          # Refer to:
+          #   https://www.postgresql.org/support/versioning/
+          #   https://www.postgresql.org/docs/10/static/libpq-status.html -> PQserverVersion()
+          # for more info
+
+          if version.size >= 3
+            (version[0] * 100 + version[1]) * 100 + version[2]
+          elsif version.size == 2
+            if version[0] >= 10
+              version[0] * 100 * 100 + version[1]
+            else
+              (version[0] * 100 + version[1]) * 100
+            end
+          elsif version.size == 1
+            version[0] * 100 * 100
+          else
+            0
+          end
+        else
+          0
+        end
       end
 
-      def schema_query
+      def unique_index_columns
+        if table_name.is_a?(Array) && table_name.length > 1
+          schema_argument = '$2'
+          table_name_arguments = table_name
+        else
+          schema_argument = 'ANY(current_schemas(true)::text[])'
+          table_name_arguments = [*table_name]
+        end
+
+        table_name_arguments.reverse!
+
         execute_parameterized(
           %{
-            SELECT array_agg(column_name::text) AS index_columns FROM information_schema.constraint_column_usage
-              JOIN pg_catalog.pg_constraint ON constraint_name::text = conname::text
-              WHERE table_name = $1 AND conrelid = $1::regclass::oid AND contype = 'u'
-              GROUP BY table_catalog, table_name, constraint_name
+            SELECT
+            ARRAY(
+              SELECT pg_get_indexdef(pg_index.indexrelid, k + 1, TRUE)
+              FROM
+                generate_subscripts(pg_index.indkey, 1) AS k
+              ORDER BY k
+            ) AS index_columns
+              FROM pg_index
+              JOIN pg_class AS idx ON idx.oid = pg_index.indexrelid
+              JOIN pg_class AS tbl ON tbl.oid = pg_index.indrelid
+              JOIN pg_namespace ON pg_namespace.oid = idx.relnamespace
+            WHERE pg_index.indisunique IS TRUE AND pg_namespace.nspname = #{schema_argument} AND tbl.relname = $1
           },
-          [table_name]
+          table_name_arguments
         )
       end
 
       def pg_native(row)
         bind_setter_values = row.setter.values.map { |v| connection.bind_value v }
+        # TODO: Is this needed?
+        row_syntax = server_version >= 100 ? "ROW" : ""
 
         upsert_sql = %{
           INSERT INTO #{quoted_table_name} (#{quoted_setter_names.join(',')})
           VALUES (#{insert_bind_placeholders(row).join(', ')})
           ON CONFLICT(#{quoted_selector_names.join(', ')})
-          DO UPDATE SET (#{quoted_setter_names.join(', ')}) = (#{conflict_bind_placeholders(row).join(', ')})
+          DO UPDATE SET #{quoted_setter_names.zip(conflict_bind_placeholders(row)).map { |n, v| "#{n} = #{v}" }.join(', ')}
         }
 
         execute_parameterized(upsert_sql, bind_setter_values)
@@ -157,13 +215,17 @@ class Upsert
       def insert_bind_placeholders(row)
         if row.hstore_delete_keys.empty?
           @insert_bind_placeholders ||= setter_column_definitions.each_with_index.map do |column_definition, i|
-            "$#{i + 1}"
+            if column_definition.hstore?
+              "CAST($#{i + 1} AS hstore)"
+            else
+              "$#{i + 1}"
+            end
           end
         else
           setter_column_definitions.each_with_index.map do |column_definition, i|
             idx = i + 1
             if column_definition.hstore?
-              hstore_delete_function("$#{idx}", row, column_definition)
+              hstore_delete_function("CAST($#{idx} AS hstore)", row, column_definition)
             else
               "$#{idx}"
             end
@@ -176,8 +238,8 @@ class Upsert
           @conflict_bind_placeholders ||= setter_column_definitions.each_with_index.map do |column_definition, i|
             idx = i + 1
             if column_definition.hstore?
-              "CASE WHEN #{quoted_table_name}.#{column_definition.quoted_name} IS NULL THEN $#{idx} ELSE" \
-                + " (#{quoted_table_name}.#{column_definition.quoted_name} || $#{idx})" \
+              "CASE WHEN #{quoted_table_name}.#{column_definition.quoted_name} IS NULL THEN CAST($#{idx} AS hstore) ELSE" \
+                + " (#{quoted_table_name}.#{column_definition.quoted_name} || CAST($#{idx} AS hstore))" \
                 + " END"
             else
               "$#{idx}"
@@ -188,9 +250,9 @@ class Upsert
             idx = i + 1
             if column_definition.hstore?
               "CASE WHEN #{quoted_table_name}.#{column_definition.quoted_name} IS NULL THEN " \
-                + hstore_delete_function("$#{idx}", row, column_definition) \
+                + hstore_delete_function("CAST($#{idx} AS hstore)", row, column_definition) \
                 + " ELSE " \
-                + hstore_delete_function("(#{quoted_table_name}.#{column_definition.quoted_name} || $#{idx})", row, column_definition) \
+                + hstore_delete_function("(#{quoted_table_name}.#{column_definition.quoted_name} || CAST($#{idx} AS hstore))", row, column_definition) \
                 + " END"
             else
               "$#{idx}"

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.2.0'
+    VERSION = "2.9.10"
 end

data/spec/correctness_spec.rb

@@ -13,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)
@@ -100,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
@@ -107,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|
@@ -148,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|
@@ -165,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,10 +1,14 @@
 require 'spec_helper'
 require 'stringio'
+require 'upsert/merge_function/postgresql'
+
 describe Upsert do
   describe 'database functions' do
-    version = 'postgresql' == ENV['DB'] ? Pet.connection.select_value("SHOW server_version")[0..2].split('.').join('').to_i : 0
+    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 >= 95
+      skip "Not using DB functions" if 'postgresql' == ENV['DB'] && UNIQUE_CONSTRAINT && version >= 90500
     }
     it "does not re-use merge functions across connections" do
       begin

data/spec/hstore_spec.rb

@@ -3,6 +3,21 @@ require 'spec_helper'
 describe Upsert do
   describe 'hstore on pg' do
     require 'pg_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"
@@ -19,7 +34,7 @@ describe Upsert do
 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
 
@@ -30,7 +45,7 @@ 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 => nil)
@@ -39,29 +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.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)
@@ -76,42 +91,42 @@ 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 => {})
       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
 
@@ -122,111 +137,111 @@ EOS
 
       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.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.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.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.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