mysql2 0.3.12b3 → 0.3.12b4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mysql2 (0.3.12b3)
+    mysql2 (0.3.12b4)
 
 GEM
   remote: http://rubygems.org/

data/ext/mysql2/client.c

@@ -618,6 +618,11 @@ static VALUE _mysql_client_options(VALUE self, int opt, VALUE value) {
       retval = &intval;
       break;
 
+    case MYSQL_OPT_WRITE_TIMEOUT:
+      intval = NUM2INT(value);
+      retval = &intval;
+      break;
+
     case MYSQL_OPT_LOCAL_INFILE:
       intval = (value == Qfalse ? 0 : 1);
       retval = &intval;
@@ -909,6 +914,12 @@ static VALUE set_local_infile(VALUE self, VALUE value) {
 }
 
 static VALUE set_connect_timeout(VALUE self, VALUE value) {
+  long int sec;
+  Check_Type(value, T_FIXNUM);
+  sec = FIX2INT(value);
+  if (sec < 0) {
+    rb_raise(cMysql2Error, "connect_timeout must be a positive integer, you passed %ld", sec);
+  }
   return _mysql_client_options(self, MYSQL_OPT_CONNECT_TIMEOUT, value);
 }
 
@@ -926,6 +937,16 @@ static VALUE set_read_timeout(VALUE self, VALUE value) {
   return _mysql_client_options(self, MYSQL_OPT_READ_TIMEOUT, value);
 }
 
+static VALUE set_write_timeout(VALUE self, VALUE value) {
+  long int sec;
+  Check_Type(value, T_FIXNUM);
+  sec = FIX2INT(value);
+  if (sec < 0) {
+    rb_raise(cMysql2Error, "write_timeout must be a positive integer, you passed %ld", sec);
+  }
+  return _mysql_client_options(self, MYSQL_OPT_WRITE_TIMEOUT, value);
+}
+
 static VALUE set_charset_name(VALUE self, VALUE value) {
   char * charset_name;
 #ifdef HAVE_RUBY_ENCODING_H
@@ -1032,6 +1053,7 @@ void init_mysql2_client() {
   rb_define_private_method(cMysql2Client, "reconnect=", set_reconnect, 1);
   rb_define_private_method(cMysql2Client, "connect_timeout=", set_connect_timeout, 1);
   rb_define_private_method(cMysql2Client, "read_timeout=", set_read_timeout, 1);
+  rb_define_private_method(cMysql2Client, "write_timeout=", set_write_timeout, 1);
   rb_define_private_method(cMysql2Client, "local_infile=", set_local_infile, 1);
   rb_define_private_method(cMysql2Client, "charset_name=", set_charset_name, 1);
   rb_define_private_method(cMysql2Client, "ssl_set", set_ssl_options, 5);

data/lib/mysql2/client.rb

@@ -21,7 +21,7 @@ module Mysql2
       initialize_ext
 
       # Set MySQL connection options (each one is a call to mysql_options())
-      [:reconnect, :connect_timeout, :local_infile, :read_timeout].each do |key|
+      [:reconnect, :connect_timeout, :local_infile, :read_timeout, :write_timeout].each do |key|
         next unless opts.key?(key)
         send(:"#{key}=", opts[key])
       end
@@ -30,7 +30,7 @@ module Mysql2
       self.charset_name = opts[:encoding] || 'utf8'
 
       ssl_set(*opts.values_at(:sslkey, :sslcert, :sslca, :sslcapath, :sslcipher))
-      
+
       if [:user,:pass,:hostname,:dbname,:db,:sock].any?{|k| @query_options.has_key?(k) }
         warn "============= WARNING FROM mysql2 ============="
         warn "The options :user, :pass, :hostname, :dbname, :db, and :sock will be deprecated at some point in the future."

data/lib/mysql2/version.rb

@@ -1,3 +1,3 @@
 module Mysql2
-  VERSION = "0.3.12b3"
+  VERSION = "0.3.12b4"
 end

data/spec/mysql2/client_spec.rb

@@ -85,12 +85,24 @@ describe Mysql2::Client do
     @client.should respond_to(:query)
   end
 
+  it "should expect connect_timeout to be a positive integer" do
+    lambda {
+      Mysql2::Client.new(:connect_timeout => -1)
+    }.should raise_error(Mysql2::Error)
+  end
+
   it "should expect read_timeout to be a positive integer" do
     lambda {
       Mysql2::Client.new(:read_timeout => -1)
     }.should raise_error(Mysql2::Error)
   end
 
+  it "should expect write_timeout to be a positive integer" do
+    lambda {
+      Mysql2::Client.new(:write_timeout => -1)
+    }.should raise_error(Mysql2::Error)
+  end
+
   context "#query" do
     it "should let you query again if iterating is finished when streaming" do
       @client.query("SELECT 1 UNION SELECT 2", :stream => true, :cache_rows => false).each {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysql2
 version: !ruby/object:Gem::Version
-  version: 0.3.12b3
+  version: 0.3.12b4
   prerelease: 6
 platform: ruby
 authors: