upsert 2.0.2 → 2.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmE1OGFkMDI2YWQ2NmY2YjBmYzdiOWUzNDhjN2ZjNzY5MGVkYmMxZg==
+    ZWU3NjI3M2VmZDY1YzVlNGMyMzA5NWI3ZTQyNjVkNzZkNjE4MWMwNA==
   data.tar.gz: !binary |-
-    NzNjZjVmODZiNWE2NzdlNzg3M2FkZDg0ZDNiNDkyMjU4NGY0MDkxNg==
+    MTIzNjU4OGIxMmYwNzliZGY1OWVkYTA5ZWUxNzk1ZDViMjg0Mzg1NQ==
 SHA512:
   metadata.gz: !binary |-
-    MWMzOTcwYmMxMzllMTMyZjY0Nzg3OTZmMTUyMmM4NDM4MTkxNTBjNmFiZDNk
-    NGZkYjg3MDVmYTMxM2Y5M2Q0MGYyY2I0NTZlNzAxNDkzYjk5NGJmM2E5ZmMx
-    ZWYzZmU3ODU1NTRiOWQyNzEyY2M1MzYyMDIzMTUxODE5MDQ2MDA=
+    ODFiNzk2M2MwMTQwNWFkYmQ1MDhkMmFlNTRkMzg5MDI2ZDNlZjAzNzhiY2Yx
+    MmE1NTVhMzYzZjBjYTQyZTkzY2U3Y2M5M2M4OTU0MjVkNGE1YWFlY2U2NTU0
+    ZWJiZjA1YjdiMzM2ZjdmNGU3NThkZTcxMzA4MjdiYzk0OTA3MDc=
   data.tar.gz: !binary |-
-    NjJiNjBiOGE3N2JjMzVjMTEyY2MwMTMwZTZhZmEzYTk2ZmNhMTVlOTdiMTAw
-    MjQxMTQ2ODU0ZGFlMWEzODBjOTVmMjAzMjlmZWI1ZjAwNmFkMTJhZjUzZTU0
-    OTEyZWQ3OWNlM2RiNWRmNjgxYmEzZWJlZTU5ZDdhYTg3ODU2Nzc=
+    MDlhYzkxZjg5NThiMDNkY2I5YTE2ODViNGQ2NzM5ZjU0OTk3ODdiMDMwOTNm
+    NTYwNTUxMTEyMjIwMTdmNGRlYzc4MDg5NWUzOGExYWI3ZDQ0OGUwNDg1Njlk
+    NGIxY2NkMzc2YjE5OWNlMmNkZmRhMjFlOGIxMmU5MmY1ZDZjN2U=

data/CHANGELOG

@@ -1,4 +1,16 @@
+2.0.3 / 2013-11-27
+
+* Bug fixes
+
+  * Add parentheses to equality expressions
+
+* Enhancements
+
+  * On Postgres, use (A = B OR (A IS NULL AND B IS NULL)) instead of A IS NOT DISTINCT FROM B because the latter does not use indexes
+  * pass :eager_nullify => false as the third argument to Upsert#row to disable clearing of null HStore keys
+
 2.0.2 / 2013-11-06
+
 * Bug fixes
 
   * Properly check for NULL equality when creating the UPSERT functions - thanks @pnomolos - https://github.com/seamusabshere/upsert/issues/25

data/lib/upsert.rb

@@ -212,8 +212,8 @@ class Upsert
   #   upsert = Upsert.new Pet.connection, Pet.table_name
   #   upsert.row({:name => 'Jerry'}, :breed => 'beagle')
   #   upsert.row({:name => 'Pierre'}, :breed => 'tabby')
-  def row(selector, setter = {})
-    merge_function_class.execute self, Row.new(selector, setter)
+  def row(selector, setter = {}, options = nil)
+    merge_function_class.execute self, Row.new(selector, setter, options)
     nil
   end
 

data/lib/upsert/column_definition.rb

@@ -40,11 +40,7 @@ class Upsert
     end
 
     def to_selector
-      if temporal?
-        "#{quoted_name} = CAST(#{quoted_selector_name} AS #{sql_type})"
-      else
-        equality(quoted_name, quoted_selector_name)
-      end
+      equality(quoted_name, to_selector_value)
     end
 
     def temporal?
