Merge pull request #706 from carsonreinke/timeout_nil

Allow nil for timeouts instead of casting to zero

Author: sodabrew

lib/mysql2/client.rb

@@ -36,7 +36,7 @@ def initialize(opts = {})
         when :reconnect, :local_infile, :secure_auth
           send(:"#{key}=", !!opts[key]) # rubocop:disable Style/DoubleNegation
         when :connect_timeout, :read_timeout, :write_timeout
-          send(:"#{key}=", opts[key].to_i)
+          send(:"#{key}=", opts[key]) unless opts[key].nil?
         else
           send(:"#{key}=", opts[key])
         end

spec/mysql2/client_spec.rb

@@ -352,6 +352,12 @@ def run_gc
     }.to raise_error(Mysql2::Error)
   end
 
+  it "should allow nil read_timeout" do
+    client = Mysql2::Client.new(:read_timeout => nil)
+
+    expect(client.read_timeout).to be_nil
+  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.to_a