Merge pull request #395 from sodabrew/libc_query_info

Add Client#query_info that calls mysql_info.

Author: sodabrew

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;
@@ -1124,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

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

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)