Merge branch 'master' into 0.2.x

brianmario · brianmario · commit fd0f716b8c44 · 2013-07-15T16:05:23.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -9,10 +9,6 @@ rvm:
   - rbx-19mode
   - rbx-20mode
 bundler_args: --without benchmarks
-matrix:
-  allow_failures:
-  - rvm: rbx-19mode
-  - rvm: rbx-20mode
 script:
   - bundle exec rake
   - bundle exec rspec
diff --git a/Gemfile b/Gemfile
@@ -10,3 +10,7 @@ group :benchmarks do
   gem 'sequel'
   gem 'faker'
 end
+
+group :development do
+  gem 'pry'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -25,6 +25,7 @@ GEM
     arel (4.0.0)
     atomic (1.1.10)
     builder (3.1.4)
+    coderay (1.0.9)
     data_objects (0.10.13)
       addressable (~> 2.1)
     diff-lcs (1.1.3)
@@ -34,9 +35,14 @@ GEM
     faker (1.1.2)
       i18n (~> 0.5)
     i18n (0.6.4)
+    method_source (0.8.1)
     minitest (4.7.5)
     multi_json (1.7.7)
     mysql (2.9.1)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     rake (0.9.6)
     rake-compiler (0.8.3)
       rake
@@ -49,6 +55,7 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
     sequel (4.0.0)
+    slop (3.4.5)
     thread_safe (0.1.0)
       atomic
     tzinfo (0.3.37)
@@ -63,6 +70,7 @@ DEPENDENCIES
   faker
   mysql
   mysql2!
+  pry
   rake (~> 0.9.3)
   rake-compiler (~> 0.8.1)
   rspec (~> 2.8.0)
diff --git a/ext/mysql2/client.c b/ext/mysql2/client.c
@@ -259,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;
@@ -375,6 +394,7 @@ static VALUE nogvl_use_result(void *ptr) {
 static VALUE rb_mysql_client_async_result(VALUE self) {
   MYSQL_RES * result;
   VALUE resultObj;
+  VALUE current, is_streaming;
   GET_CLIENT(self);
 
   /* if we're not waiting on a result, do nothing */
@@ -388,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 {
@@ -404,7 +424,11 @@ static VALUE rb_mysql_client_async_result(VALUE self) {
     return Qnil;
   }
 
-  resultObj = rb_mysql_result_to_obj(self, wrapper->encoding, rb_hash_dup(rb_iv_get(self, "@current_query_options")), result);
+  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);
+
   return resultObj;
 }
 
@@ -549,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;
@@ -930,6 +957,7 @@ static VALUE rb_mysql_client_store_result(VALUE self)
 {
   MYSQL_RES * result;
   VALUE resultObj;
+  VALUE current;
   GET_CLIENT(self);
 
   result = (MYSQL_RES *)rb_thread_blocking_region(nogvl_store_result, wrapper, RUBY_UBF_IO, 0);
@@ -942,9 +970,12 @@ static VALUE rb_mysql_client_store_result(VALUE self)
     return Qnil;
   }
 
-  resultObj = rb_mysql_result_to_obj(self, wrapper->encoding, rb_hash_dup(rb_iv_get(self, "@current_query_options")), result);
-  return resultObj;
+  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);
 
+  return resultObj;
 }
 
 #ifdef HAVE_RUBY_ENCODING_H
@@ -1112,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
diff --git a/ext/mysql2/extconf.rb b/ext/mysql2/extconf.rb
@@ -9,6 +9,7 @@ def asplode lib
 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 @@ def asplode lib
 
 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
diff --git a/ext/mysql2/result.c b/ext/mysql2/result.c
@@ -129,7 +129,7 @@ static VALUE rb_mysql_result_fetch_field(VALUE self, unsigned int idx, short int
       memcpy(buf, field->name, field->name_length);
       buf[field->name_length] = 0;
 
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef HAVE_RB_INTERN3
       rb_field = rb_intern3(buf, field->name_length, rb_utf8_encoding());
       rb_field = ID2SYM(rb_field);
 #else
@@ -394,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;
   }
@@ -423,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 {
diff --git a/lib/mysql2/client.rb b/lib/mysql2/client.rb
@@ -61,6 +61,14 @@ def self.default_query_options
       @@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
diff --git a/lib/mysql2/console.rb b/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
diff --git a/script/bootstrap b/script/bootstrap
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+
+cd "$(dirname "$0")/.."
+exec bundle install --binstubs --path vendor/gems "$@"
diff --git a/script/console b/script/console
@@ -0,0 +1,7 @@
+#!/bin/sh
+# Run a Ruby REPL.
+
+set -e
+
+cd $(dirname "$0")/..
+exec ruby -S bin/pry -Ilib -r mysql2 -r mysql2/console
diff --git a/spec/mysql2/client_spec.rb b/spec/mysql2/client_spec.rb
@@ -130,6 +130,42 @@ def connect *args
     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)
@@ -257,10 +293,10 @@ def connect *args
           mark[:END] = Time.now
           mark.include?(:USR1).should be_true
           (mark[:USR1] - mark[:START]).should >= 1
-          (mark[:USR1] - mark[:START]).should < 1.2
+          (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.2
+          (mark[:END] - mark[:START]).should < 2.3
           Process.kill(:TERM, pid)
           Process.waitpid2(pid)
         ensure
