upsert 0.1.1 → 0.1.2

data/lib/upsert/buffer/mysql2_client.rb

@@ -90,8 +90,18 @@ class Upsert
         [ insert_part, '(', all_value_sql.join('),('), ')', update_part ].join
       end
 
+      # since setting an option like :as => :hash actually persists that option to the client, don't pass any options
       def max_sql_bytesize
-        @max_sql_bytesize ||= connection.query("SHOW VARIABLES LIKE 'max_allowed_packet'", :as => :hash).first['Value'].to_i
+        @max_sql_bytesize ||= begin
+          case (row = connection.query("SHOW VARIABLES LIKE 'max_allowed_packet'").first)
+          when Array
+            row[1]
+          when Hash
+            row['Value']
+          else
+            raise "Don't know what to do if connection.query returns a #{row.class}"
+          end.to_i
+        end
       end
 
       def quoted_value_bytesize(v)
@@ -110,6 +120,8 @@ class Upsert
           v.to_s.bytesize
         when String
           v.bytesize + 2
+        when Symbol
+          v.to_s.bytesize + 2
         when Time, DateTime
           24 + 2
         when Date

data/lib/upsert/version.rb

@@ -1,3 +1,3 @@
 class Upsert
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/test/test_active_record_connection_adapter.rb

@@ -5,16 +5,16 @@ ActiveRecord::Base.establish_connection :adapter => 'mysql2', :username => 'root
 
 describe "using an ActiveRecord connection adapter" do
   before do
+    @opened_connections = []
     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) }
+    @opened_connections.clear
   end
   def new_connection
-    c = ActiveRecord::Base.connection_pool.checkout
+    c = Pet.connection
     @opened_connections << c
     c
   end

data/test/test_mysql2.rb

@@ -6,9 +6,9 @@ ActiveRecord::Base.establish_connection :adapter => 'mysql2', :username => 'root
 
 describe "upserting on mysql2" do
   before do
+    @opened_connections = []
     ActiveRecord::Base.connection.drop_table(Pet.table_name) rescue nil
     Pet.auto_upgrade!
-    @opened_connections = []
     @connection = new_connection
   end
   after do

data/test/test_pg.rb

@@ -7,9 +7,9 @@ ActiveRecord::Base.establish_connection :adapter => 'postgresql', :database => '
 
 describe "upserting on postgresql" do
   before do
+    @opened_connections = []
     ActiveRecord::Base.connection.drop_table(Pet.table_name) rescue nil
     Pet.auto_upgrade!
-    @opened_connections = []
     @connection = new_connection
   end
   after do

data/test/test_sqlite.rb

@@ -8,9 +8,9 @@ ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => db_p
 
 describe "upserting on sqlite" do
   before do
+    @opened_connections = []
     ActiveRecord::Base.connection.drop_table(Pet.table_name) rescue nil
     Pet.auto_upgrade!
-    @opened_connections = []
     @connection = new_connection
   end
   after do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: upsert
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors: