upsert 1.1.1 → 1.1.3

data/CHANGELOG

@@ -1,3 +1,15 @@
+1.1.3 / 2012-12-06
+
+* Bug fix
+
+  * Don't die/fail trying to update an HStore column that has reverted to NULL.
+
+1.1.2 / 2012-12-06
+
+* Enhancements
+
+  * Support for PostgreSQL's HStore
+
 1.1.1 / 2012-12-03
 
 * Bug fixes

data/README.md

@@ -208,6 +208,14 @@ java.sql.DriverManager.register_driver org.postgresql.Driver.new
 connection = java.sql.DriverManager.get_connection "jdbc:postgresql://127.0.0.1/mydatabase?user=root&password=password"
 ```
 
+If you want to use HStore, make the `pg-hstore` gem available and pass a Hash in setters:
+
+```ruby
+gem 'pg-hstore'
+require 'hstore'
+upsert.row({:name => 'Bill'}, :mydata => {:a => 1, :b => 2})
+```
+
 #### Speed
 
 From the tests (updated 9/21/12):

data/lib/upsert/column_definition/postgresql.rb

@@ -19,6 +19,42 @@ EOS
           end
         end
       end
+
+      HSTORE_DETECTOR = /hstore/i
+
+      def initialize(*)
+        super
+        @hstore_query = !!(sql_type =~ HSTORE_DETECTOR)
+      end
+
+      def hstore?
+        @hstore_query
+      end
+
+      def arg_type
+        if hstore?
+          'text'
+        else
+          super
+        end
+      end
+
+      def to_setter_value
+        if hstore?
+          "#{quoted_setter_name}::hstore"
+        else
+          super
+        end
+      end
+
+      def to_setter
+        if hstore?
+          # http://stackoverflow.com/questions/9317971/adding-a-key-to-an-empty-hstore-column
+          "#{quoted_name} = COALESCE(#{quoted_name}, hstore(array[]::varchar[])) || #{to_setter_value}"
+        else
+          super
+        end
+      end
     end
   end
 end

data/lib/upsert/connection/Java_OrgPostgresqlJdbc4_Jdbc4Connection.rb

@@ -5,6 +5,7 @@ class Upsert
     # @private
     class Java_OrgPostgresqlJdbc4_Jdbc4Connection < Connection
       include Jdbc
+      include Postgresql
 
       def quote_ident(k)
         DOUBLE_QUOTE + k.to_s.gsub(DOUBLE_QUOTE, '""') + DOUBLE_QUOTE

data/lib/upsert/connection/PG_Connection.rb

@@ -2,6 +2,8 @@ class Upsert
   class Connection
     # @private
     class PG_Connection < Connection
+      include Postgresql
+      
       def execute(sql, params = nil)
         if params
           Upsert.logger.debug { %{[upsert] #{sql} with #{params.inspect}} }

data/lib/upsert/connection/postgresql.rb

@@ -0,0 +1,16 @@
+class Upsert
+  class Connection
+    # @private
+    module Postgresql
+      def bind_value(v)
+        case v
+        when Hash
+          # you must require 'hstore' from the 'pg-hstore' gem yourself
+          ::HStore.dump(v)[1...-1]
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/lib/upsert/version.rb

@@ -1,3 +1,3 @@
 class Upsert
-  VERSION = "1.1.1"
+  VERSION = "1.1.3"
 end

data/spec/hstore_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+describe Upsert do
+  describe 'hstore on pg' do
+    it "just works" do
+      require '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)
+      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 = HStore.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
+
+      upsert.row({name: 'Bill'}, crazy: {a: 1})
+      row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
+      crazy = HStore.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 = HStore.parse row['crazy']
+      crazy.should == { a: '1', whatdat: 'whodat' }
+
+      upsert.row({name: 'Bill'}, crazy: {a: 2})
+      row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
+      crazy = HStore.parse row['crazy']
+      crazy.should == { a: '2', whatdat: 'whodat' }
+    end
+  end
+end if ENV['DB'] == 'postgresql'

data/upsert.gemspec

@@ -28,6 +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'
 
   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.1
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -155,6 +155,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg-hstore
+  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
@@ -248,6 +264,7 @@ files:
 - lib/upsert/connection/PG_Connection.rb
 - lib/upsert/connection/SQLite3_Database.rb
 - lib/upsert/connection/jdbc.rb
+- lib/upsert/connection/postgresql.rb
 - lib/upsert/connection/sqlite3.rb
 - lib/upsert/merge_function.rb
 - lib/upsert/merge_function/Java_ComMysqlJdbc_JDBC4Connection.rb
@@ -266,6 +283,7 @@ files:
 - spec/correctness_spec.rb
 - spec/database_functions_spec.rb
 - spec/database_spec.rb
+- spec/hstore_spec.rb
 - spec/logger_spec.rb
 - spec/misc/get_postgres_reserved_words.rb
 - spec/misc/mysql_reserved.txt
@@ -310,6 +328,7 @@ test_files:
 - spec/correctness_spec.rb
 - spec/database_functions_spec.rb
 - spec/database_spec.rb
+- spec/hstore_spec.rb
 - spec/logger_spec.rb
 - spec/misc/get_postgres_reserved_words.rb
 - spec/misc/mysql_reserved.txt