upsert 0.3.0 → 0.3.1

data/CHANGELOG

@@ -1,3 +1,10 @@
+0.3.1 / 2012-06-21
+
+* Bug fixes
+
+  * On PostgreSQL, stop nullifying columns that weren't even involved in the upsert
+  * On SQLite, properly join WHERE conditions with ' AND ' instead of ','
+
 0.3.0 / 2012-06-21
 
 * Enhancements

data/README.md

@@ -33,7 +33,13 @@ For bulk upserts, you probably still want to use `Upsert.batch`.
     Pet.upsert({:name => 'Jerry'}, :breed => 'beagle')
     Pet.upsert({:name => 'Pierre'}, :breed => 'tabby')
 
-### The "fixed column set" gotcha
+### Gotchas
+
+#### Undefined behavior if you use this without properly defining UNIQUE indexes
+
+Make sure you're upserting against either primary key columns or columns with UNIQUE indexes or both.
+
+#### Columns are set based on the first row you pass
 
 Currently, the first row you pass in determines the columns that will be used. That's useful for mass importing of many rows with the same columns, but is surprising if you're trying to use a single `Upsert` object to add arbitrary data. For example, this won't work:
 
@@ -52,6 +58,7 @@ You would need to use a new `Upsert` object. On the other hand, this is totally
 Pull requests for any of these would be greatly appreciated:
 
 1. Fix SQLite tests.
+2. Provide `require 'upsert/debug'` that will make sure you are selecting on columns that have unique indexes
 2. If you think there's a fix for the "fixed column set" gotcha...
 3. Naming suggestions: should "document" be called "setters" or "attributes"?
 

data/lib/upsert/pg_connection.rb

@@ -4,11 +4,15 @@ class Upsert
   # @private
   module PG_Connection
 
+    attr_reader :columns
     attr_reader :merge_function
 
     def chunk
       return if buffer.empty?
       row = buffer.shift
+      unless @columns.is_a?(Array)
+        @columns = row.columns
+      end
       unless merge_function
         create_merge_function row
       end
@@ -48,7 +52,7 @@ class Upsert
     end
 
     def column_definitions
-      @column_definitions ||= ColumnDefinition.all(connection, table_name)
+      @column_definitions ||= ColumnDefinition.all(connection, table_name).select { |cd| columns.include?(cd.name) }
     end
     
     private

data/lib/upsert/row.rb

@@ -36,7 +36,7 @@ class Upsert
     end
 
     def where_sql
-      selector.map { |k, v| [k, v].join('=') }.join(',')
+      selector.map { |k, v| [k, v].join('=') }.join(' AND ')
     end
 
     def set_sql

data/lib/upsert/version.rb

@@ -1,3 +1,3 @@
 class Upsert
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/shared/correctness.rb

@@ -1,4 +1,6 @@
 shared_examples_for 'is just as correct as other ways' do
+  unless ENV['CORR'] == 'false'
+
   describe 'compared to native ActiveRecord' do
     it "is as correct as than new/set/save" do
       assert_same_result lotsa_records do |records|
@@ -66,4 +68,5 @@ shared_examples_for 'is just as correct as other ways' do
       end
     end
   end
-end
+  end
+end

data/test/shared/database.rb

@@ -13,6 +13,14 @@ shared_examples_for 'is a database with an upsert trick' do
         upsert.row({:name => 'Jerry', :gender => 'male'}, {:tag_number => 4})
       end
     end
+    it "doesn't nullify columns that are not included in the selector or document" do
+      assert_creates(Pet, [{:name => 'Jerry', :gender => 'male', :tag_number => 4}]) do
+        one = Upsert.new connection, :pets
+        one.row({:name => 'Jerry'}, {:gender => 'male'})
+        two = Upsert.new connection, :pets
+        two.row({:name => 'Jerry'}, {:tag_number => 4})
+      end
+    end
     it "works for a single row (not changing anything)" do
       upsert = Upsert.new connection, :pets
       assert_creates(Pet, [{:name => 'Jerry', :gender => 'male'}]) do

data/test/shared/reserved_words.rb

@@ -1,4 +1,5 @@
 shared_examples_for "doesn't blow up on reserved words" do
+  unless ENV['RES'] == 'false'
   # collect and uniq reserved words
   reserved_words = ['mysql_reserved.txt', 'pg_reserved.txt'].map do |basename|
     File.expand_path("../../misc/#{basename}", __FILE__)
@@ -40,4 +41,5 @@ shared_examples_for "doesn't blow up on reserved words" do
       end
     end
   end
+  end
 end

data/test/shared/speed.rb

@@ -1,4 +1,5 @@
 shared_examples_for 'can be speeded up with upserting' do
+  unless ENV['SPEED'] == 'false'
   describe 'compared to native ActiveRecord' do
     it "is faster than new/set/save" do
       assert_faster_than 'find + new/set/save', lotsa_records do |records|
@@ -67,4 +68,5 @@ shared_examples_for 'can be speeded up with upserting' do
       end
     end
   end
-end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upsert
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-21 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3