@@ -52,7 +48,7 @@ class Upsert
     end
 
     def equality(left, right)
-      "#{left} = #{right}"
+      "(#{left} = #{right} OR (#{left} IS NULL AND #{right} IS NULL))"
     end
 
     def arg_type
@@ -71,5 +67,13 @@ class Upsert
       end
     end
 
+    def to_selector_value
+      if temporal?
+        "CAST(#{quoted_selector_name} AS #{sql_type})"
+      else
+        quoted_selector_name
+      end
+    end
+
   end
 end

data/lib/upsert/column_definition/postgresql.rb

@@ -20,9 +20,10 @@ EOS
         end
       end
       
-      def equality(left, right)
-        "#{left} IS NOT DISTINCT FROM #{right}"
-      end
+      # NOTE not using this because it can't be indexed
+      # def equality(left, right)
+      #   "#{left} IS NOT DISTINCT FROM #{right}"
+      # end
 
       HSTORE_DETECTOR = /hstore/i
 

data/lib/upsert/column_definition/sqlite3.rb

@@ -27,7 +27,7 @@ class Upsert
       end
       
       def equality(left, right)
-        "#{left} IS #{right} OR (#{left} IS NULL AND #{right} IS NULL)"
+        "(#{left} IS #{right} OR (#{left} IS NULL AND #{right} IS NULL))"
       end
     end
   end

data/lib/upsert/row.rb

@@ -16,7 +16,9 @@ class Upsert
     attr_reader :setter
     attr_reader :hstore_delete_keys
 
-    def initialize(raw_selector, raw_setter)
+    def initialize(raw_selector, raw_setter, options)
+      eager_nullify = (options.nil? || options.fetch(:eager_nullify, true))
+
       @selector = raw_selector.inject({}) do |memo, (k, v)|
         memo[k.to_s] = v
         memo
@@ -25,7 +27,7 @@ class Upsert
       @hstore_delete_keys = {}
       @setter = raw_setter.inject({}) do |memo, (k, v)|
         k = k.to_s
-        if v.is_a?(::Hash)
+        if v.is_a?(::Hash) and eager_nullify
           v.each do |kk, vv|
             if vv.nil?
               (@hstore_delete_keys[k] ||= []) << kk

data/lib/upsert/version.rb

@@ -1,3 +1,3 @@
 class Upsert
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

data/spec/correctness_spec.rb

@@ -50,20 +50,31 @@ describe Upsert do
     # https://github.com/seamusabshere/upsert/issues/18
     it "uses nil selectors" do
       Pet.count.should == 0
-      now = Time.now
+      now = Date.today
       u = Upsert.new($conn, :pets)
       5.times do
-        u.row({gender: nil, birthday: now})
+        u.row(gender: nil, birthday: now)
       end
+
+      Pet.count.should == 1
+    end
+
+    it "uses nil selectors on columns with date type" do
+      Pet.count.should == 0
+      u = Upsert.new($conn, :pets)
+      5.times do
+        u.row(birthday: nil)
+      end
+
       Pet.count.should == 1
     end
 
     it "uses nil selectors (another way of checking)" do
       u = Upsert.new($conn, :pets)
-      now = Time.now
+      now = Date.today
       assert_creates(Pet, [{:name => 'Jerry', :gender => nil, :spiel => 'beagle', :birthday => now}]) do
         u.row(name: "Jerry", gender: nil, spiel: "samoyed")
-        u.row({:name => 'Jerry', gender: nil}, :spiel => 'beagle', :birthday => Time.now)
+        u.row({:name => 'Jerry', gender: nil}, :spiel => 'beagle', :birthday => now)
       end
     end
 

data/spec/hstore_spec.rb

@@ -230,5 +230,19 @@ EOS
       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.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.should == { 'a' => '1', 'z' => '1', 'x' => nil}
+    end
+
   end
 end if ENV['DB'] == 'postgresql'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upsert
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
@@ -317,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Make it easy to upsert on MySQL, PostgreSQL, and SQLite3. Transparently creates