upsert 0.0.1 → 0.1.0

data/test/shared/multibyte.rb

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

data/test/shared/speed.rb

@@ -0,0 +1,72 @@
+shared_examples_for 'can be speeded up with upserting' do
+  describe :speed 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
+
+    describe 'compared to activerecord-import' do
+      it "is faster than faking upserts with activerecord-import" do
+        unless Pet.connection.respond_to?(:sql_for_on_duplicate_key_update)
+          flunk "#{Pet.connection} does not support activerecord-import's :on_duplicate_key_update"
+        end
+        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

data/test/shared/timezones.rb

@@ -0,0 +1,27 @@
+shared_examples_for "doesn't mess with timezones" do
+  describe :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 connection, :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 connection, :pets
+      assert_creates(Pet, [{:name => 'Jerry', :morning_walk_time => time}]) do
+        upsert.row({:name => 'Jerry'}, {:morning_walk_time => time})
+      end
+    end
+  end
+end

data/test/test_active_record_connection_adapter.rb

@@ -0,0 +1,36 @@
+require 'helper'
+
+system %{ mysql -u root -ppassword -e "DROP DATABASE IF EXISTS test_upsert; CREATE DATABASE test_upsert CHARSET utf8" }
+ActiveRecord::Base.establish_connection :adapter => 'mysql2', :username => 'root', :password => 'password', :database => 'test_upsert', :pool => 2
+
+describe "using an ActiveRecord connection adapter" do
+  before do
+    ActiveRecord::Base.connection.drop_table(Pet.table_name) rescue nil
+    Pet.auto_upgrade!
+    @opened_connections = []
+    @connection = new_connection
+  end
+  after do
+    @opened_connections.each { |c| ActiveRecord::Base.connection_pool.checkin(c) }
+  end
+  def new_connection
+    c = ActiveRecord::Base.connection_pool.checkout
+    @opened_connections << c
+    c
+  end
+  def connection
+    @connection
+  end
+
+  it_also 'is a database with an upsert trick'
+
+  it_also 'is just as correct as other ways'
+
+  it_also 'can be speeded up with upserting'
+
+  it_also 'supports binary upserts'
+
+  it_also "supports multibyte"
+
+  it_also "doesn't mess with timezones"
+end

data/test/test_mysql2.rb

@@ -6,7 +6,7 @@ ActiveRecord::Base.establish_connection :adapter => 'mysql2', :username => 'root
 
 describe "upserting on mysql2" do
   before do
-    ActiveRecord::Base.connection.drop_table Pet.table_name rescue nil
+    ActiveRecord::Base.connection.drop_table(Pet.table_name) rescue nil
     Pet.auto_upgrade!
     @opened_connections = []
     @connection = new_connection
@@ -23,6 +23,15 @@ describe "upserting on mysql2" do
     @connection
   end
 
-  it_behaves_like :database
+  it_also 'is a database with an upsert trick'
 
+  it_also 'is just as correct as other ways'
+
+  it_also 'can be speeded up with upserting'
+
+  it_also 'supports binary upserts'
+
+  it_also "supports multibyte"
+
+  it_also "doesn't mess with timezones"
 end

data/test/test_pg.rb

@@ -7,7 +7,7 @@ ActiveRecord::Base.establish_connection :adapter => 'postgresql', :database => '
 
 describe "upserting on postgresql" do
   before do
-    ActiveRecord::Base.connection.drop_table Pet.table_name rescue nil
+    ActiveRecord::Base.connection.drop_table(Pet.table_name) rescue nil
     Pet.auto_upgrade!
     @opened_connections = []
     @connection = new_connection
@@ -24,6 +24,15 @@ describe "upserting on postgresql" do
     @connection
   end
 
-  it_behaves_like :database
+  it_also 'is a database with an upsert trick'
 
+  it_also 'is just as correct as other ways'
+
+  it_also 'can be speeded up with upserting'
+
+  it_also 'supports binary upserts'
+
+  it_also "supports multibyte"
+
+  it_also "doesn't mess with timezones"
 end

data/test/test_sqlite.rb

@@ -8,17 +8,33 @@ ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => db_p
 
 describe "upserting on sqlite" do
   before do
-    ActiveRecord::Base.connection.drop_table Pet.table_name rescue nil
+    ActiveRecord::Base.connection.drop_table(Pet.table_name) rescue nil
     Pet.auto_upgrade!
+    @opened_connections = []
     @connection = new_connection
   end
+  after do
+    @opened_connections.each { |c| c.close }
+  end
+
   def new_connection
-    db_path = File.expand_path('../../tmp/test.sqlite3', __FILE__)
-    SQLite3::Database.open(db_path)
+    c = SQLite3::Database.open(File.expand_path('../../tmp/test.sqlite3', __FILE__))
+    @opened_connections << c
+    c
   end
   def connection
     @connection
   end
 
-  it_behaves_like :database
+  it_also 'is a database with an upsert trick'
+
+  it_also 'is just as correct as other ways'
+
+  it_also 'can be speeded up with upserting'
+
+  it_also "supports multibyte"
+
+  it_also "doesn't mess with timezones"
+
+  it_also 'supports binary upserts'
 end

data/upsert.gemspec

@@ -20,7 +20,9 @@ Gem::Specification.new do |gem|
   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'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upsert
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-13 00:00:00.000000000 Z
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faker
+  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: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +155,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord-import
+  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.
@@ -149,11 +181,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .yardopts
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/upsert.rb
+- lib/upsert/binary.rb
 - lib/upsert/buffer.rb
 - lib/upsert/buffer/mysql2_client.rb
 - lib/upsert/buffer/pg_connection.rb
@@ -163,11 +197,16 @@ files:
 - lib/upsert/row.rb
 - lib/upsert/version.rb
 - test/helper.rb
-- test/shared_examples.rb
+- test/shared/binary.rb
+- test/shared/correctness.rb
+- test/shared/database.rb
+- test/shared/multibyte.rb
+- test/shared/speed.rb
+- test/shared/timezones.rb
+- test/test_active_record_connection_adapter.rb
 - test/test_mysql2.rb
 - test/test_pg.rb
 - test/test_sqlite.rb
-- test/test_upsert.rb
 - upsert.gemspec
 homepage: https://github.com/seamusabshere/upsert
 licenses: []
@@ -196,9 +235,14 @@ summary: Upsert for MySQL, PostgreSQL, and SQLite. Finally, all those SQL MERGE
   codified.
 test_files:
 - test/helper.rb
-- test/shared_examples.rb
+- test/shared/binary.rb
+- test/shared/correctness.rb
+- test/shared/database.rb
+- test/shared/multibyte.rb
+- test/shared/speed.rb
+- test/shared/timezones.rb
+- test/test_active_record_connection_adapter.rb
 - test/test_mysql2.rb
 - test/test_pg.rb
 - test/test_sqlite.rb
-- test/test_upsert.rb
 has_rdoc: 

data/test/test_upsert.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-describe Upsert do
-  describe :row do
-    
-  end
-end