upsert 2.0.3 → 2.0.4

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZWU3NjI3M2VmZDY1YzVlNGMyMzA5NWI3ZTQyNjVkNzZkNjE4MWMwNA==
-  data.tar.gz: !binary |-
-    MTIzNjU4OGIxMmYwNzliZGY1OWVkYTA5ZWUxNzk1ZDViMjg0Mzg1NQ==
+SHA1:
+  metadata.gz: e403ffd510814ad862057a3059f8ce8e65d974d4
+  data.tar.gz: 142ba5495b4d63641f23b1e54ab2c855a9f858d9
 SHA512:
-  metadata.gz: !binary |-
-    ODFiNzk2M2MwMTQwNWFkYmQ1MDhkMmFlNTRkMzg5MDI2ZDNlZjAzNzhiY2Yx
-    MmE1NTVhMzYzZjBjYTQyZTkzY2U3Y2M5M2M4OTU0MjVkNGE1YWFlY2U2NTU0
-    ZWJiZjA1YjdiMzM2ZjdmNGU3NThkZTcxMzA4MjdiYzk0OTA3MDc=
-  data.tar.gz: !binary |-
-    MDlhYzkxZjg5NThiMDNkY2I5YTE2ODViNGQ2NzM5ZjU0OTk3ODdiMDMwOTNm
-    NTYwNTUxMTEyMjIwMTdmNGRlYzc4MDg5NWUzOGExYWI3ZDQ0OGUwNDg1Njlk
-    NGIxY2NkMzc2YjE5OWNlMmNkZmRhMjFlOGIxMmU5MmY1ZDZjN2U=
+  metadata.gz: d4ad43d341e5fefbecac30c296f4dc6956e4e513a68e1aca95ea0026017ce882849b59144282cc9ac82f7eabea5bfc9297a134b7f3b6320b9ad717be180d977d
+  data.tar.gz: 3bec3b12605a00058fb654d718baa5cc6adef91ea8e1b6931e22248a3f45f1a3652db43183923346516675edf4ff0269d3a0122199ac941784851c996d6f0583

data/.gitignore

@@ -16,3 +16,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*.log

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+global:
+  - USERNAME=travis
+    PASSWORD=
+rvm:
+  - 1.9.3
+  - 1.9.2
+  - 1.8.7
+env:
+  - DB=postgresql
+  - DB=mysql

data/CHANGELOG

@@ -1,3 +1,14 @@
+2.0.4 / 2015-01-27
+
+* Bug fixes
+
+  * Support mysql returning column info as symbols - thanks @pnomolos
+
+* Enhancements
+
+  * Travis and misc test fixes - thanks @raviolicode
+  * Backwards compat with 1.8 - thanks @raviolicode
+
 2.0.3 / 2013-11-27
 
 * Bug fixes

data/README.md

@@ -1,5 +1,9 @@
 # Upsert
 
+**note** There is a known problem with mysql2 and sidekiq - we're working on it in https://github.com/seamusabshere/upsert/tree/real_thread_safe and various issues
+
+[![Build Status](https://travis-ci.org/seamusabshere/upsert.svg?branch=master)](https://travis-ci.org/seamusabshere/upsert)
+
 Make it easy to upsert on traditional RDBMS like MySQL, PostgreSQL, and SQLite3—hey look NoSQL!. Transparently creates (and re-uses) stored procedures/functions when necessary.
 
 You pass it a bare-metal connection to the database like `Mysql2::Client` (from `mysql2` gem on MRI) or `Java::OrgPostgresqlJdbc4::Jdbc4Connection` (from `jdbc-postgres` on Jruby).
@@ -365,4 +369,4 @@ Per https://github.com/seamusabshere/upsert/issues/23 you might have issues if y
 
 ## Copyright
 
-Copyright 2013 Seamus Abshere
+Copyright 2014 Seamus Abshere

data/Rakefile

@@ -1,5 +1,12 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = "--format documentation"
+end
+
+task :default => :spec
 
 task :rspec_all_databases do
   results = {}
@@ -15,16 +22,19 @@ task :rspec_all_databases do
     puts "# Running specs against #{db}"
     puts '#'*50
     puts
-    # won't work on 1.8.7...
-    pid = Kernel.spawn({'DB' => db}, 'rspec', '--format', 'documentation', File.expand_path('../spec', __FILE__))
-    Process.waitpid pid
-    results[db] = $?.success? 
+
+    if RUBY_VERSION >= '1.9'
+      pid = spawn({'DB' => db}, 'rspec', '--format', 'documentation', File.expand_path('../spec', __FILE__))
+      Process.waitpid pid
+      results[db] = $?.success?
+    else
+      exec({'DB' => db}, 'rspec', '--format', 'documentation', File.expand_path('../spec', __FILE__))
+    end
+
   end
   puts results.inspect
 end
 
-task :default => :rspec_all_databases
-
 task :n, :from, :to do |t, args|
   Dir[File.expand_path("../lib/upsert/**/#{args.from}.*", __FILE__)].each do |path|
     dir = File.dirname(path)

data/lib/upsert/column_definition/mysql.rb

@@ -6,16 +6,16 @@ class Upsert
         def all(connection, table_name)
           connection.execute("SHOW COLUMNS FROM #{connection.quote_ident(table_name)}").map do |row|
             # {"Field"=>"name", "Type"=>"varchar(255)", "Null"=>"NO", "Key"=>"PRI", "Default"=>nil, "Extra"=>""}
-            name = row['Field'] || row['COLUMN_NAME']
-            type = row['Type'] || row['COLUMN_TYPE']
-            default = row['Default'] || row['COLUMN_DEFAULT']
+            name = row['Field'] || row['COLUMN_NAME'] || row[:Field] || row[:COLUMN_NAME]
+            type = row['Type'] || row['COLUMN_TYPE'] || row[:Type] || row[:COLUMN_TYPE]
+            default = row['Default'] || row['COLUMN_DEFAULT'] || row[:Default] || row[:COLUMN_DEFAULT]
             new connection, name, type, default
           end.sort_by do |cd|
             cd.name
           end
         end
       end
-      
+
       def equality(left, right)
         "#{left} <=> #{right}"
       end

data/lib/upsert/version.rb

@@ -1,3 +1,3 @@
 class Upsert
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 end

data/spec/correctness_spec.rb

@@ -41,8 +41,8 @@ describe Upsert do
       p.save!
       Pet.find_by_name_and_gender('Jerry', 'blue').tag_number.should == 777
       u = Upsert.new($conn, :pets)
-      selector = {name: 'Jerry', gender: 'red'} # this shouldn't select anything
-      setter = {tag_number: 888}
+      selector = {:name => 'Jerry', :gender => 'red'} # this shouldn't select anything
+      setter = {:tag_number => 888}
       u.row(selector, setter)
       Pet.find_by_name_and_gender('Jerry', 'blue').tag_number.should == 777
     end
@@ -53,7 +53,7 @@ describe Upsert do
       now = Date.today
       u = Upsert.new($conn, :pets)
       5.times do
-        u.row(gender: nil, birthday: now)
+        u.row(:gender => nil, :birthday => now)
       end
 
       Pet.count.should == 1
@@ -63,7 +63,7 @@ describe Upsert do
       Pet.count.should == 0
       u = Upsert.new($conn, :pets)
       5.times do
-        u.row(birthday: nil)
+        u.row(:birthday => nil)
       end
 
       Pet.count.should == 1
@@ -73,17 +73,17 @@ describe Upsert do
       u = Upsert.new($conn, :pets)
       now = Date.today
       assert_creates(Pet, [{:name => 'Jerry', :gender => nil, :spiel => 'beagle', :birthday => now}]) do
-        u.row(name: "Jerry", gender: nil, spiel: "samoyed")
-        u.row({:name => 'Jerry', gender: nil}, :spiel => 'beagle', :birthday => now)
+        u.row(:name => "Jerry", :gender => nil, :spiel => "samoyed")
+        u.row({:name => 'Jerry', :gender => nil}, :spiel => 'beagle', :birthday => now)
       end
     end
 
     it "tells you if you request a column that doesn't exist" do
       u = Upsert.new($conn, :pets)
-      lambda { u.row(gibberish: 'ba') }.should raise_error(/invalid col/i)
-      lambda { u.row(name: 'Jerry', gibberish: 'ba') }.should raise_error(/invalid col/i)
-      lambda { u.row({name: 'Jerry'}, gibberish: 'ba') }.should raise_error(/invalid col/i)
-      lambda { u.row({name: 'Jerry'}, gender: 'male', gibberish: 'ba') }.should raise_error(/invalid col/i)
+      lambda { u.row(:gibberish => 'ba') }.should raise_error(/invalid col/i)
+      lambda { u.row(:name => 'Jerry', :gibberish => 'ba') }.should raise_error(/invalid col/i)
+      lambda { u.row(:name => 'Jerry', :gibberish => 'ba') }.should raise_error(/invalid col/i)
+      lambda { u.row(:name => 'Jerry', :gibberish => 'ba', :gender => 'male') }.should raise_error(/invalid col/i)
     end
 
   end
@@ -134,7 +134,7 @@ describe Upsert do
       # end
     end
 
-    if ENV['DB'] == 'mysql'
+    if ENV['DB'] == 'mysql' && RUBY_VERSION >= '1.9'
       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/hstore_spec.rb

@@ -16,7 +16,7 @@ describe Upsert do
       uggy = <<-EOS
 {"results":[{"locations":[],"providedLocation":{"location":"3001 STRATTON WAY, MADISON, WI 53719 UNITED STATES"}}],"options":{"ignoreLatLngInput":true,"maxResults":1,"thumbMaps":false},"info":{"copyright":{"text":"© 2012 MapQuest, Inc.","imageUrl":"http://api.mqcdn.com/res/mqlogo.gif","imageAltText":"© 2012 MapQuest, Inc."},"statuscode":0,"messages":[]}}
 EOS
-      upsert.row({:name => 'Uggy'}, crazy: {uggy: uggy})
+      upsert.row({:name => 'Uggy'}, :crazy => {:uggy => uggy})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Uggy'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'uggy' => uggy }
@@ -25,35 +25,35 @@ EOS
     it "just works" do
       upsert = Upsert.new $conn, :pets
 
-      upsert.row({name: 'Bill'}, crazy: nil)
+      upsert.row({:name => 'Bill'}, :crazy => nil)
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       row['crazy'].should == nil
 
-      upsert.row({name: 'Bill'}, crazy: {a: 1})
+      upsert.row({:name => 'Bill'}, :crazy => {:a => 1})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'a' => '1' }
 
-      upsert.row({name: 'Bill'}, crazy: nil)
+      upsert.row({:name => 'Bill'}, :crazy => nil)
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       row['crazy'].should == nil
 
-      upsert.row({name: 'Bill'}, crazy: {a: 1})
+      upsert.row({:name => 'Bill'}, :crazy => {:a => 1})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'a' => '1' }
 
-      upsert.row({name: 'Bill'}, crazy: {whatdat: 'whodat'})
+      upsert.row({:name => 'Bill'}, :crazy => {:whatdat => 'whodat'})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'a' => '1', 'whatdat' => 'whodat' }
 
-      upsert.row({name: 'Bill'}, crazy: {whatdat: "D'ONOFRIO"})
+      upsert.row({:name => 'Bill'}, :crazy => {:whatdat => "D'ONOFRIO"})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'a' => '1', 'whatdat' => "D'ONOFRIO" }
 
-      upsert.row({name: 'Bill'}, crazy: {a: 2})
+      upsert.row({:name => 'Bill'}, :crazy => {:a => 2})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'a' => '2', 'whatdat' => "D'ONOFRIO" }
@@ -62,12 +62,12 @@ EOS
     it "can nullify entire hstore" do
       upsert = Upsert.new $conn, :pets
 
-      upsert.row({name: 'Bill'}, crazy: {a: 1})
+      upsert.row({:name => 'Bill'}, :crazy => {:a => 1})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'a' => '1' }
 
-      upsert.row({name: 'Bill'}, crazy: nil)
+      upsert.row({:name => 'Bill'}, :crazy => nil)
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       row['crazy'].should == nil
     end
@@ -75,46 +75,46 @@ EOS
     it "deletes keys that are nil" do
       upsert = Upsert.new $conn, :pets
 
-      upsert.row({name: 'Bill'}, crazy: nil)
+      upsert.row({:name => 'Bill'}, :crazy => nil)
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       row['crazy'].should == nil
 
-      upsert.row({name: 'Bill'}, crazy: {a: 1})
+      upsert.row({:name => 'Bill'}, :crazy => {:a => 1})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'a' => '1' }
 
-      upsert.row({name: 'Bill'}, crazy: {})
+      upsert.row({:name => 'Bill'}, :crazy => {})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'a' => '1' }
 
-      upsert.row({name: 'Bill'}, crazy: {a: nil})
+      upsert.row({:name => 'Bill'}, :crazy => {:a => nil})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == {}
 
-      upsert.row({name: 'Bill'}, crazy: {a: 1, b: 5})
+      upsert.row({:name => 'Bill'}, :crazy => {:a => 1, :b => 5})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'a' => '1', 'b' => '5' }
 
-      upsert.row({name: 'Bill'}, crazy: {})
+      upsert.row({:name => 'Bill'}, :crazy => {})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'a' => '1', 'b' => '5' }
 
-      upsert.row({name: 'Bill'}, crazy: {a: nil})
+      upsert.row({:name => 'Bill'}, :crazy => {:a => nil})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'b' => '5' }
 
-      upsert.row({name: 'Bill'}, crazy: {a: 1, b: 5})
+      upsert.row({:name => 'Bill'}, :crazy => {:a => 1, :b => 5})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'a' => '1', 'b' => '5' }
 
-      upsert.row({name: 'Bill'}, crazy: {a: nil, b: nil, c: 12})
+      upsert.row({:name => 'Bill'}, :crazy => {:a => nil, :b => nil, :c => 12})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'c' => '12' }
@@ -123,46 +123,46 @@ EOS
     it "takes dangerous keys" do
       upsert = Upsert.new $conn, :pets
 
-      upsert.row({name: 'Bill'}, crazy: nil)
+      upsert.row({:name => 'Bill'}, :crazy => nil)
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       row['crazy'].should == nil
 
-      upsert.row({name: 'Bill'}, crazy: {:'foo"bar' => 1})
+      upsert.row({:name => 'Bill'}, :crazy => {:'foo"bar' => 1})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'foo"bar' => '1' }
 
-      upsert.row({name: 'Bill'}, crazy: {})
+      upsert.row({:name => 'Bill'}, :crazy => {})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'foo"bar' => '1' }
 
-      upsert.row({name: 'Bill'}, crazy: {:'foo"bar' => nil})
+      upsert.row({:name => 'Bill'}, :crazy => {:'foo"bar' => nil})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == {}
 
-      upsert.row({name: 'Bill'}, crazy: {:'foo"bar' => 1, b: 5})
+      upsert.row({:name => 'Bill'}, :crazy => {:'foo"bar' => 1, :b => 5})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'foo"bar' => '1', 'b' => '5' }
 
-      upsert.row({name: 'Bill'}, crazy: {})
+      upsert.row({:name => 'Bill'}, :crazy => {})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'foo"bar' => '1', 'b' => '5' }
 
-      upsert.row({name: 'Bill'}, crazy: {:'foo"bar' => nil})
+      upsert.row({:name => 'Bill'}, :crazy => {:'foo"bar' => nil})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'b' => '5' }
 
-      upsert.row({name: 'Bill'}, crazy: {:'foo"bar' => 1, b: 5})
+      upsert.row({:name => 'Bill'}, :crazy => {:'foo"bar' => 1, :b => 5})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'foo"bar' => '1', 'b' => '5' }
 
-      upsert.row({name: 'Bill'}, crazy: {:'foo"bar' => nil, b: nil, c: 12})
+      upsert.row({:name => 'Bill'}, :crazy => {:'foo"bar' => nil, :b => nil, :c => 12})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'c' => '12' }
@@ -170,7 +170,7 @@ EOS
 
     it "handles multiple hstores" do
       upsert = Upsert.new $conn, :pets
-      upsert.row({name: 'Bill'}, crazy: {a: 1, b: 9}, cool: {c: 12, d: 19})
+      upsert.row({:name => 'Bill'}, :crazy => {:a => 1, :b => 9}, :cool => {:c => 12, :d => 19})
       row = Pet.connection.select_one(%{SELECT crazy, cool FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'a' => '1', 'b' => '9' }
@@ -181,7 +181,7 @@ EOS
     it "can deletes keys from multiple hstores at once" do
       upsert = Upsert.new $conn, :pets
 
-      upsert.row({name: 'Bill'}, crazy: {a: 1}, cool: {5 => 9})
+      upsert.row({:name => 'Bill'}, :crazy => {:a => 1}, :cool => {5 => 9})
       row = Pet.connection.select_one(%{SELECT crazy, cool FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'a' => '1' }
@@ -189,26 +189,26 @@ EOS
       cool.should == { '5' => '9' }
 
       # NOOP
-      upsert.row({name: 'Bill'}, crazy: {}, cool: {})
+      upsert.row({:name => 'Bill'}, :crazy => {}, :cool => {})
       row = Pet.connection.select_one(%{SELECT crazy, cool FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'a' => '1' }
       cool = PgHstore.parse row['cool']
       cool.should == { '5' => '9' }
 
-      upsert.row({name: 'Bill'}, crazy: {a: nil}, cool: {13 => 17})
+      upsert.row({:name => 'Bill'}, :crazy => {:a => nil}, :cool => {13 => 17})
       row = Pet.connection.select_one(%{SELECT crazy, cool FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == {}
       cool = PgHstore.parse row['cool']
       cool.should == { '5' => '9', '13' => '17' }
 
-      upsert.row({name: 'Bill'}, crazy: {a: 1, b: 5})
+      upsert.row({:name => 'Bill'}, :crazy => {:a => 1, :b => 5})
       row = Pet.connection.select_one(%{SELECT crazy, cool FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'a' => '1', 'b' => '5' }
 
-      upsert.row({name: 'Bill'}, crazy: {b: nil}, cool: {5 => nil})
+      upsert.row({:name => 'Bill'}, :crazy => {:b => nil}, :cool => {5 => nil})
       row = Pet.connection.select_one(%{SELECT crazy, cool FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == {'a' => '1'}
@@ -219,12 +219,12 @@ EOS
     it "deletes keys whether new or existing record" do
       upsert = Upsert.new $conn, :pets
 
-      upsert.row({name: 'Bill'}, crazy: {z: 1, x: nil})
+      upsert.row({:name => 'Bill'}, :crazy => {:z => 1, :x => nil})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'z' => '1' }
 
-      upsert.row({name: 'Bill'}, crazy: {a: 1})
+      upsert.row({:name => 'Bill'}, :crazy => {:a => 1})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'a' => '1', 'z' => '1' }
@@ -233,12 +233,12 @@ EOS
     it "can turn off eager nullify" do
       upsert = Upsert.new $conn, :pets
 
-      upsert.row({name: 'Bill'}, {crazy: {z: 1, x: nil}}, eager_nullify: false)
+      upsert.row({:name => 'Bill'}, {:crazy => {:z => 1, :x => nil}}, :eager_nullify => false)
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'z' => '1', 'x' => nil }
 
-      upsert.row({name: 'Bill'}, crazy: {a: 1})
+      upsert.row({:name => 'Bill'}, :crazy => {:a => 1})
       row = Pet.connection.select_one(%{SELECT crazy FROM pets WHERE name = 'Bill'})
       crazy = PgHstore.parse row['crazy']
       crazy.should == { 'a' => '1', 'z' => '1', 'x' => nil}

data/spec/logger_spec.rb

@@ -26,7 +26,7 @@ describe Upsert do
           Upsert.logger = Logger.new(io)
           
           u = Upsert.new($conn, :pets)
-          u.row(name: 'Jerry')
+          u.row(:name => 'Jerry')
 
           io.rewind
           log = io.read.chomp
@@ -36,7 +36,8 @@ describe Upsert do
           when /mysql/i
             log.should =~ /call #{Upsert::MergeFunction::NAME_PREFIX}_pets_SEL_name/i
           when /p.*g/i
-            log.should =~ /select #{Upsert::MergeFunction::NAME_PREFIX}_pets_SEL_name/i
+            # [54ae2eea857] Possibly much more useful debug output
+            log.should =~ /selector:/i
           else
             raise "not sure"
           end

data/spec/spec_helper.rb

@@ -7,14 +7,15 @@ require 'active_record'
 ActiveRecord::Base.default_timezone = :utc
 
 require 'active_record_inline_schema'
-require 'activerecord-import'
+
+require 'activerecord-import' if RUBY_VERSION >= '1.9'
 
 ENV['DB'] ||= 'mysql'
 
 class RawConnectionFactory
   DATABASE = 'upsert_test'
   CURRENT_USER = `whoami`.chomp
-  PASSWORD = 'password'
+  PASSWORD = ''
 
   case ENV['DB']
 
@@ -40,10 +41,11 @@ class RawConnectionFactory
     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" }
+    password_argument = (PASSWORD.empty?) ? "" : "-p#{PASSWORD}"
+    Kernel.system %{ mysql -u #{CURRENT_USER} #{password_argument} -e "DROP DATABASE IF EXISTS #{DATABASE}" }
+    Kernel.system %{ mysql -u #{CURRENT_USER} #{password_argument} -e "CREATE DATABASE #{DATABASE} CHARSET utf8" }
     if RUBY_PLATFORM == 'java'
-      CONFIG = "jdbc:mysql://127.0.0.1/#{DATABASE}?user=root&password=password"
+      CONFIG = "jdbc:mysql://127.0.0.1/#{DATABASE}?user=#{CURRENT_USER}&password=#{PASSWORD}"
       require 'jdbc/mysql'
       Jdbc::MySQL.load_driver
       # java.sql.DriverManager.register_driver com.mysql.jdbc.Driver.new
@@ -51,13 +53,14 @@ class RawConnectionFactory
         java.sql.DriverManager.get_connection CONFIG
       end
     else
-      CONFIG = { :username => 'root', :password => PASSWORD, :database => DATABASE}
       require 'mysql2'
       def new_connection
-        Mysql2::Client.new CONFIG
+        config = { :username => CURRENT_USER, :database => DATABASE, :host => "127.0.0.1" }
+        config.merge!(:password => PASSWORD) unless PASSWORD.empty?
+        Mysql2::Client.new config
       end
     end
-    ActiveRecord::Base.establish_connection "#{RUBY_PLATFORM == 'java' ? 'mysql' : 'mysql2'}://root:password@127.0.0.1/#{DATABASE}"
+    ActiveRecord::Base.establish_connection "#{RUBY_PLATFORM == 'java' ? 'mysql' : 'mysql2'}://#{CURRENT_USER}:#{PASSWORD}@127.0.0.1/#{DATABASE}"
 
   when 'sqlite3'
     CONFIG = { :adapter => 'sqlite3', :database => 'file::memory:?cache=shared' }
@@ -213,7 +216,7 @@ module SpecHelper
     end.inject({}) do |memo, (k, v)|
       memo[k] = case v
       when Time, DateTime
-        v.to_time.to_f
+        v.to_i
       else
         v
       end

data/spec/speed_spec.rb

@@ -46,7 +46,7 @@ describe Upsert do
       end
     end
   
-    if ENV['DB'] == 'mysql'
+    if ENV['DB'] == 'mysql' && RUBY_VERSION >= '1.9'
       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|
@@ -70,4 +70,4 @@ describe Upsert do
     end
 
   end
-end
+end

data/upsert.gemspec

@@ -26,12 +26,14 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'active_record_inline_schema'
   gem.add_development_dependency 'faker'
   gem.add_development_dependency 'yard'
-  gem.add_development_dependency 'activerecord-import'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'pg-hstore', ">=1.1.3"
   gem.add_development_dependency 'sequel'
+  gem.add_development_dependency 'rake', '~>10.1.1'
 
-  unless RUBY_VERSION >= '1.9'
+  if RUBY_VERSION >= '1.9'
+    gem.add_development_dependency 'activerecord-import'
+  else
     gem.add_development_dependency 'orderedhash'
   end
 
@@ -47,7 +49,11 @@ Gem::Specification.new do |gem|
     gem.add_development_dependency 'sqlite3'
     gem.add_development_dependency 'mysql2'
     gem.add_development_dependency 'pg'
-    gem.add_development_dependency 'redcarpet' # github-flavored markdown
-    gem.add_development_dependency 'rake'
+    # github-flavored markdown
+    if RUBY_VERSION >= '1.9'
+      gem.add_development_dependency 'redcarpet'
+    else
+      gem.add_development_dependency 'redcarpet', '~> 2.3.0'
+    end
   end
 end

metadata

@@ -1,237 +1,237 @@
 --- !ruby/object:Gem::Specification
 name: upsert
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: active_record_inline_schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord-import
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pg-hstore
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
-  name: pg-hstore
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: sequel
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.1
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Make it easy to upsert on MySQL, PostgreSQL, and SQLite3. Transparently
@@ -242,8 +242,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -307,17 +308,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Make it easy to upsert on MySQL, PostgreSQL, and SQLite3. Transparently creates