upsert 0.3.4 → 0.4.0

data/spec/logger_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+describe Upsert do
+  describe "logger" do
+    it "logs to stderr by default" do
+      begin
+        old_stderr = $stderr
+        old_logger = Upsert.logger
+        Upsert.logger = nil
+        $stderr = StringIO.new
+        Upsert.logger.warn "hello"
+        $stderr.rewind
+        $stderr.read.chomp.should == 'hello'
+      ensure
+        Upsert.logger = old_logger
+        $stderr = old_stderr
+      end
+    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/i
+      ensure
+        Upsert.logger = old_logger
+      end
+    end
+
+  end
+end

data/spec/multibyte_spec.rb

@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+describe Upsert do
+  describe "supports multibyte" do
+    it "works one-by-one" do
+      assert_creates(Pet, [{:name => 'I♥NY', :gender => 'périferôl'}]) do
+        upsert = Upsert.new $conn, :pets
+        upsert.row({:name => 'I♥NY'}, {:gender => 'périferôl'})
+      end
+    end
+    it "works serially" do
+      assert_creates(Pet, [{:name => 'I♥NY', :gender => 'jÚrgen'}]) do
+        upsert = Upsert.new $conn, :pets
+        upsert.row({:name => 'I♥NY'}, {:gender => 'périferôl'})
+        upsert.row({:name => 'I♥NY'}, {:gender => 'jÚrgen'})
+      end
+    end
+    it "works batch" do
+      assert_creates(Pet, [{:name => 'I♥NY', :gender => 'jÚrgen'}]) do
+        Upsert.batch($conn, :pets) do |upsert|
+          upsert.row({:name => 'I♥NY'}, {:gender => 'périferôl'})
+          upsert.row({:name => 'I♥NY'}, {:gender => 'jÚrgen'})
+        end
+      end
+    end
+  end
+end

data/spec/precision_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+describe Upsert do
+  describe "is precise" do
+    it "stores small numbers precisely" do
+      small = -0.00000000634943
+      upsert = Upsert.new $conn, :pets
+      upsert.row({:name => 'NotJerry'}, :lovability => small)
+      Pet.first.lovability.should == small
+    end
+  end
+end

data/spec/reserved_words_spec.rb

@@ -0,0 +1,46 @@
+require 'spec_helper'
+describe Upsert do
+  describe "doesn't blow up on reserved words" do
+    # collect and uniq reserved words
+    reserved_words = ['mysql_reserved.txt', 'pg_reserved.txt'].map do |basename|
+      File.expand_path("../misc/#{basename}", __FILE__)
+    end.map do |path|
+      IO.readlines(path)
+    end.flatten.map(&:chomp).select(&:present?).uniq
+  
+    # make lots of AR models, each of which has 10 columns named after these words
+    nasties = []
+    reserved_words.each_slice(10) do |words|
+      eval %{
+        class Nasty#{nasties.length} < ActiveRecord::Base
+        end
+      }
+      nasty = Object.const_get("Nasty#{nasties.length}")
+      nasty.class_eval do
+        self.primary_key = 'fake_primary_key'
+        col :fake_primary_key
+        words.each do |word|
+          col word
+        end
+      end
+      nasties << [ nasty, words ]
+    end
+    nasties.each do |nasty, _|
+      nasty.auto_upgrade!
+    end
+  
+    describe "reserved words" do
+      nasties.each do |nasty, words|
+        it "doesn't die on reserved words #{words.join(',')}" 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
+          end
+        end
+      end
+    end
+  end
+end

data/{test/helper.rb → spec/spec_helper.rb}

@@ -1,22 +1,34 @@
-require 'rubygems'
 require 'bundler/setup'
-require 'securerandom'
-require 'zlib'
-require 'benchmark'
-require 'faker'
-require 'minitest/spec'
-require 'minitest/autorun'
-require 'minitest/reporters'
-MiniTest::Unit.runner = MiniTest::SuiteRunner.new
-MiniTest::Unit.runner.reporters << MiniTest::Reporters::SpecReporter.new
 
 require 'active_record'
-require 'activerecord-import'
 require 'active_record_inline_schema'
+require 'activerecord-import'
 
-# require 'logger'
-# ActiveRecord::Base.logger = Logger.new($stdout)
-# ActiveRecord::Base.logger.level = Logger::DEBUG
+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 = PGconn.new(:dbname => 'upsert_test')
+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'
+  $conn = Mysql2::Client.new(:username => 'root', :password => 'password', :database => 'upsert_test')
+when 'sqlite3'
+  ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:'
+  $conn = ActiveRecord::Base.connection.raw_connection
+else
+  raise "not supported"
+end
+
+if ENV['UPSERT_DEBUG'] == 'true'
+  require 'logger'
+  ActiveRecord::Base.logger = Logger.new($stdout)
+  ActiveRecord::Base.logger.level = Logger::DEBUG
+end
 
 class Pet < ActiveRecord::Base
   col :name
@@ -31,16 +43,14 @@ class Pet < ActiveRecord::Base
   col :home_address, :type => :text
   add_index :name, :unique => true
 end
+Pet.auto_upgrade!
 
-# ENV['UPSERT_DEBUG'] = 'true'
-
-require 'upsert'
-
-MiniTest::Spec.class_eval do
-  def self.shared_examples
-    @shared_examples ||= {}
-  end
+require 'securerandom'
+require 'zlib'
+require 'benchmark'
+require 'faker'
 
+module SpecHelper
   def lotsa_records
     @records ||= begin
       memo = []
@@ -77,22 +87,22 @@ MiniTest::Spec.class_eval do
     
     Pet.delete_all
 
-    Upsert.batch(connection, :pets) do |upsert|
+    Upsert.batch($conn, :pets) do |upsert|
       records.each do |selector, document|
         upsert.row(selector, document)
       end
     end
     ref2 = Pet.order(:name).all.map { |pet| pet.attributes.except('id') }
-    ref2.must_equal ref1
+    ref2.should == ref1
   end
 
   def assert_creates(model, expected_records)
     expected_records.each do |conditions|
-      model.where(conditions).count.must_equal 0
+      model.where(conditions).count.should == 0
     end
     yield
     expected_records.each do |conditions|
-      model.where(conditions).count.must_equal 1
+      model.where(conditions).count.should == 1
     end
   end
 
@@ -109,32 +119,22 @@ MiniTest::Spec.class_eval do
     sleep 1
 
     upsert_time = Benchmark.realtime do
-      Upsert.batch(connection, :pets) do |upsert|
+      Upsert.batch($conn, :pets) do |upsert|
         records.each do |selector, document|
           upsert.row(selector, document)
         end
       end
     end
-    upsert_time.must_be :<, ar_time
+    upsert_time.should be < ar_time
     $stderr.puts "   Upsert was #{((ar_time - upsert_time) / ar_time * 100).round}% faster than #{competition}"
   end
 end
 
-module MiniTest::Spec::SharedExamples
-  def shared_examples_for(desc, &block)
-    MiniTest::Spec.shared_examples[desc] = block
-  end
-
-  def it_also(desc)
-    self.instance_eval(&MiniTest::Spec.shared_examples[desc])# do
-    #   describe desc do
-    #     .call
-    #   end
-    # end
+RSpec.configure do |c|
+  c.include SpecHelper
+  c.before do
+    Pet.delete_all
   end
 end
 
-Object.class_eval { include(MiniTest::Spec::SharedExamples) }
-Dir[File.expand_path("../shared/*.rb", __FILE__)].each do |path|
-  require path
-end
+require 'upsert'

data/spec/speed_spec.rb

@@ -0,0 +1,73 @@
+require 'spec_helper'
+describe Upsert do
+  describe "can be speeded up with upserting" 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|
+            if pet = Pet.where(selector).first
+              pet.update_attributes document, :without_protection => true
+            else
+              pet = Pet.new
+              selector.each do |k, v|
+                pet.send "#{k}=", v
+              end
+              document.each do |k, v|
+                pet.send "#{k}=", v
+              end
+              pet.save!
+            end
+          end
+        end
+      end
+      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|
+            dynamic_method ||= "find_or_create_by_#{selector.keys.join('_or_')}"
+            pet = Pet.send(dynamic_method, *selector.values)
+            pet.update_attributes document, :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|
+            dynamic_method ||= "find_or_create_by_#{selector.keys.join('_or_')}"
+            begin
+              Pet.create selector.merge(document), :without_protection => true
+            rescue
+              pet = Pet.send(dynamic_method, *selector.values)
+              pet.update_attributes document, :without_protection => true
+            end
+          end
+        end
+      end
+    end
+  
+    if ENV['ADAPTER'] == 'mysql2'
+      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|
+            columns = nil
+            all_values = []
+            records.each do |selector, document|
+              columns ||= (selector.keys + document.keys).uniq
+              all_values << columns.map do |k|
+                if document.has_key?(k)
+                  # prefer the document so that you can change rows
+                  document[k]
+                else
+                  selector[k]
+                end
+              end
+            end
+            Pet.import columns, all_values, :timestamps => false, :on_duplicate_key_update => columns
+          end
+        end
+      end
+    end
+
+  end
+end

data/spec/threaded_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+describe Upsert do
+  describe "is thread-safe" do
+    it "is safe to use one-by-one" do
+      upsert = Upsert.new $conn, :pets
+      assert_creates(Pet, [{:name => 'Jerry', :gender => 'neutered'}]) do
+        ts = []
+        10.times do
+          ts << Thread.new do
+            sleep 0.2
+            upsert.row({:name => 'Jerry'}, :gender => 'male')
+            upsert.row({:name => 'Jerry'}, :gender => 'neutered')
+          end
+          ts.each { |t| t.join }
+        end
+      end
+    end
+    it "is safe to use batch" do
+      assert_creates(Pet, [{:name => 'Jerry', :gender => 'neutered'}]) do
+        Upsert.batch($conn, :pets) do |upsert|
+          ts = []
+          10.times do
+            ts << Thread.new do
+              sleep 0.2
+              upsert.row({:name => 'Jerry'}, :gender => 'male')
+              upsert.row({:name => 'Jerry'}, :gender => 'neutered')
+            end
+            ts.each { |t| t.join }
+          end
+        end
+      end
+    end
+  end
+end

data/spec/timezones_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+describe Upsert do
+  describe "doesn't mess with timezones" do
+    before do
+      @old_default_tz = ActiveRecord::Base.default_timezone
+    end
+    after do
+      ActiveRecord::Base.default_timezone = @old_default_tz
+    end
+  
+    it "deals fine with UTC" do
+      ActiveRecord::Base.default_timezone = :utc
+      time = Time.now.utc
+      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 "won't mess with UTC" do
+      ActiveRecord::Base.default_timezone = :local
+      time = Time.now
+      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
+  end
+end

data/upsert.gemspec

@@ -15,14 +15,18 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Upsert::VERSION
 
+  gem.add_development_dependency 'posix-spawn'
+  gem.add_development_dependency 'rspec-core'
+  gem.add_development_dependency 'rspec-expectations'
+  gem.add_development_dependency 'rspec-mocks'
+
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'mysql2'
   gem.add_development_dependency 'pg'
   gem.add_development_dependency 'activerecord' # testing only
   gem.add_development_dependency 'active_record_inline_schema'
   gem.add_development_dependency 'faker'
-  gem.add_development_dependency 'minitest'
-  gem.add_development_dependency 'minitest-reporters'
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'activerecord-import'
+  gem.add_development_dependency 'pry'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upsert
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: posix-spawn
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: active_record_inline_schema
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -92,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faker
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,7 +124,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: activerecord
+  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: active_record_inline_schema
+  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: faker
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -171,6 +203,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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'
 description: Upsert for MySQL, PostgreSQL, and SQLite. Codifies various SQL MERGE
   tricks like MySQL's ON DUPLICATE KEY UPDATE, PostgreSQL's CREATE FUNCTION merge_db,
   and SQLite's INSERT OR IGNORE.
@@ -190,30 +238,33 @@ files:
 - lib/upsert.rb
 - lib/upsert/active_record_upsert.rb
 - lib/upsert/binary.rb
-- lib/upsert/mysql2_client.rb
-- lib/upsert/pg_connection.rb
-- lib/upsert/pg_connection/column_definition.rb
+- lib/upsert/buffer.rb
+- lib/upsert/buffer/mysql2_client.rb
+- lib/upsert/buffer/pg_connection.rb
+- lib/upsert/buffer/pg_connection/merge_function.rb
+- lib/upsert/buffer/sqlite3_database.rb
+- lib/upsert/connection.rb
+- lib/upsert/connection/mysql2_client.rb
+- lib/upsert/connection/pg_connection.rb
+- lib/upsert/connection/sqlite3_database.rb
 - lib/upsert/row.rb
-- lib/upsert/sqlite3_database.rb
 - lib/upsert/version.rb
-- test/helper.rb
-- test/misc/get_postgres_reserved_words.rb
-- test/misc/mysql_reserved.txt
-- test/misc/pg_reserved.txt
-- test/shared/binary.rb
-- test/shared/correctness.rb
-- test/shared/database.rb
-- test/shared/multibyte.rb
-- test/shared/precision.rb
-- test/shared/reserved_words.rb
-- test/shared/speed.rb
-- test/shared/threaded.rb
-- test/shared/timezones.rb
-- test/test_active_record_connection_adapter.rb
-- test/test_active_record_upsert.rb
-- test/test_mysql2.rb
-- test/test_pg.rb
-- test/test_sqlite.rb
+- spec/active_record_upsert_spec.rb
+- spec/binary_spec.rb
+- spec/correctness_spec.rb
+- spec/database_functions_spec.rb
+- spec/database_spec.rb
+- spec/logger_spec.rb
+- spec/misc/get_postgres_reserved_words.rb
+- spec/misc/mysql_reserved.txt
+- spec/misc/pg_reserved.txt
+- spec/multibyte_spec.rb
+- spec/precision_spec.rb
+- spec/reserved_words_spec.rb
+- spec/spec_helper.rb
+- spec/speed_spec.rb
+- spec/threaded_spec.rb
+- spec/timezones_spec.rb
 - upsert.gemspec
 homepage: https://github.com/seamusabshere/upsert
 licenses: []
@@ -241,22 +292,20 @@ specification_version: 3
 summary: Upsert for MySQL, PostgreSQL, and SQLite. Finally, all those SQL MERGE tricks
   codified.
 test_files:
-- test/helper.rb
-- test/misc/get_postgres_reserved_words.rb
-- test/misc/mysql_reserved.txt
-- test/misc/pg_reserved.txt
-- test/shared/binary.rb
-- test/shared/correctness.rb
-- test/shared/database.rb
-- test/shared/multibyte.rb
-- test/shared/precision.rb
-- test/shared/reserved_words.rb
-- test/shared/speed.rb
-- test/shared/threaded.rb
-- test/shared/timezones.rb
-- test/test_active_record_connection_adapter.rb
-- test/test_active_record_upsert.rb
-- test/test_mysql2.rb
-- test/test_pg.rb
-- test/test_sqlite.rb
+- spec/active_record_upsert_spec.rb
+- spec/binary_spec.rb
+- spec/correctness_spec.rb
+- spec/database_functions_spec.rb
+- spec/database_spec.rb
+- spec/logger_spec.rb
+- spec/misc/get_postgres_reserved_words.rb
+- spec/misc/mysql_reserved.txt
+- spec/misc/pg_reserved.txt
+- spec/multibyte_spec.rb
+- spec/precision_spec.rb
+- spec/reserved_words_spec.rb
+- spec/spec_helper.rb
+- spec/speed_spec.rb
+- spec/threaded_spec.rb
+- spec/timezones_spec.rb
 has_rdoc: