mysql2 0.2.19b5 → 0.2.19b6

data/ext/mysql2/client.c

@@ -177,7 +177,6 @@ static VALUE nogvl_close(void *ptr) {
 #endif
 
     mysql_close(wrapper->client);
-    xfree(wrapper->client);
   }
 
   return Qnil;
@@ -188,6 +187,7 @@ static void rb_mysql_client_free(void * ptr) {
 
   nogvl_close(wrapper);
 
+  xfree(wrapper->client);
   xfree(ptr);
 }
 

data/lib/active_record/connection_adapters/mysql2_adapter.rb

@@ -149,8 +149,6 @@ module ActiveRecord
         if value.kind_of?(String) && column && column.type == :binary && column.class.respond_to?(:string_to_binary)
           s = column.class.string_to_binary(value).unpack("H*")[0]
           "x'#{s}'"
-        elsif value.kind_of?(BigDecimal)
-          value.to_s("F")
         else
           super
         end
@@ -314,12 +312,13 @@ module ActiveRecord
       end
 
       def add_limit_offset!(sql, options)
-        limit, offset = options.fetch(:limit, 18446744073709551615), options[:offset]
+        limit, offset = options[:limit], options[:offset]
         if limit && offset
           sql << " LIMIT #{offset.to_i}, #{sanitize_limit(limit)}"
         elsif limit
           sql << " LIMIT #{sanitize_limit(limit)}"
         elsif offset
+          limit = 18446744073709551615 if limit.nil?
           sql << " LIMIT #{sanitize_limit(limit)} OFFSET #{offset.to_i}"
         end
         sql

data/lib/mysql2/version.rb

@@ -1,3 +1,3 @@
 module Mysql2
-  VERSION = "0.2.19b5"
+  VERSION = "0.2.19b6"
 end

data/spec/mysql2/client_spec.rb

@@ -17,17 +17,17 @@ describe Mysql2::Client do
   if defined? Encoding
     it "should raise an exception on create for invalid encodings" do
       lambda {
-        c = Mysql2::Client.new(:encoding => "fake")
+        c = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "fake"))
       }.should raise_error(Mysql2::Error)
     end
 
     it "should not raise an exception on create for a valid encoding" do
       lambda {
-        c = Mysql2::Client.new(:encoding => "utf8")
+        c = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "utf8"))
       }.should_not raise_error(Mysql2::Error)
 
       lambda {
-        c = Mysql2::Client.new(:encoding => "big5")
+        c = Mysql2::Client.new(DatabaseCredentials['root'].merge(:encoding => "big5"))
       }.should_not raise_error(Mysql2::Error)
     end
   end
@@ -416,10 +416,10 @@ describe Mysql2::Client do
       it "#more_results? should work" do
         @multi_client.query( "select 1 as 'set_1'; select 2 as 'set_2'")
         @multi_client.more_results?.should == true
- 
+
         @multi_client.next_result
         @multi_client.store_result
- 
+
         @multi_client.more_results?.should == false
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysql2
 version: !ruby/object:Gem::Version
-  version: 0.2.19b5
+  version: 0.2.19b6
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-14 00:00:00.000000000 Z
+date: 2013-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -154,4 +154,3 @@ test_files:
 - spec/mysql2/result_spec.rb
 - spec/rcov.opts
 - spec/spec_helper.rb
-has_rdoc: