upsert 0.4.0 → 0.5.0

data/lib/upsert/row.rb

@@ -1,68 +1,54 @@
+require 'upsert/row/mysql2_client'
+require 'upsert/row/pg_connection'
+require 'upsert/row/sqlite3_database'
+
 class Upsert
   # @private
   class Row
-    Cell = Struct.new(:quoted_key, :quoted_value)
+    if RUBY_VERSION >= '1.9'
+      OrderedHash = ::Hash
+    else
+      begin
+        require 'orderedhash'
+      rescue LoadError
+        raise LoadError, "[upsert] If you're using upsert on Ruby 1.8, you need to add 'orderedhash' to your Gemfile."
+      end
+      OrderedHash = ::OrderedHash
+    end
 
     attr_reader :selector
-    attr_reader :document
+    attr_reader :setter
+
+
+    def initialize(parent, raw_selector, raw_setter)
+      connection = parent.connection
+      cell_class = parent.cell_class
 
-    def initialize(parent, raw_selector, raw_document)
-      c = parent.connection
       @selector = raw_selector.inject({}) do |memo, (k, v)|
-        memo[k.to_s] = Cell.new(c.quote_ident(k), c.quote_value(v))
+        memo[k.to_s] = cell_class.new(connection, k, v)
         memo
       end
-      @document = raw_document.inject({}) do |memo, (k, v)|
-        memo[k.to_s] = Cell.new(c.quote_ident(k), c.quote_value(v))
+
+      @setter = raw_setter.inject({}) do |memo, (k, v)|
+        memo[k.to_s] = cell_class.new(connection, k, v)
         memo
       end
-    end
-
-    def columns
-      @columns ||= (selector.keys + document.keys).uniq
-    end
-
-    def values_sql_bytesize
-      @values_sql_bytesize ||= quoted_pairs.inject(0) { |sum, (_, v)| sum + v.to_s.bytesize } + columns.length - 1
-    end
 
-    def values_sql
-      quoted_pairs.map { |_, v| v }.join(',')
-    end
-
-    def columns_sql
-      quoted_pairs.map { |k, _| k }.join(',')
-    end
-
-    def where_sql
-      selector.map { |_, cell| [cell.quoted_key, cell.quoted_value].join('=') }.join(' AND ')
-    end
-
-    def set_sql
-      quoted_pairs.map { |k, v| [k, v].join('=') }.join(',')
-    end
-
-    def quoted_value(k)
-      if c = cell(k)
-        c.quoted_value
+      (selector.keys - setter.keys).each do |missing|
+        setter[missing] = selector[missing]
       end
-    end
 
-    def quoted_pairs
-      @quoted_pairs ||= columns.map do |k|
-        c = cell k
-        [ c.quoted_key, c.quoted_value ]
-      end
+      # there is probably a more clever way to incrementally sort these hashes
+      @selector = sort_hash selector
+      @setter = sort_hash setter
     end
 
     private
 
-    def cell(k)
-      if document.has_key?(k)
-        # prefer the document so that you can change rows
-        document[k]
-      else
-        selector[k]
+    def sort_hash(original)
+      original.keys.sort.inject(OrderedHash.new) do |memo, k|
+        memo[k] = original[k]
+        memo
       end
     end
   end

data/lib/upsert/row/mysql2_client.rb

@@ -0,0 +1,21 @@
+class Upsert
+  class Row
+    # @private
+    class Mysql2_Client < Row
+      attr_reader :original_setter_keys
+
+      def initialize(parent, raw_selector, raw_setter)
+        super
+        @original_setter_keys = raw_setter.keys.map(&:to_s)
+      end
+
+      def quoted_setter_values
+        @quoted_setter_values ||= setter.values.map(&:quoted_value)
+      end
+
+      def values_sql_bytesize
+        @values_sql_bytesize ||= quoted_setter_values.inject(0) { |sum, quoted_value| sum + quoted_value.to_s.bytesize } + setter.length - 1
+      end
+    end
+  end
+end

data/lib/upsert/row/pg_connection.rb

@@ -0,0 +1,7 @@
+class Upsert
+  class Row
+    # @private
+    class PG_Connection < Row
+    end
+  end
+end

data/lib/upsert/row/sqlite3_database.rb

@@ -0,0 +1,7 @@
+class Upsert
+  class Row
+    # @private
+    class SQLite3_Database < Row
+    end
+  end
+end

data/lib/upsert/version.rb

@@ -1,3 +1,3 @@
 class Upsert
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/spec/binary_spec.rb

@@ -13,7 +13,9 @@ describe Upsert do
         upsert = Upsert.new $conn, :pets
         assert_creates(Pet, [{:name => name, :zipped_biography => zipped_biography}]) do
           upsert.row({:name => name}, {:zipped_biography => Upsert.binary(zipped_biography)})
+          # binding.pry
         end
+
         Zlib::Inflate.inflate(Pet.find_by_name(name).zipped_biography).should == biography
       end
     end

data/spec/correctness_spec.rb

@@ -1,18 +1,51 @@
 require 'spec_helper'
 describe Upsert do
+  describe 'clever correctness' do
+    it "doesn't confuse selector and setter" do
+      p = Pet.new
+      p.name = 'Jerry'
+      p.tag_number = 5
+      p.save!
+
+      # won't change anything because selector is wrong
+      u = Upsert.new($conn, :pets)
+      selector = {:name => 'Jerry', :tag_number => 6}
+      u.row(selector)
+      Pet.find_by_name('Jerry').tag_number.should == 5
+
+      # won't change anything because selector is wrong
+      u = Upsert.new($conn, :pets)
+      selector = {:name => 'Jerry', :tag_number => 10}
+      setter = { :tag_number => 5 }
+      u.row(selector, setter)
+      Pet.find_by_name('Jerry').tag_number.should == 5
+
+      u = Upsert.new($conn, :pets)
+      selector = { :name => 'Jerry' }
+      setter = { :tag_number => 10 }
+      u.row(selector, setter)
+      Pet.find_by_name('Jerry').tag_number.should == 10
+
+      u = Upsert.new($conn, :pets)
+      selector = { :name => 'Jerry', :tag_number => 10 }
+      setter = { :tag_number => 20 }
+      u.row(selector, setter)
+      Pet.find_by_name('Jerry').tag_number.should == 20
+    end
+  end
   describe "is just as correct as other ways" do
     describe 'compared to native ActiveRecord' do
       it "is as correct as than new/set/save" do
         assert_same_result lotsa_records do |records|
-          records.each do |selector, document|
+          records.each do |selector, setter|
             if pet = Pet.where(selector).first
-              pet.update_attributes document, :without_protection => true
+              pet.update_attributes setter, :without_protection => true
             else
               pet = Pet.new
               selector.each do |k, v|
                 pet.send "#{k}=", v
               end
-              document.each do |k, v|
+              setter.each do |k, v|
                 pet.send "#{k}=", v
               end
               pet.save!
@@ -23,23 +56,23 @@ describe Upsert do
       it "is as correct as than find_or_create + update_attributes" do
         assert_same_result lotsa_records do |records|
           dynamic_method = nil
-          records.each do |selector, document|
+          records.each do |selector, setter|
             dynamic_method ||= "find_or_create_by_#{selector.keys.join('_or_')}"
             pet = Pet.send(dynamic_method, *selector.values)
-            pet.update_attributes document, :without_protection => true
+            pet.update_attributes setter, :without_protection => true
           end
         end
       end
       it "is as correct as than create + rescue/find/update" do
         assert_same_result lotsa_records do |records|
           dynamic_method = nil
-          records.each do |selector, document|
+          records.each do |selector, setter|
             dynamic_method ||= "find_or_create_by_#{selector.keys.join('_or_')}"
             begin
-              Pet.create selector.merge(document), :without_protection => true
+              Pet.create selector.merge(setter), :without_protection => true
             rescue
               pet = Pet.send(dynamic_method, *selector.values)
-              pet.update_attributes document, :without_protection => true
+              pet.update_attributes setter, :without_protection => true
             end
           end
         end
@@ -52,12 +85,12 @@ describe Upsert do
           assert_same_result lotsa_records do |records|
             columns = nil
             all_values = []
-            records.each do |selector, document|
-              columns ||= (selector.keys + document.keys).uniq
+            records.each do |selector, setter|
+              columns ||= (selector.keys + setter.keys).uniq
               all_values << columns.map do |k|
-                if document.has_key?(k)
-                  # prefer the document so that you can change rows
-                  document[k]
+                if setter.has_key?(k)
+                  # prefer the setter so that you can change rows
+                  setter[k]
                 else
                   selector[k]
                 end

data/spec/database_functions_spec.rb

@@ -10,13 +10,13 @@ describe Upsert do
           Upsert.logger = Logger.new io, Logger::INFO
 
           # clear
-          Upsert.new(PGconn.new(:dbname => 'upsert_test'), :pets).buffer.clear_database_functions
+          Upsert.clear_database_functions(PGconn.new(:dbname => 'upsert_test'))
           
           # create
           Upsert.new(PGconn.new(:dbname => 'upsert_test'), :pets).row :name => 'hello'
 
           # clear
-          Upsert.new(PGconn.new(:dbname => 'upsert_test'), :pets).buffer.clear_database_functions
+          Upsert.clear_database_functions(PGconn.new(:dbname => 'upsert_test'))
 
           # create (#2)
           Upsert.new(PGconn.new(:dbname => 'upsert_test'), :pets).row :name => 'hello'

data/spec/database_spec.rb

@@ -15,7 +15,7 @@ describe Upsert 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
+      it "doesn't nullify columns that are not included in the selector or setter" do
         assert_creates(Pet, [{:name => 'Jerry', :gender => 'male', :tag_number => 4}]) do
           one = Upsert.new $conn, :pets
           one.row({:name => 'Jerry'}, {:gender => 'male'})
@@ -45,7 +45,7 @@ describe Upsert do
           upsert.row({:name => 'Inky'}, {})
         end
       end
-      it "works for a single row with empty document" do
+      it "works for a single row with empty setter" do
         upsert = Upsert.new $conn, :pets
         assert_creates(Pet, [{:name => 'Inky', :gender => nil}]) do
           upsert.row(:name => 'Inky')

data/spec/logger_spec.rb

@@ -27,7 +27,7 @@ describe Upsert do
         u = Upsert.new(db, :cats)
         u.row :name => 'you'
         io.rewind
-        io.read.chomp.should =~ /INSERT OR IGNORE.*you/i
+        io.read.chomp.should =~ /INSERT OR IGNORE.*you/mi
       ensure
         Upsert.logger = old_logger
       end

data/spec/reserved_words_spec.rb

@@ -35,9 +35,9 @@ describe Upsert do
           upsert = Upsert.new $conn, nasty.table_name
           random = rand(1e3).to_s
           selector = { :fake_primary_key => random, words.first => words.first }
-          document = words[1..-1].inject({}) { |memo, word| memo[word] = word; memo }
-          assert_creates nasty, [selector.merge(document)] do
-            upsert.row selector, document
+          setter = words[1..-1].inject({}) { |memo, word| memo[word] = word; memo }
+          assert_creates nasty, [selector.merge(setter)] do
+            upsert.row selector, setter
           end
         end
       end

data/spec/spec_helper.rb

@@ -1,5 +1,8 @@
+# -*- encoding: utf-8 -*-
 require 'bundler/setup'
 
+require 'pry'
+
 require 'active_record'
 require 'active_record_inline_schema'
 require 'activerecord-import'
@@ -15,7 +18,7 @@ when 'postgresql'
 when 'mysql2'
   system %{ mysql -u root -ppassword -e "DROP DATABASE IF EXISTS upsert_test" }
   system %{ mysql -u root -ppassword -e "CREATE DATABASE upsert_test CHARSET utf8" }
-  ActiveRecord::Base.establish_connection 'mysql2://root:password@127.0.0.1/upsert_test'
+  ActiveRecord::Base.establish_connection "#{RUBY_PLATFORM == 'java' ? 'mysql' : 'mysql2'}://root:password@127.0.0.1/upsert_test"
   $conn = Mysql2::Client.new(:username => 'root', :password => 'password', :database => 'upsert_test')
 when 'sqlite3'
   ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:'
@@ -45,7 +48,6 @@ class Pet < ActiveRecord::Base
 end
 Pet.auto_upgrade!
 
-require 'securerandom'
 require 'zlib'
 require 'benchmark'
 require 'faker'
@@ -65,17 +67,18 @@ module SpecHelper
         else
           names.choice
         end
-        document = {
+        setter = {
           :lovability => BigDecimal.new(rand(1e11).to_s, 2),
           :tag_number => rand(1e8),
-          :spiel => SecureRandom.hex(rand(127)),
+          :spiel => Faker::Lorem.sentences.join,
           :good => true,
           :birthday => Time.at(rand * Time.now.to_i).to_date,
           :morning_walk_time => Time.at(rand * Time.now.to_i),
-          :home_address => SecureRandom.hex(rand(1000)),
-          :zipped_biography => Upsert.binary(Zlib::Deflate.deflate(SecureRandom.hex(rand(1000)), Zlib::BEST_SPEED))
+          :home_address => Faker::Lorem.sentences.join,
+          # hard to know how to have AR insert this properly unless Upsert::Binary subclasses String
+          # :zipped_biography => Upsert.binary(Zlib::Deflate.deflate(Faker::Lorem.paragraphs.join, Zlib::BEST_SPEED))
         }
-        memo << [selector, document]
+        memo << [selector, setter]
       end
       memo
     end
@@ -88,12 +91,15 @@ module SpecHelper
     Pet.delete_all
 
     Upsert.batch($conn, :pets) do |upsert|
-      records.each do |selector, document|
-        upsert.row(selector, document)
+      records.each do |selector, setter|
+        upsert.row(selector, setter)
       end
     end
     ref2 = Pet.order(:name).all.map { |pet| pet.attributes.except('id') }
-    ref2.should == ref1
+    ref2.each_with_index do |ref2a, i|
+      ref2a.to_yaml.should == ref1[i].to_yaml
+    end
+    # ref2.should == ref1
   end
 
   def assert_creates(model, expected_records)
@@ -120,8 +126,8 @@ module SpecHelper
 
     upsert_time = Benchmark.realtime do
       Upsert.batch($conn, :pets) do |upsert|
-        records.each do |selector, document|
-          upsert.row(selector, document)
+        records.each do |selector, setter|
+          upsert.row(selector, setter)
         end
       end
     end

data/spec/speed_spec.rb

@@ -4,15 +4,15 @@ describe Upsert do
     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|
-          records.each do |selector, document|
+          records.each do |selector, setter|
             if pet = Pet.where(selector).first
-              pet.update_attributes document, :without_protection => true
+              pet.update_attributes setter, :without_protection => true
             else
               pet = Pet.new
               selector.each do |k, v|
                 pet.send "#{k}=", v
               end
-              document.each do |k, v|
+              setter.each do |k, v|
                 pet.send "#{k}=", v
               end
               pet.save!
@@ -23,23 +23,23 @@ describe Upsert do
       it "is faster than find_or_create + update_attributes" do
         assert_faster_than 'find_or_create + update_attributes', lotsa_records do |records|
           dynamic_method = nil
-          records.each do |selector, document|
+          records.each do |selector, setter|
             dynamic_method ||= "find_or_create_by_#{selector.keys.join('_or_')}"
             pet = Pet.send(dynamic_method, *selector.values)
-            pet.update_attributes document, :without_protection => true
+            pet.update_attributes setter, :without_protection => true
           end
         end
       end
       it "is faster than create + rescue/find/update" do
         assert_faster_than 'create + rescue/find/update', lotsa_records do |records|
           dynamic_method = nil
-          records.each do |selector, document|
+          records.each do |selector, setter|
             dynamic_method ||= "find_or_create_by_#{selector.keys.join('_or_')}"
             begin
-              Pet.create selector.merge(document), :without_protection => true
+              Pet.create selector.merge(setter), :without_protection => true
             rescue
               pet = Pet.send(dynamic_method, *selector.values)
-              pet.update_attributes document, :without_protection => true
+              pet.update_attributes setter, :without_protection => true
             end
           end
         end
@@ -52,12 +52,12 @@ describe Upsert do
           assert_faster_than 'faking upserts with activerecord-import', lotsa_records do |records|
             columns = nil
             all_values = []
-            records.each do |selector, document|
-              columns ||= (selector.keys + document.keys).uniq
+            records.each do |selector, setter|
+              columns ||= (selector.keys + setter.keys).uniq
               all_values << columns.map do |k|
-                if document.has_key?(k)
-                  # prefer the document so that you can change rows
-                  document[k]
+                if setter.has_key?(k)
+                  # prefer the setter so that you can change rows
+                  setter[k]
                 else
                   selector[k]
                 end