mysql2 0.2.19b6 → 0.2.19

data/ext/mysql2/client.c

@@ -44,6 +44,17 @@ static VALUE rb_hash_dup(VALUE other) {
   mysql_client_wrapper *wrapper; \
   Data_Get_Struct(self, mysql_client_wrapper, wrapper)
 
+/*
+ * compatability with mysql-connector-c, where LIBMYSQL_VERSION is the correct
+ * variable to use, but MYSQL_SERVER_VERSION gives the correct numbers when
+ * linking against the server itself
+ */
+#ifdef LIBMYSQL_VERSION
+  #define MYSQL_LINK_VERSION LIBMYSQL_VERSION
+#else
+  #define MYSQL_LINK_VERSION MYSQL_SERVER_VERSION
+#endif
+
 /*
  * used to pass all arguments to mysql_real_connect while inside
  * rb_thread_blocking_region
@@ -182,13 +193,15 @@ static VALUE nogvl_close(void *ptr) {
   return Qnil;
 }
 
-static void rb_mysql_client_free(void * ptr) {
+static void rb_mysql_client_free(void *ptr) {
   mysql_client_wrapper *wrapper = (mysql_client_wrapper *)ptr;
 
-  nogvl_close(wrapper);
-
-  xfree(wrapper->client);
-  xfree(ptr);
+  wrapper->refcount--;
+  if (wrapper->refcount == 0) {
+    nogvl_close(wrapper);
+    xfree(wrapper->client);
+    xfree(wrapper);
+  }
 }
 
 static VALUE allocate(VALUE klass) {
@@ -200,6 +213,7 @@ static VALUE allocate(VALUE klass) {
   wrapper->reconnect_enabled = 0;
   wrapper->connected = 0; /* means that a database connection is open */
   wrapper->initialized = 0; /* means that that the wrapper is initialized */
+  wrapper->refcount = 1;
   wrapper->client = (MYSQL*)xmalloc(sizeof(MYSQL));
   return obj;
 }
@@ -245,6 +259,25 @@ static VALUE rb_mysql_client_warning_count(VALUE self) {
   return UINT2NUM(warning_count);
 }
 
+static VALUE rb_mysql_info(VALUE self) {
+  const char *info;
+  VALUE rb_str;
+  GET_CLIENT(self);
+
+  info = mysql_info(wrapper->client);
+
+  if (info == NULL) {
+    return Qnil;
+  }
+
+  rb_str = rb_str_new2(info);
+#ifdef HAVE_RUBY_ENCODING_H
+  rb_enc_associate(rb_str, rb_utf8_encoding());
+#endif
+
+  return rb_str;
+}
+
 static VALUE rb_connect(VALUE self, VALUE user, VALUE pass, VALUE host, VALUE port, VALUE database, VALUE socket, VALUE flags) {
   struct nogvl_connect_args args;
   VALUE rv;
@@ -361,9 +394,7 @@ static VALUE nogvl_use_result(void *ptr) {
 static VALUE rb_mysql_client_async_result(VALUE self) {
   MYSQL_RES * result;
   VALUE resultObj;
-#ifdef HAVE_RUBY_ENCODING_H
-  mysql2_result_wrapper * result_wrapper;
-#endif
+  VALUE current, is_streaming;
   GET_CLIENT(self);
 
   /* if we're not waiting on a result, do nothing */
@@ -377,7 +408,7 @@ static VALUE rb_mysql_client_async_result(VALUE self) {
     return rb_raise_mysql2_error(wrapper);
   }
 
-  VALUE is_streaming = rb_hash_aref(rb_iv_get(self, "@current_query_options"), sym_stream);
+  is_streaming = rb_hash_aref(rb_iv_get(self, "@current_query_options"), sym_stream);
   if(is_streaming == Qtrue) {
     result = (MYSQL_RES *)rb_thread_blocking_region(nogvl_use_result, wrapper, RUBY_UBF_IO, 0);
   } else {
@@ -393,14 +424,11 @@ static VALUE rb_mysql_client_async_result(VALUE self) {
     return Qnil;
   }
 
-  resultObj = rb_mysql_result_to_obj(result);
-  /* pass-through query options for result construction later */
-  rb_iv_set(resultObj, "@query_options", rb_hash_dup(rb_iv_get(self, "@current_query_options")));
+  current = rb_hash_dup(rb_iv_get(self, "@current_query_options"));
+  RB_GC_GUARD(current);
+  Check_Type(current, T_HASH);
+  resultObj = rb_mysql_result_to_obj(self, wrapper->encoding, current, result);
 
-#ifdef HAVE_RUBY_ENCODING_H
-  GetMysql2Result(resultObj, result_wrapper);
-  result_wrapper->encoding = wrapper->encoding;
-#endif
   return resultObj;
 }
 
@@ -545,10 +573,13 @@ static VALUE rb_mysql_client_query(int argc, VALUE * argv, VALUE self) {
   REQUIRE_CONNECTED(wrapper);
   args.mysql = wrapper->client;
 
-  rb_iv_set(self, "@current_query_options", rb_hash_dup(rb_iv_get(self, "@query_options")));
-  current = rb_iv_get(self, "@current_query_options");
+  current = rb_hash_dup(rb_iv_get(self, "@query_options"));
+  RB_GC_GUARD(current);
+  Check_Type(current, T_HASH);
+  rb_iv_set(self, "@current_query_options", current);
+
   if (rb_scan_args(argc, argv, "11", &args.sql, &opts) == 2) {
-    opts = rb_funcall(current, intern_merge_bang, 1, opts);
+    rb_funcall(current, intern_merge_bang, 1, opts);
 
     if (rb_hash_aref(current, sym_async) == Qtrue) {
       async = 1;
@@ -926,10 +957,7 @@ static VALUE rb_mysql_client_store_result(VALUE self)
 {
   MYSQL_RES * result;
   VALUE resultObj;
-#ifdef HAVE_RUBY_ENCODING_H
-  mysql2_result_wrapper * result_wrapper;
-#endif
-
+  VALUE current;
   GET_CLIENT(self);
 
   result = (MYSQL_RES *)rb_thread_blocking_region(nogvl_store_result, wrapper, RUBY_UBF_IO, 0);
@@ -942,16 +970,12 @@ static VALUE rb_mysql_client_store_result(VALUE self)
     return Qnil;
   }
 
-  resultObj = rb_mysql_result_to_obj(result);
-  /* pass-through query options for result construction later */
-  rb_iv_set(resultObj, "@query_options", rb_hash_dup(rb_iv_get(self, "@current_query_options")));
+  current = rb_hash_dup(rb_iv_get(self, "@current_query_options"));
+  RB_GC_GUARD(current);
+  Check_Type(current, T_HASH);
+  resultObj = rb_mysql_result_to_obj(self, wrapper->encoding, current, result);
 
-#ifdef HAVE_RUBY_ENCODING_H
-  GetMysql2Result(resultObj, result_wrapper);
-  result_wrapper->encoding = wrapper->encoding;
-#endif
   return resultObj;
-
 }
 
 #ifdef HAVE_RUBY_ENCODING_H
@@ -1051,14 +1075,12 @@ static VALUE set_charset_name(VALUE self, VALUE value) {
 static VALUE set_ssl_options(VALUE self, VALUE key, VALUE cert, VALUE ca, VALUE capath, VALUE cipher) {
   GET_CLIENT(self);
 
-  if(!NIL_P(ca) || !NIL_P(key)) {
-    mysql_ssl_set(wrapper->client,
-        NIL_P(key) ? NULL : StringValuePtr(key),
-        NIL_P(cert) ? NULL : StringValuePtr(cert),
-        NIL_P(ca) ? NULL : StringValuePtr(ca),
-        NIL_P(capath) ? NULL : StringValuePtr(capath),
-        NIL_P(cipher) ? NULL : StringValuePtr(cipher));
-  }
+  mysql_ssl_set(wrapper->client,
+      NIL_P(key) ? NULL : StringValuePtr(key),
+      NIL_P(cert) ? NULL : StringValuePtr(cert),
+      NIL_P(ca) ? NULL : StringValuePtr(ca),
+      NIL_P(capath) ? NULL : StringValuePtr(capath),
+      NIL_P(cipher) ? NULL : StringValuePtr(cipher));
 
   return self;
 }
@@ -1081,14 +1103,15 @@ void init_mysql2_client() {
   int i;
   int dots = 0;
   const char *lib = mysql_get_client_info();
-  for (i = 0; lib[i] != 0 && MYSQL_SERVER_VERSION[i] != 0; i++) {
+  
+  for (i = 0; lib[i] != 0 && MYSQL_LINK_VERSION[i] != 0; i++) {
     if (lib[i] == '.') {
       dots++;
               /* we only compare MAJOR and MINOR */
       if (dots == 2) break;
     }
-    if (lib[i] != MYSQL_SERVER_VERSION[i]) {
-      rb_raise(rb_eRuntimeError, "Incorrect MySQL client library version! This gem was compiled for %s but the client library is %s.", MYSQL_SERVER_VERSION, lib);
+    if (lib[i] != MYSQL_LINK_VERSION[i]) {
+      rb_raise(rb_eRuntimeError, "Incorrect MySQL client library version! This gem was compiled for %s but the client library is %s.", MYSQL_LINK_VERSION, lib);
       return;
     }
   }
@@ -1120,6 +1143,7 @@ void init_mysql2_client() {
   rb_define_method(cMysql2Client, "store_result", rb_mysql_client_store_result, 0);
   rb_define_method(cMysql2Client, "reconnect=", set_reconnect, 1);
   rb_define_method(cMysql2Client, "warning_count", rb_mysql_client_warning_count, 0);
+  rb_define_method(cMysql2Client, "query_info_string", rb_mysql_info, 0);
 #ifdef HAVE_RUBY_ENCODING_H
   rb_define_method(cMysql2Client, "encoding", rb_mysql_client_encoding, 0);
 #endif

data/ext/mysql2/client.h

@@ -38,6 +38,8 @@ typedef struct {
   int active;
   int connected;
   int initialized;
+  int refcount;
+  int freed;
   MYSQL *client;
 } mysql_client_wrapper;
 

data/ext/mysql2/extconf.rb

@@ -9,6 +9,7 @@ end
 have_func('rb_thread_blocking_region')
 have_func('rb_wait_for_single_fd')
 have_func('rb_hash_dup')
+have_func('rb_intern3')
 
 # borrowed from mysqlplus
 # http://github.com/oldmoe/mysqlplus/blob/master/ext/extconf.rb
@@ -29,6 +30,14 @@ GLOB = "{#{dirs.join(',')}}/{mysql_config,mysql_config5}"
 
 if RUBY_PLATFORM =~ /mswin|mingw/
   inc, lib = dir_config('mysql')
+
+  # Ruby versions not incorporating the mkmf fix at
+  # https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/39717
+  # do not properly search for lib directories, and must be corrected
+  unless lib[-3, 3] == 'lib'
+    @libdir_basename = 'lib'
+    inc, lib = dir_config('mysql')
+  end
   exit 1 unless have_library("libmysql")
 elsif mc = (with_config('mysql-config') || Dir[GLOB].first) then
   mc = Dir[GLOB].first if mc == true
@@ -69,8 +78,13 @@ end
 if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc/
   $CFLAGS << ' -Wall -funroll-loops'
 
-  if hard_mysql_path = $libs[%r{-L(/[^ ]+)}, 1]
-    $LDFLAGS << " -Wl,-rpath,#{hard_mysql_path}"
+  if libdir = $libs[%r{-L(/[^ ]+)}, 1]
+    # The following comment and test is borrowed from the Pg gem:
+    # Try to use runtime path linker option, even if RbConfig doesn't know about it.
+    # The rpath option is usually set implicit by dir_config(), but so far not on Mac OS X.
+    if RbConfig::CONFIG["RPATHFLAG"].to_s.empty? && try_link('int main() {return 0;}', " -Wl,-rpath,#{libdir}")
+      $LDFLAGS << " -Wl,-rpath,#{libdir}"
+    end
   end
 end
 

data/ext/mysql2/result.c

@@ -64,22 +64,33 @@ static void rb_mysql_result_mark(void * wrapper) {
     rb_gc_mark(w->fields);
     rb_gc_mark(w->rows);
     rb_gc_mark(w->encoding);
+    rb_gc_mark(w->client);
   }
 }
 
 /* this may be called manually or during GC */
 static void rb_mysql_result_free_result(mysql2_result_wrapper * wrapper) {
   if (wrapper && wrapper->resultFreed != 1) {
+    /* FIXME: this may call flush_use_result, which can hit the socket */
     mysql_free_result(wrapper->result);
     wrapper->resultFreed = 1;
   }
 }
 
 /* this is called during GC */
-static void rb_mysql_result_free(void * wrapper) {
-  mysql2_result_wrapper * w = wrapper;
-  /* FIXME: this may call flush_use_result, which can hit the socket */
-  rb_mysql_result_free_result(w);
+static void rb_mysql_result_free(void *ptr) {
+  mysql2_result_wrapper * wrapper = ptr;
+  rb_mysql_result_free_result(wrapper);
+
+  // If the GC gets to client first it will be nil
+  if (wrapper->client != Qnil) {
+    wrapper->client_wrapper->refcount--;
+    if (wrapper->client_wrapper->refcount == 0) {
+      xfree(wrapper->client_wrapper->client);
+      xfree(wrapper->client_wrapper);
+    }
+  }
+
   xfree(wrapper);
 }
 
@@ -114,15 +125,18 @@ static VALUE rb_mysql_result_fetch_field(VALUE self, unsigned int idx, short int
 
     field = mysql_fetch_field_direct(wrapper->result, idx);
     if (symbolize_keys) {
-      VALUE colStr;
       char buf[field->name_length+1];
       memcpy(buf, field->name, field->name_length);
       buf[field->name_length] = 0;
+
+#ifdef HAVE_RB_INTERN3
+      rb_field = rb_intern3(buf, field->name_length, rb_utf8_encoding());
+      rb_field = ID2SYM(rb_field);
+#else
+      VALUE colStr;
       colStr = rb_str_new2(buf);
-#ifdef HAVE_RUBY_ENCODING_H
-      rb_enc_associate(colStr, rb_utf8_encoding());
-#endif
       rb_field = ID2SYM(rb_to_id(colStr));
+#endif
     } else {
       rb_field = rb_str_new(field->name, field->name_length);
 #ifdef HAVE_RUBY_ENCODING_H
@@ -223,7 +237,11 @@ static VALUE rb_mysql_result_fetch_row(VALUE self, ID db_timezone, ID app_timezo
           val = Qnil;
           break;
         case MYSQL_TYPE_BIT:        /* BIT field (MySQL 5.0.3 and up) */
-          val = rb_str_new(row[i], fieldLengths[i]);
+          if (castBool && fields[i].length == 1) {
+            val = *row[i] == 1 ? Qtrue : Qfalse;
+          }else{
+            val = rb_str_new(row[i], fieldLengths[i]);
+          }
           break;
         case MYSQL_TYPE_TINY:       /* TINYINT field */
           if (castBool && fields[i].length == 1) {
@@ -376,6 +394,7 @@ static VALUE rb_mysql_result_fetch_fields(VALUE self) {
   GetMysql2Result(self, wrapper);
 
   defaults = rb_iv_get(self, "@query_options");
+  Check_Type(defaults, T_HASH);
   if (rb_hash_aref(defaults, sym_symbolize_keys) == Qtrue) {
     symbolizeKeys = 1;
   }
@@ -405,6 +424,7 @@ static VALUE rb_mysql_result_each(int argc, VALUE * argv, VALUE self) {
   GetMysql2Result(self, wrapper);
 
   defaults = rb_iv_get(self, "@query_options");
+  Check_Type(defaults, T_HASH);
   if (rb_scan_args(argc, argv, "01&", &opts, &block) == 1) {
     opts = rb_funcall(defaults, intern_merge, 1, opts);
   } else {
@@ -558,7 +578,7 @@ static VALUE rb_mysql_result_count(VALUE self) {
 }
 
 /* Mysql2::Result */
-VALUE rb_mysql_result_to_obj(MYSQL_RES * r) {
+VALUE rb_mysql_result_to_obj(VALUE client, VALUE encoding, VALUE options, MYSQL_RES *r) {
   VALUE obj;
   mysql2_result_wrapper * wrapper;
   obj = Data_Make_Struct(cMysql2Result, mysql2_result_wrapper, rb_mysql_result_mark, rb_mysql_result_free, wrapper);
@@ -569,9 +589,16 @@ VALUE rb_mysql_result_to_obj(MYSQL_RES * r) {
   wrapper->result = r;
   wrapper->fields = Qnil;
   wrapper->rows = Qnil;
-  wrapper->encoding = Qnil;
+  wrapper->encoding = encoding;
   wrapper->streamingComplete = 0;
+  wrapper->client = client;
+  wrapper->client_wrapper = DATA_PTR(client);
+  wrapper->client_wrapper->refcount++;
+
   rb_obj_call_init(obj, 0, NULL);
+
+  rb_iv_set(obj, "@query_options", options);
+
   return obj;
 }
 

data/ext/mysql2/result.h

@@ -2,11 +2,12 @@
 #define MYSQL2_RESULT_H
 
 void init_mysql2_result();
-VALUE rb_mysql_result_to_obj(MYSQL_RES * r);
+VALUE rb_mysql_result_to_obj(VALUE client, VALUE encoding, VALUE options, MYSQL_RES *r);
 
 typedef struct {
   VALUE fields;
   VALUE rows;
+  VALUE client;
   VALUE encoding;
   unsigned int numberOfFields;
   unsigned long numberOfRows;
@@ -14,6 +15,7 @@ typedef struct {
   char streamingComplete;
   char resultFreed;
   MYSQL_RES *result;
+  mysql_client_wrapper *client_wrapper;
 } mysql2_result_wrapper;
 
 #define GetMysql2Result(obj, sval) (sval = (mysql2_result_wrapper*)DATA_PTR(obj));

data/lib/active_record/connection_adapters/mysql2_adapter.rb

@@ -5,13 +5,15 @@ require 'mysql2'
 module ActiveRecord
   class Base
     def self.mysql2_connection(config)
+      config = config.symbolize_keys
+
       config[:username] = 'root' if config[:username].nil?
 
       if Mysql2::Client.const_defined? :FOUND_ROWS
         config[:flags] = Mysql2::Client::FOUND_ROWS
       end
 
-      client = Mysql2::Client.new(config.symbolize_keys)
+      client = Mysql2::Client.new(config)
       options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0]
       ConnectionAdapters::Mysql2Adapter.new(client, logger, options, config)
     end

data/lib/mysql2/client.rb

@@ -36,7 +36,8 @@ module Mysql2
       # force the encoding to utf8
       self.charset_name = opts[:encoding] || 'utf8'
 
-      ssl_set(*opts.values_at(:sslkey, :sslcert, :sslca, :sslcapath, :sslcipher))
+      ssl_options = opts.values_at(:sslkey, :sslcert, :sslca, :sslcapath, :sslcipher)
+      ssl_set(*ssl_options) if ssl_options.any?
 
       if [:user,:pass,:hostname,:dbname,:db,:sock].any?{|k| @query_options.has_key?(k) }
         warn "============= WARNING FROM mysql2 ============="
@@ -60,6 +61,14 @@ module Mysql2
       @@default_query_options
     end
 
+    def query_info
+      info = query_info_string
+      return {} unless info
+      info_hash = {}
+      info.split.each_slice(2) { |s| info_hash[s[0].downcase.delete(':').to_sym] = s[1].to_i }
+      info_hash
+    end
+
     private
       def self.local_offset
         ::Time.local(2010).utc_offset.to_r / 86400

data/lib/mysql2/console.rb

@@ -0,0 +1,5 @@
+# Loaded by script/console. Land helpers here.
+
+Pry.config.prompt = lambda do |context, nesting, pry|
+  "[mysql2] #{context}> "
+end

data/lib/mysql2/version.rb

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

data/spec/mysql2/client_spec.rb

@@ -81,11 +81,13 @@ describe Mysql2::Client do
     results = ssl_client.query("SHOW STATUS WHERE Variable_name = \"Ssl_version\" OR Variable_name = \"Ssl_cipher\"").to_a
     results[0]['Variable_name'].should eql('Ssl_cipher')
     results[0]['Value'].should_not be_nil
-    results[0]['Value'].class.should eql(String)
+    results[0]['Value'].should be_kind_of(String)
+    results[0]['Value'].should_not be_empty
 
     results[1]['Variable_name'].should eql('Ssl_version')
     results[1]['Value'].should_not be_nil
-    results[1]['Value'].class.should eql(String)
+    results[1]['Value'].should be_kind_of(String)
+    results[1]['Value'].should_not be_empty
   end
 
   it "should respond to #close" do
@@ -128,6 +130,42 @@ describe Mysql2::Client do
     end
   end
 
+  it "should respond to #query_info" do
+    @client.should respond_to(:query_info)
+  end
+
+  context "#query_info" do
+    context "when no info present" do
+      before(:each) do
+        @client.query('select 1')
+      end
+      it "should 0" do
+        @client.query_info.should be_empty
+        @client.query_info_string.should be_nil
+      end
+    end
+    context "when has some info" do
+      before(:each) do
+        @client.query "USE test"
+        @client.query "CREATE TABLE IF NOT EXISTS infoTest (`id` int(11) NOT NULL AUTO_INCREMENT, blah INT(11), PRIMARY KEY (`id`))"
+      end
+
+      after(:each) do
+        @client.query "DROP TABLE infoTest"
+      end
+
+      before(:each) do
+        # http://dev.mysql.com/doc/refman/5.0/en/mysql-info.html says
+        # # Note that mysql_info() returns a non-NULL value for INSERT ... VALUES only for the multiple-row form of the statement (that is, only if multiple value lists are specified).
+        @client.query("INSERT INTO infoTest (blah) VALUES (1234),(4535)")
+      end
+      it "should retrieve it" do
+        @client.query_info.should == {:records => 2, :duplicates => 0, :warnings => 0}
+        @client.query_info_string.should eq 'Records: 2  Duplicates: 0  Warnings: 0'
+      end
+    end
+  end
+
   it "should expect connect_timeout to be a positive integer" do
     lambda {
       Mysql2::Client.new(:connect_timeout => -1)
@@ -255,10 +293,10 @@ describe Mysql2::Client do
           mark[:END] = Time.now
           mark.include?(:USR1).should be_true
           (mark[:USR1] - mark[:START]).should >= 1
-          (mark[:USR1] - mark[:START]).should < 1.1
+          (mark[:USR1] - mark[:START]).should < 1.3
           (mark[:END] - mark[:USR1]).should > 0.9
           (mark[:END] - mark[:START]).should >= 2
-          (mark[:END] - mark[:START]).should < 2.1
+          (mark[:END] - mark[:START]).should < 2.3
           Process.kill(:TERM, pid)
           Process.waitpid2(pid)
         ensure

data/spec/mysql2/result_spec.rb

@@ -160,11 +160,16 @@ describe Mysql2::Result do
       @test_result['null_test'].should eql(nil)
     end
 
-    it "should return Fixnum for a BIT value" do
+    it "should return String for a BIT(64) value" do
       @test_result['bit_test'].class.should eql(String)
       @test_result['bit_test'].should eql("\000\000\000\000\000\000\000\005")
     end
 
+    it "should return String for a BIT(1) value" do
+      @test_result['single_bit_test'].class.should eql(String)
+      @test_result['single_bit_test'].should eql("\001")
+    end
+
     it "should return Fixnum for a TINYINT value" do
       [Fixnum, Bignum].should include(@test_result['tiny_int_test'].class)
       @test_result['tiny_int_test'].should eql(1)
@@ -188,6 +193,20 @@ describe Mysql2::Result do
       @client.query "DELETE from mysql2_test WHERE id IN(#{id1},#{id2},#{id3})"
     end
 
+    it "should return TrueClass or FalseClass for a BIT(1) value if :cast_booleans is enabled" do
+      @client.query 'INSERT INTO mysql2_test (single_bit_test) VALUES (1)'
+      id1 = @client.last_id
+      @client.query 'INSERT INTO mysql2_test (single_bit_test) VALUES (0)'
+      id2 = @client.last_id
+
+      result1 = @client.query "SELECT single_bit_test FROM mysql2_test WHERE id = #{id1}", :cast_booleans => true
+      result2 = @client.query "SELECT single_bit_test FROM mysql2_test WHERE id = #{id2}", :cast_booleans => true
+      result1.first['single_bit_test'].should be_true
+      result2.first['single_bit_test'].should be_false
+
+      @client.query "DELETE from mysql2_test WHERE id IN(#{id1},#{id2})"
+    end
+
     it "should return Fixnum for a SMALLINT value" do
       [Fixnum, Bignum].should include(@test_result['small_int_test'].class)
       @test_result['small_int_test'].should eql(10)

data/spec/spec_helper.rb

@@ -14,6 +14,7 @@ RSpec.configure do |config|
         id MEDIUMINT NOT NULL AUTO_INCREMENT,
         null_test VARCHAR(10),
         bit_test BIT(64),
+        single_bit_test BIT(1),
         tiny_int_test TINYINT,
         bool_cast_test TINYINT(1),
         small_int_test SMALLINT,
@@ -50,7 +51,7 @@ RSpec.configure do |config|
     client.query "DELETE FROM mysql2_test;"
     client.query %[
       INSERT INTO mysql2_test (
-        null_test, bit_test, tiny_int_test, bool_cast_test, small_int_test, medium_int_test, int_test, big_int_test,
+        null_test, bit_test, single_bit_test, tiny_int_test, bool_cast_test, small_int_test, medium_int_test, int_test, big_int_test,
         float_test, float_zero_test, double_test, decimal_test, decimal_zero_test, date_test, date_time_test, timestamp_test, time_test,
         year_test, char_test, varchar_test, binary_test, varbinary_test, tiny_blob_test,
         tiny_text_test, blob_test, text_test, medium_blob_test, medium_text_test,
@@ -58,7 +59,7 @@ RSpec.configure do |config|
       )
 
       VALUES (
-        NULL, b'101', 1, 1, 10, 10, 10, 10,
+        NULL, b'101', b'1', 1, 1, 10, 10, 10, 10,
         10.3, 0, 10.3, 10.3, 0, '2010-4-4', '2010-4-4 11:44:00', '2010-4-4 11:44:00', '11:44:00',
         2009, "test", "test", "test", "test", "test",
         "test", "test", "test", "test", "test",

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: mysql2
 version: !ruby/object:Gem::Version
-  version: 0.2.19b6
-  prerelease: 6
+  version: 0.2.19
+  prerelease: 
 platform: ruby
 authors:
 - Brian Lopez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -82,7 +82,6 @@ extensions:
 - ext/mysql2/extconf.rb
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
 - MIT-LICENSE
 - README.md
 - ext/mysql2/client.c
@@ -95,14 +94,12 @@ files:
 - ext/mysql2/result.c
 - ext/mysql2/result.h
 - ext/mysql2/wait_for_single_fd.h
-- lib/active_record/connection_adapters/em_mysql2_adapter.rb
 - lib/active_record/connection_adapters/mysql2_adapter.rb
-- lib/active_record/fiber_patches.rb
 - lib/arel/engines/sql/compilers/mysql2_compiler.rb
 - lib/mysql2.rb
 - lib/mysql2/client.rb
+- lib/mysql2/console.rb
 - lib/mysql2/em.rb
-- lib/mysql2/em_fiber.rb
 - lib/mysql2/error.rb
 - lib/mysql2/result.rb
 - lib/mysql2/version.rb
@@ -111,7 +108,6 @@ files:
 - examples/eventmachine.rb
 - examples/threaded.rb
 - spec/configuration.yml.example
-- spec/em/em_fiber_spec.rb
 - spec/em/em_spec.rb
 - spec/mysql2/client_spec.rb
 - spec/mysql2/error_spec.rb
@@ -119,7 +115,8 @@ files:
 - spec/rcov.opts
 - spec/spec_helper.rb
 homepage: http://github.com/brianmario/mysql2
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
@@ -134,9 +131,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -147,7 +144,6 @@ test_files:
 - examples/eventmachine.rb
 - examples/threaded.rb
 - spec/configuration.yml.example
-- spec/em/em_fiber_spec.rb
 - spec/em/em_spec.rb
 - spec/mysql2/client_spec.rb
 - spec/mysql2/error_spec.rb

data/CHANGELOG.md

@@ -1,221 +0,0 @@
-# Changelog
-
-## 0.2.19 (not yet released)
-## 0.2.19b5 (not yet released)
-* builds on Ruby 2.0-head and Rubinius 2.0-dev
-* encoding names now stored in a Gperf lookup rather than an array
-* long-standing bug fix: options set on a single query must not be applied to subsequent queries
-* add method warning_count
-* add method abandon_results!
-* add setter for reconnect option
-* remove options method (added in 0.3.12b1)
-* support microsecond Time resolution
-* several INT / UINT fixes
-
-## 0.2.19b4 (August 22, 2012)
-* add write_timeout as well
-
-## 0.2.19b3 (August 22, 2012)
-* several INT / LONG fixes
-* fix linking to MySQL 5.5
-
-## 0.2.19b2 (August 10, 2012)
-* more_results is now more_results?
-
-## 0.2.19b1 (August 8, 2012)
-* several threading and async bug fixes
-* better handling of read and write timeouts
-* add :local_infile connection option
-* add MULTI_STATEMENTS connection flag and methods store_result, next_result, more_results
-* add select_db and options methods
-* add :stream query option
-* add support for utf8mb4 encoding
-* deprecation warnings for the :user, :pass, :hostname, :dbname, :db, :sock connection options
-
-## 0.2.18 (December 6th, 2011)
-* change mysql error detection strategy from using mysql_field_count to the more explicit mysql_errno
-* bugfix to avoid race condition with active connections that error out
-* revert back to using xmalloc/xfree for allocations
-* avoid potentially unsafe Ruby C API usage w/o GVL
-* reacquire GVL before retrying on EINTR on connect
-
-## 0.2.17 (November 9th, 2011)
-
-## 0.2.16 (November 9th, 2011)
-
-## 0.2.15 (November 9th, 2011)
-
-## 0.2.14 (November 9th, 2011)
-* use rb_wait_for_single_fd() if available
-* fixed a bug with inheriting query options
-* remove ext/ from the default loadpath
-* fix build issues on OSX with Xcode 4.2 (gcc-llvm compiler)
-
-## 0.2.13 (August 16th, 2011)
-* fix stupid bug around symbol encoding support (thanks coderrr!)
-
-## 0.2.12 (August 16th, 2011)
-* ensure symbolized column names support encodings in 1.9
-* plugging sql vulnerability in mysql2 adapter
-
-## 0.2.11 (June 17th, 2011)
-* fix bug in Time/DateTime range detection
-* (win32) fix bug where the Mysql2::Client object wasn't cleaned up properly if interrupted during a query
-* add Mysql2::Result#count (aliased as size) to get the row count for the dataset
-  this can be especially helpful if you want to get the number of rows without having to inflate
-  the entire dataset into ruby (since this happens lazily)
-
-## 0.2.10 (June 15th, 2011)
-* bug fix for Time/DateTime usage depending on 32/64bit Ruby
-
-## 0.2.9 (June 15th, 2011)
-* fix a long standing bug where a signal would interrupt rb_thread_select and put the connection in a permanently broken state
-* turn on casting in the ActiveRecord again, users can disable it if they need to for performance reasons
-
-## 0.2.8 (June 14th, 2011)
-* disable async support, and access to the underlying file descriptor under Windows. It's never worked reliably and ruby-core has a lot of work to do in order to make it possible.
-* added support for turning eager-casting off. This is especially useful in ORMs that will lazily cast values upon access.
-* added a warning if a 0.2.x release is being used with ActiveRecord 3.1 since both the 0.2.x releases and AR 3.1 have mysql2 adapters, we want you to use the one in AR 3.1
-* added Mysql2::Client.escape (class-level method)
-* disabled eager-casting in the bundled ActiveRecord adapter (for Rails 3.0 or less)
-
-## 0.2.7 (March 28th, 2011)
-* various fixes for em_mysql2 and fiber usage
-* use our own Mysql2IndexDefinition class for better compatibility across ActiveRecord versions
-* ensure the query is a string earlier in the Mysql2::Client#query codepath for 1.9
-* only set binary ruby encoding on fields that have a binary flag *and* encoding set
-* a few various optimizations
-* add support for :read_timeout to be set on a connection
-* Fix to install with MariDB on Windows
-* add fibered em connection without activerecord
-* fix some 1.9.3 compilation warnings
-* add LD_RUN_PATH when using hard coded mysql paths - this should help users with MySQL installed in non-standard locations
-* for windows support, duplicate the socket from libmysql and create a temporary CRT fd
-* fix for handling years before 1970 on Windows
-* fixes to the Fiber adapter
-* set wait_timeout maximum on Windows to 2147483
-* update supported range for Time objects
-* upon being required, make sure the libmysql we're using is the one we were built against
-* add Mysql2::Client#thread_id
-* add Mysql2::Client#ping
-* switch connection check in AR adapter to use Mysql2::Client#ping for efficiency
-* prefer linking against thread-safe version of libmysqlclient
-* define RSTRING_NOT_MODIFIED for an awesome rbx speed boost
-* expose Mysql2::Client#encoding in 1.9, make sure we set the error message and sqlstate encodings accordingly
-* do not segfault when raising for invalid charset (found in 1.9.3dev)
-
-## 0.2.6 (October 19th, 2010)
-* version bump since the 0.2.5 win32 binary gems were broken
-
-## 0.2.5 (October 19th, 2010)
-* fixes for easier Win32 binary gem deployment for targeting 1.8 and 1.9 in the same gem
-* refactor of connection checks and management to avoid race conditions with the GC/threading to prevent the unexpected loss of connections
-* update the default flags during connection
-* add support for setting wait_timeout on AR adapter
-* upgrade to rspec2
-* bugfix for an edge case where the GC would clean up a Mysql2::Client object before the underlying MYSQL pointer had been initialized
-* fix to CFLAGS to allow compilation on SPARC with sunstudio compiler - Anko painting <anko.com+github@gmail.com>
-
-## 0.2.4 (September 17th, 2010)
-* a few patches for win32 support from Luis Lavena - thanks man!
-* bugfix from Eric Wong to avoid a potential stack overflow during Mysql2::Client#escape
-* added the ability to turn internal row caching on/off via the :cache_rows => true/false option
-* a couple of small patches for rbx compatibility
-* set IndexDefinition#length in AR adapter - Kouhei Yanagita <yanagi@shakenbu.org>
-* fix a long-standing data corruption bug - thank you thank you thank you to @joedamato (http://github.com/ice799)
-* bugfix from calling mysql_close on a closed/freed connection surfaced by the above fix
-
-## 0.2.3 (August 20th, 2010)
-* connection flags can now be passed to the constructor via the :flags key
-* switch AR adapter connection over to use FOUND_ROWS option
-* patch to ensure we use DateTime objects in place of Time for timestamps that are out of the supported range on 32bit platforms < 1.9.2
-
-## 0.2.2 (August 19th, 2010)
-* Change how AR adapter would send initial commands upon connecting
-** we can make multiple session variable assignments in a single query
-* fix signal handling when waiting on queries
-* retry connect if interrupted by signals
-
-## 0.2.1 (August 16th, 2010)
-* bring mysql2 ActiveRecord adapter back into gem
-
-## 0.2.0 (August 16th, 2010)
-* switch back to letting libmysql manage all allocation/thread-state/freeing for the connection
-* cache various numeric type conversions in hot-spots of the code for a little speed boost
-* ActiveRecord adapter moved into Rails 3 core
-** Don't worry 2.3.x users! We'll either release the adapter as a separate gem, or try to get it into 2.3.9
-* Fix for the "closed MySQL connection" error (GH #31)
-* Fix for the "can't modify frozen object" error in 1.9.2 (GH #37)
-* Introduce cascading query and result options (more info in README)
-* Sequel adapter pulled into core (will be in the next release - 3.15.0 at the time of writing)
-* add a safety check when attempting to send a query before a result has been fetched
-
-## 0.1.9 (July 17th, 2010)
-* Support async ActiveRecord access with fibers and EventMachine (mperham)
-* string encoding support for 1.9, respecting Encoding.default_internal
-* added support for rake-compiler (tenderlove)
-* bugfixes for ActiveRecord driver
-** one minor bugfix for TimeZone support
-** fix the select_rows method to return what it should according to the docs (r-stu31)
-* Mysql2::Client#fields method added - returns the array of field names from a resultset, as strings
-* Sequel adapter
-** bugfix regarding sybolized field names (Eric Wong)
-** fix query logging in Sequel adapter
-* Lots of nice code cleanup (tenderlove)
-** Mysql2::Error definition moved to pure-Ruby
-** Mysql2::client#initialize definition moved to pure-Ruby
-** Mysql2::Result partially moved to pure-Ruby
-
-## 0.1.8 (June 2nd, 2010)
-* fixes for AR adapter for timezone juggling
-* fixes to be able to run benchmarks and specs under 1.9.2
-
-## 0.1.7 (May 22nd, 2010)
-* fix a bug when using the disconnect! method on a closed connection in the AR driver
-
-## 0.1.6 (May 14th, 2010)
-* more fixes to the AR adapter related to casting
-* add missing index creation override method to AR adapter
-* added sql_state and error_number methods to the Mysql2::Error exception class
-
-## 0.1.5 (May 12th, 2010)
-* quite a few patches from Eric Wong related to thread-safety, non-blocking I/O and general cleanup
-** wrap mysql_real_connect with rb_thread_blocking_region
-** release GVL for possibly blocking mysql_* library calls
-** [cleanup] quiet down warnings
-** [cleanup] make all C symbols static
-** add Mysql2::Client#close method
-** correctly free the wrapped result in case of EOF
-** Fix memory leak from the result wrapper struct itself
-** make Mysql2::Client destructor safely non-blocking
-* bug fixes for ActiveRecord adapter
-** added casting for default values since they all come back from Mysql as strings (!?!)
-** missing constant was added
-** fixed a typo in the show_variable method
-* switched over sscanf for date/time parsing in C
-* made some specs a little finer-grained
-* initial Sequel adapter added
-* updated query benchmarks to reflect the difference between casting in C and in Ruby
-
-## 0.1.4 (April 23rd, 2010)
-* optimization: implemented a local cache for rows that are lazily created in ruby during iteration. The MySQL C result is freed as soon as all the results have been cached
-* optimization: implemented a local cache for field names so every row reuses the same objects as field names/keys
-* refactor the Mysql2 connection adapter for ActiveRecord to not extend the Mysql adapter - now being a free-standing connection adapter
-
-## 0.1.3 (April 15th, 2010)
-* added an EventMachine Deferrable API
-* added an ActiveRecord connection adapter
-** should be compatible with 2.3.5 and 3.0 (including Arel)
-
-## 0.1.2 (April 9th, 2010)
-* fix a bug (copy/paste fail) around checking for empty TIME values and returning nil (thanks @marius)
-
-## 0.1.1 (April 6th, 2010)
-* added affected_rows method (mysql_affected_rows)
-* added last_id method (last_insert_id)
-* enable reconnect option by default
-* added initial async query support
-* updated extconf (thanks to the mysqlplus project) for easier gem building
-
-## 0.1.0 (April 6th, 2010)
-* initial release

data/lib/active_record/connection_adapters/em_mysql2_adapter.rb

@@ -1,64 +0,0 @@
-# encoding: utf-8
-
-# AR adapter for using a fibered mysql2 connection with EM
-# This adapter should be used within Thin or Unicorn with the rack-fiber_pool middleware.
-# Just update your database.yml's adapter to be 'em_mysql2'
-
-module ActiveRecord
-  class Base
-    def self.em_mysql2_connection(config)
-      client = ::Mysql2::Fibered::Client.new(config.symbolize_keys)
-      options = [config[:host], config[:username], config[:password], config[:database], config[:port], config[:socket], 0]
-      ConnectionAdapters::Mysql2Adapter.new(client, logger, options, config)
-    end
-  end
-end
-
-require 'fiber'
-require 'eventmachine'
-require 'mysql2'
-require 'active_record/connection_adapters/mysql2_adapter'
-require 'active_record/fiber_patches'
-
-module Mysql2
-  module Fibered
-    class Client < ::Mysql2::Client
-      module Watcher
-        def initialize(client, deferable)
-          @client = client
-          @deferable = deferable
-        end
-
-        def notify_readable
-          begin
-            detach
-            results = @client.async_result
-            @deferable.succeed(results)
-          rescue Exception => e
-            @deferable.fail(e)
-          end
-        end
-      end
-
-      def query(sql, opts={})
-        if ::EM.reactor_running?
-          super(sql, opts.merge(:async => true))
-          deferrable = ::EM::DefaultDeferrable.new
-          ::EM.watch(self.socket, Watcher, self, deferrable).notify_readable = true
-          fiber = Fiber.current
-          deferrable.callback do |result|
-            fiber.resume(result)
-          end
-          deferrable.errback do |err|
-            fiber.resume(err)
-          end
-          Fiber.yield.tap do |result|
-            raise result if result.is_a?(Exception)
-          end
-        else
-          super(sql, opts)
-        end
-      end
-    end
-  end
-end

data/lib/active_record/fiber_patches.rb

@@ -1,132 +0,0 @@
-# Necessary monkeypatching to make AR fiber-friendly.
-
-module ActiveRecord
-  module ConnectionAdapters
-
-    def self.fiber_pools
-      @fiber_pools ||= []
-    end
-    def self.register_fiber_pool(fp)
-      fiber_pools << fp
-    end
-
-    class FiberedMonitor
-      class Queue
-        def initialize
-          @queue = []
-        end
-
-        def wait(timeout)
-          t = timeout || 5
-          fiber = Fiber.current
-          x = EM::Timer.new(t) do
-            @queue.delete(fiber)
-            fiber.resume(false)
-          end
-          @queue << fiber
-          Fiber.yield.tap do
-            x.cancel
-          end
-        end
-
-        def signal
-          fiber = @queue.pop
-          fiber.resume(true) if fiber
-        end
-      end
-
-      def synchronize
-        yield
-      end
-
-      def new_cond
-        Queue.new
-      end
-    end
-
-    # ActiveRecord's connection pool is based on threads.  Since we are working
-    # with EM and a single thread, multiple fiber design, we need to provide
-    # our own connection pool that keys off of Fiber.current so that different
-    # fibers running in the same thread don't try to use the same connection.
-    class ConnectionPool
-      def initialize(spec)
-        @spec = spec
-
-        # The cache of reserved connections mapped to threads
-        @reserved_connections = {}
-
-        # The mutex used to synchronize pool access
-        @connection_mutex = FiberedMonitor.new
-        @queue = @connection_mutex.new_cond
-
-        # default 5 second timeout unless on ruby 1.9
-        @timeout = spec.config[:wait_timeout] || 5
-
-        # default max pool size to 5
-        @size = (spec.config[:pool] && spec.config[:pool].to_i) || 5
-
-        @connections = []
-        @checked_out = []
-        @automatic_reconnect = true
-        @tables = {}
-
-        @columns     = Hash.new do |h, table_name|
-          h[table_name] = with_connection do |conn|
-
-            # Fetch a list of columns
-            conn.columns(table_name, "#{table_name} Columns").tap do |columns|
-
-              # set primary key information
-              columns.each do |column|
-                column.primary = column.name == primary_keys[table_name]
-              end
-            end
-          end
-        end
-
-        @columns_hash = Hash.new do |h, table_name|
-          h[table_name] = Hash[columns[table_name].map { |col|
-            [col.name, col]
-          }]
-        end
-
-        @primary_keys = Hash.new do |h, table_name|
-          h[table_name] = with_connection do |conn|
-            table_exists?(table_name) ? conn.primary_key(table_name) : 'id'
-          end
-        end
-      end
-
-      def clear_stale_cached_connections!
-        cache = @reserved_connections
-        keys = Set.new(cache.keys)
-
-        ActiveRecord::ConnectionAdapters.fiber_pools.each do |pool|
-          pool.busy_fibers.each_pair do |object_id, fiber|
-            keys.delete(object_id)
-          end
-        end
-
-        keys.each do |key|
-          next unless cache.has_key?(key)
-          checkin cache[key]
-          cache.delete(key)
-        end
-      end
-
-      private
-
-      def current_connection_id #:nodoc:
-        Fiber.current.object_id
-      end
-
-      def checkout_and_verify(c)
-        @checked_out << c
-        c.run_callbacks :checkout
-        c.verify!
-        c
-      end
-    end
-
-  end
-end

data/lib/mysql2/em_fiber.rb

@@ -1,31 +0,0 @@
-# encoding: utf-8
-
-require 'mysql2/em'
-require 'fiber'
-
-module Mysql2
-  module EM
-    module Fiber
-      class Client < ::Mysql2::EM::Client
-        def query(sql, opts={})
-          if ::EM.reactor_running?
-            deferable = super(sql, opts)
-
-            fiber = ::Fiber.current
-            deferable.callback do |result|
-              fiber.resume(result)
-            end
-            deferable.errback do |err|
-              fiber.resume(err)
-            end
-            ::Fiber.yield.tap do |result|
-              raise result if result.is_a?(::Exception)
-            end
-          else
-            super(sql, opts)
-          end
-        end
-      end
-    end
-  end
-end

data/spec/em/em_fiber_spec.rb

@@ -1,22 +0,0 @@
-# encoding: UTF-8
-if defined? EventMachine && defined? Fiber
-  require 'spec_helper'
-  require 'mysql2/em_fiber'
-
-  describe Mysql2::EM::Fiber::Client do
-    it 'should support queries' do
-      results = []
-      EM.run do
-        Fiber.new {
-          client1 = Mysql2::EM::Fiber::Client.new DatabaseCredentials['root']
-          results = client1.query "SELECT sleep(0.1) as first_query"
-          EM.stop_event_loop
-        }.resume
-      end
-
-      results.first.keys.should include("first_query")
-    end
-  end
-else
-  puts "Either EventMachine or Fibers not available. Skipping tests that use them."
-end