upsert 1.0.2 → 1.1.0

data/lib/upsert/merge_function/sqlite3.rb

@@ -0,0 +1,30 @@
+class Upsert
+  class MergeFunction
+    # @private
+    module Sqlite3
+      attr_reader :quoted_setter_names
+      attr_reader :quoted_selector_names
+
+      def initialize(*)
+        super
+        @quoted_setter_names = setter_keys.map { |k| connection.quote_ident k }
+        @quoted_selector_names = selector_keys.map { |k| connection.quote_ident k }
+      end
+
+      def create!
+        # not necessary
+      end
+
+      def execute(row)
+        bind_setter_values = row.setter.values.map { |v| connection.bind_value v }
+        bind_selector_values = row.selector.values.map { |v| connection.bind_value v }
+        
+        insert_or_ignore_sql = %{INSERT OR IGNORE INTO #{quoted_table_name} (#{quoted_setter_names.join(',')}) VALUES (#{Array.new(bind_setter_values.length, '?').join(',')})}
+        connection.execute insert_or_ignore_sql, bind_setter_values
+
+        update_sql = %{UPDATE #{quoted_table_name} SET #{quoted_setter_names.map { |qk| "#{qk}=?" }.join(',')} WHERE #{quoted_selector_names.map { |qk| "#{qk}=?" }.join(' AND ')}}
+        connection.execute update_sql, (bind_setter_values + bind_selector_values)
+      end
+    end
+  end
+end

data/lib/upsert/row.rb

@@ -16,17 +16,14 @@ class Upsert
     attr_reader :setter
 
 
-    def initialize(controller, raw_selector, raw_setter)
-      connection = controller.connection
-      cell_class = controller.cell_class
-
+    def initialize(raw_selector, raw_setter)
       @selector = raw_selector.inject({}) do |memo, (k, v)|
-        memo[k.to_s] = cell_class.new(connection, k, v)
+        memo[k.to_s] = v
         memo
       end
 
       @setter = raw_setter.inject({}) do |memo, (k, v)|
-        memo[k.to_s] = cell_class.new(connection, k, v)
+        memo[k.to_s] = v
         memo
       end
 

data/lib/upsert/version.rb

@@ -1,3 +1,3 @@
 class Upsert
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end

data/spec/binary_spec.rb

@@ -13,9 +13,7 @@ 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

@@ -47,6 +47,7 @@ describe Upsert do
       Pet.find_by_name_and_gender('Jerry', 'blue').tag_number.should == 777
     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
@@ -67,33 +68,33 @@ describe Upsert do
           end
         end
       end
-      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, setter|
-            dynamic_method ||= "find_or_create_by_#{selector.keys.join('_or_')}"
-            pet = Pet.send(dynamic_method, *selector.values)
-            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, setter|
-            dynamic_method ||= "find_or_create_by_#{selector.keys.join('_or_')}"
-            begin
-              Pet.create selector.merge(setter), :without_protection => true
-            rescue
-              pet = Pet.send(dynamic_method, *selector.values)
-              pet.update_attributes setter, :without_protection => true
-            end
-          end
-        end
-      end
+      # 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, setter|
+      #       dynamic_method ||= "find_or_create_by_#{selector.keys.join('_or_')}"
+      #       pet = Pet.send(dynamic_method, *selector.values)
+      #       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, setter|
+      #       dynamic_method ||= "find_or_create_by_#{selector.keys.join('_or_')}"
+      #       begin
+      #         Pet.create selector.merge(setter), :without_protection => true
+      #       rescue
+      #         pet = Pet.send(dynamic_method, *selector.values)
+      #         pet.update_attributes setter, :without_protection => true
+      #       end
+      #     end
+      #   end
+      # end
     end
 
-    if ENV['ADAPTER'] == 'mysql2'
+    if ENV['DB'] == 'mysql'
       describe 'compared to activerecord-import' do
         it "is as correct as faking upserts with activerecord-import" do
           assert_same_result lotsa_records do |records|

data/spec/database_functions_spec.rb

@@ -1,14 +1,6 @@
 require 'spec_helper'
 require 'stringio'
 describe Upsert do
-  def fresh_connection
-    case ENV['ADAPTER']
-    when 'postgresql'
-      PGconn.new $conn_config
-    when 'mysql2'
-      Mysql2::Client.new $conn_config
-    end
-  end
   describe 'database functions' do
     it "re-uses merge functions across connections" do
       begin
@@ -17,19 +9,19 @@ describe Upsert do
         Upsert.logger = Logger.new io, Logger::INFO
 
         # clear
-        Upsert.clear_database_functions(fresh_connection)
+        Upsert.clear_database_functions($conn_factory.new_connection)
         
         # create
-        Upsert.new(fresh_connection, :pets).row :name => 'hello'
+        Upsert.new($conn_factory.new_connection, :pets).row :name => 'hello'
 
         # clear
-        Upsert.clear_database_functions(fresh_connection)
+        Upsert.clear_database_functions($conn_factory.new_connection)
 
         # create (#2)
-        Upsert.new(fresh_connection, :pets).row :name => 'hello'
+        Upsert.new($conn_factory.new_connection, :pets).row :name => 'hello'
 
         # no create!
-        Upsert.new(fresh_connection, :pets).row :name => 'hello'
+        Upsert.new($conn_factory.new_connection, :pets).row :name => 'hello'
         
         io.rewind
         hits = io.read.split("\n").grep(/Creating or replacing/)
@@ -39,4 +31,4 @@ describe Upsert do
       end
     end
   end
-end if %w{ postgresql mysql2 }.include?(ENV['ADAPTER'])
+end if %w{ postgresql mysql }.include?(ENV['DB'])

data/spec/logger_spec.rb

@@ -7,7 +7,9 @@ describe Upsert do
         io = StringIO.new
         Thread.exclusive do
           Upsert.logger = Logger.new(io)
+
           Upsert.logger.warn "hello"
+
           io.rewind
           io.read.chomp.should == 'hello'
         end
@@ -17,21 +19,31 @@ describe Upsert do
     end
 
     it "logs queries" do
-      require 'sqlite3'
-      db = SQLite3::Database.open(':memory:')
-      db.execute_batch "CREATE TABLE cats (name CHARACTER VARYING(255))"
       begin
-        io = StringIO.new
         old_logger = Upsert.logger
-        Upsert.logger = Logger.new io, Logger::DEBUG
-        u = Upsert.new(db, :cats)
-        u.row :name => 'you'
-        io.rewind
-        io.read.chomp.should =~ /INSERT OR IGNORE.*you/mi
+        io = StringIO.new
+        Thread.exclusive do
+          Upsert.logger = Logger.new(io)
+          
+          u = Upsert.new($conn, :pets)
+          u.row(name: 'Jerry')
+
+          io.rewind
+          log = io.read.chomp
+          case u.connection.class.name
+          when /sqlite/i
+            log.should =~ /insert or ignore/i
+          when /mysql/i
+            log.should =~ /call upsert_pets_SEL_name/i
+          when /p.*g/i
+            log.should =~ /select upsert_pets_SEL_name/i
+          else
+            raise "not sure"
+          end
+        end
       ensure
         Upsert.logger = old_logger
       end
     end
-
   end
 end

data/spec/precision_spec.rb

@@ -5,7 +5,7 @@ describe Upsert do
       small = -0.00000000634943
       upsert = Upsert.new $conn, :pets
       upsert.row({:name => 'NotJerry'}, :lovability => small)
-      Pet.first.lovability.should == small
+      Pet.first.lovability.should be_within(1e-11).of(small) # ?
     end
   end
 end

data/spec/spec_helper.rb

@@ -4,33 +4,83 @@ require 'bundler/setup'
 require 'pry'
 
 require 'active_record'
+ActiveRecord::Base.default_timezone = :utc
+
 require 'active_record_inline_schema'
 require 'activerecord-import'
 
-ENV['ADAPTER'] ||= 'mysql2'
-
-case ENV['ADAPTER']
-when 'postgresql'
-  system %{ dropdb upsert_test }
-  system %{ createdb upsert_test }
-  ActiveRecord::Base.establish_connection :adapter => 'postgresql', :database => 'upsert_test'
-  $conn_config = { :dbname => 'upsert_test' }
-  $conn = PGconn.new $conn_config
-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 "#{RUBY_PLATFORM == 'java' ? 'mysql' : 'mysql2'}://root:password@127.0.0.1/upsert_test"
-  $conn_config = { :username => 'root', :password => 'password', :database => 'upsert_test'}
-  $conn = Mysql2::Client.new $conn_config
-when 'sqlite3'
-  ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:'
-  $conn = ActiveRecord::Base.connection.raw_connection
-  $conn_config = :use_active_record_raw_connection_yo
-else
-  raise "not supported"
+ENV['DB'] ||= 'mysql'
+
+class RawConnectionFactory
+  DATABASE = 'upsert_test'
+  CURRENT_USER = `whoami`.chomp
+  PASSWORD = 'password'
+
+  case ENV['DB']
+
+  when 'postgresql'
+    Kernel.system %{ dropdb upsert_test }
+    Kernel.system %{ createdb upsert_test }
+    if RUBY_PLATFORM == 'java'
+      CONFIG = "jdbc:postgresql://localhost/#{DATABASE}?user=#{CURRENT_USER}"
+      require 'jdbc/postgres'
+      # http://thesymanual.wordpress.com/2011/02/21/connecting-jruby-to-postgresql-with-jdbc-postgre-api/
+      java.sql.DriverManager.register_driver org.postgresql.Driver.new
+      def new_connection
+        java.sql.DriverManager.get_connection CONFIG
+      end
+    else
+      CONFIG = { :dbname => DATABASE }
+      require 'pg'
+      def new_connection
+        PG::Connection.new CONFIG
+      end
+    end
+    ActiveRecord::Base.establish_connection :adapter => 'postgresql', :database => DATABASE, :username => CURRENT_USER
+
+  when 'mysql'
+    Kernel.system %{ mysql -u root -ppassword -e "DROP DATABASE IF EXISTS #{DATABASE}" }
+    Kernel.system %{ mysql -u root -ppassword -e "CREATE DATABASE #{DATABASE} CHARSET utf8" }
+    if RUBY_PLATFORM == 'java'
+      CONFIG = "jdbc:mysql://127.0.0.1/#{DATABASE}?user=root&password=password"
+      require 'jdbc/mysql'
+      java.sql.DriverManager.register_driver com.mysql.jdbc.Driver.new
+      def new_connection
+        java.sql.DriverManager.get_connection CONFIG
+      end
+    else
+      CONFIG = { :username => 'root', :password => PASSWORD, :database => DATABASE}
+      require 'mysql2'
+      def new_connection
+        Mysql2::Client.new CONFIG
+      end
+    end
+    ActiveRecord::Base.establish_connection "#{RUBY_PLATFORM == 'java' ? 'mysql' : 'mysql2'}://root:password@127.0.0.1/#{DATABASE}"
+
+  when 'sqlite3'
+    if RUBY_PLATFORM == 'java'
+      def new_connection
+        ActiveRecord::Base.connection.raw_connection.connection
+      end
+    else
+      require 'sqlite3'
+      def new_connection
+        ActiveRecord::Base.connection.raw_connection
+      end
+    end
+    ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:'
+
+  else
+    raise "not supported"
+  end
 end
 
+$conn_factory = RawConnectionFactory.new
+$conn = $conn_factory.new_connection
+
 require 'logger'
+require 'fileutils'
+FileUtils.rm_f 'test.log'
 ActiveRecord::Base.logger = Logger.new('test.log')
 
 if ENV['VERBOSE'] == 'true'
@@ -59,6 +109,17 @@ require 'benchmark'
 require 'faker'
 
 module SpecHelper
+  def random_time_or_datetime
+    time = Time.at(rand * Time.now.to_i)
+    if ENV['DB'] == 'mysql'
+      time = time.change(:usec => 0)
+    end
+    if rand > 0.5
+      time = time.change(:usec => 0).to_datetime
+    end
+    time
+  end
+
   def lotsa_records
     @records ||= begin
       memo = []
@@ -69,7 +130,7 @@ module SpecHelper
       2000.times do
         selector = ActiveSupport::OrderedHash.new
         selector[:name] = if RUBY_VERSION >= '1.9'
-          names.sample(1).first
+          names.sample
         else
           names.choice
         end
@@ -79,7 +140,7 @@ module SpecHelper
           :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),
+          :morning_walk_time => random_time_or_datetime,
           :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))
@@ -102,19 +163,42 @@ module SpecHelper
       end
     end
     ref2 = Pet.order(:name).all.map { |pet| pet.attributes.except('id') }
-    ref2.each_with_index do |ref2a, i|
-      ref2a.to_yaml.should == ref1[i].to_yaml
-    end
-    # ref2.should == ref1
+    compare_attribute_sets ref1, ref2
   end
 
   def assert_creates(model, expected_records)
-    expected_records.each do |conditions|
-      model.where(conditions).count.should == 0
+    expected_records.each do |selector, setter|
+      # should i use setter in where?
+      model.where(selector).count.should == 0
     end
     yield
-    expected_records.each do |conditions|
-      model.where(conditions).count.should == 1
+    expected_records.each do |selector, setter|
+      setter ||= {}
+      found = model.where(selector).map { |record| record.attributes.except('id') }
+      expected = [ selector.stringify_keys.merge(setter.stringify_keys) ]
+      compare_attribute_sets expected, found
+    end
+  end
+
+  def compare_attribute_sets(expected, found)
+    e = expected.map { |attrs| simplify_attributes attrs }
+    f = found.map { |attrs| simplify_attributes attrs }
+    f.each_with_index do |fa, i|
+      fa.should == e[i]
+    end
+  end
+
+  def simplify_attributes(attrs)
+    attrs.select do |k, v|
+      v.present?
+    end.inject({}) do |memo, (k, v)|
+      memo[k] = case v
+      when Time, DateTime
+        v.to_time.to_f
+      else
+        v
+      end
+      memo
     end
   end
 

data/spec/speed_spec.rb

@@ -46,7 +46,7 @@ describe Upsert do
       end
     end
   
-    if ENV['ADAPTER'] == 'mysql2'
+    if ENV['DB'] == 'mysql'
       describe 'compared to activerecord-import' do
         it "is faster than faking upserts with activerecord-import" do
           assert_faster_than 'faking upserts with activerecord-import', lotsa_records do |records|

data/spec/timezones_spec.rb

@@ -1,28 +1,49 @@
 require 'spec_helper'
 describe Upsert do
-  describe "doesn't mess with timezones" do
-    before do
-      @old_default_tz = ActiveRecord::Base.default_timezone
+  describe "timezone support" do
+    it "takes times in UTC" do
+      time = Time.new.utc
+      if ENV['DB'] == 'mysql'
+        time = time.change(:usec => 0)
+      end
+      upsert = Upsert.new $conn, :pets
+      assert_creates(Pet, [[{:name => 'Jerry'}, {:morning_walk_time => time}]]) do
+        upsert.row({:name => 'Jerry'}, {:morning_walk_time => time})
+      end
     end
-    after do
-      ActiveRecord::Base.default_timezone = @old_default_tz
+
+    it "takes times in local" do
+      time = Time.new
+      if ENV['DB'] == 'mysql'
+        time = time.change(:usec => 0)
+      end
+      upsert = Upsert.new $conn, :pets
+      assert_creates(Pet, [[{:name => 'Jerry'}, {:morning_walk_time => time}]]) do
+        upsert.row({:name => 'Jerry'}, {:morning_walk_time => time})
+      end
     end
-  
-    it "deals fine with UTC" do
-      ActiveRecord::Base.default_timezone = :utc
-      time = Time.now.utc
+
+    it "takes datetimes in UTC" do
+      time = DateTime.now.new_offset(Rational(0, 24))
+      if ENV['DB'] == 'mysql'
+        time = time.change(:usec => 0)
+      end
       upsert = Upsert.new $conn, :pets
-      assert_creates(Pet, [{:name => 'Jerry', :morning_walk_time => time}]) do
+      assert_creates(Pet, [[{:name => 'Jerry'}, {:morning_walk_time => time}]]) do
         upsert.row({:name => 'Jerry'}, {:morning_walk_time => time})
       end
     end
-    it "won't mess with UTC" do
-      ActiveRecord::Base.default_timezone = :local
-      time = Time.now
+
+    it "takes datetimes in local" do
+      time = DateTime.now
+      if ENV['DB'] == 'mysql'
+        time = time.change(:usec => 0)
+      end
       upsert = Upsert.new $conn, :pets
-      assert_creates(Pet, [{:name => 'Jerry', :morning_walk_time => time}]) do
+      assert_creates(Pet, [[{:name => 'Jerry'}, {:morning_walk_time => time}]]) do
         upsert.row({:name => 'Jerry'}, {:morning_walk_time => time})
       end
     end
+
   end
 end