ruby-mysql 2.10.0 → 2.11.0

data/test/test_mysql.rb

@@ -20,7 +20,7 @@ MYSQL_SOCKET   = ENV['MYSQL_SOCKET']
 class TestMysql < Test::Unit::TestCase
   sub_test_case 'Mysql::VERSION' do
     test 'returns client version' do
-      assert{ Mysql::VERSION == 21000 }
+      assert{ Mysql::VERSION == 21100 }
     end
   end
 
@@ -140,8 +140,8 @@ class TestMysql < Test::Unit::TestCase
     end
     test 'OPT_CONNECT_TIMEOUT: set timeout for connecting' do
       assert{ @m.options(Mysql::OPT_CONNECT_TIMEOUT, 0.1) == @m }
-      stub(UNIXSocket).new{ sleep 1}
-      stub(TCPSocket).new{ sleep 1}
+      stub(Socket).tcp{ raise Errno::ETIMEDOUT }
+      stub(Socket).unix{ raise Errno::ETIMEDOUT }
       assert_raise Mysql::ClientError, 'connection timeout' do
         @m.connect(MYSQL_SERVER, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE, MYSQL_PORT, MYSQL_SOCKET)
       end
@@ -190,20 +190,33 @@ class TestMysql < Test::Unit::TestCase
       tmpf.close
       @m.connect(MYSQL_SERVER, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE, MYSQL_PORT, MYSQL_SOCKET)
       @m.query('create temporary table t (i int, c char(10))')
-      assert_raise Mysql::ServerError::NotAllowedCommand, 'The used command is not allowed with this MySQL version' do
-        @m.query("load data local infile '#{tmpf.path}' into table t")
+      if @m.server_version >= 80000
+        assert_raise Mysql::ServerError, 'Loading local data is disabled; this must be enabled on both the client and server sides' do
+          @m.query("load data local infile '#{tmpf.path}' into table t")
+        end
+      else
+        assert_raise Mysql::ServerError::NotAllowedCommand, 'The used command is not allowed with this MySQL version' do
+          @m.query("load data local infile '#{tmpf.path}' into table t")
+        end
       end
     end
     test 'OPT_READ_TIMEOUT: set timeout for reading packet' do
-      assert{ @m.options(Mysql::OPT_READ_TIMEOUT, 10) == @m }
+      assert{ @m.options(Mysql::OPT_READ_TIMEOUT, 1) == @m }
+      @m.connect(MYSQL_SERVER, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE, MYSQL_PORT, MYSQL_SOCKET)
+      @m.query("select 123").entries
     end
     test 'OPT_WRITE_TIMEOUT: set timeout for writing packet' do
-      assert{ @m.options(Mysql::OPT_WRITE_TIMEOUT, 10) == @m }
+      assert{ @m.options(Mysql::OPT_WRITE_TIMEOUT, 1) == @m }
+      @m.connect(MYSQL_SERVER, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE, MYSQL_PORT, MYSQL_SOCKET)
+      @m.query("select 123").entries
     end
     test 'SET_CHARSET_NAME: set charset for connection' do
-      assert{ @m.options(Mysql::SET_CHARSET_NAME, 'utf8') == @m }
+      assert{ @m.options(Mysql::SET_CHARSET_NAME, 'utf8mb3') == @m }
       @m.connect(MYSQL_SERVER, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE, MYSQL_PORT, MYSQL_SOCKET)
-      assert{ @m.query('select @@character_set_connection').fetch_row == ['utf8'] }
+      assert do
+        @m.query('select @@character_set_connection').fetch_row == ['utf8mb3'] ||
+          @m.query('select @@character_set_connection').fetch_row == ['utf8']
+      end
     end
   end
 
@@ -1039,12 +1052,6 @@ class TestMysql < Test::Unit::TestCase
         assert{ @s.fetch == [123, 9, 1, 20091208100446] }
       end
 
-      test '(Fixnum) make result format to be Integer value' do
-        @s.bind_result Fixnum, Fixnum, Fixnum, Fixnum
-        @s.execute
-        assert{ @s.fetch == [123, 9, 1, 20091208100446] }
-      end
-
       test '(String) make result format to be String value' do
         @s.bind_result String, String, String, String
         @s.execute
@@ -1809,13 +1816,19 @@ class TestMysql < Test::Unit::TestCase
       end
 
       teardown do
+        v =  $VERBOSE
+        $VERBOSE = false
         Encoding.default_internal = @default_internal
+        $VERBOSE = v
       end
 
       sub_test_case 'default_internal is CP932' do
         setup do
           @m.prepare("insert into t (utf8,cp932,eucjp,bin) values (?,?,?,?)").execute @utf8, @cp932, @eucjp, @bin
+          v =  $VERBOSE
+          $VERBOSE = false
           Encoding.default_internal = 'CP932'
+          $VERBOSE = v
         end
         test 'is converted to CP932' do
           assert @m.query('select "あいう"').fetch == ["\x82\xA0\x82\xA2\x82\xA4".force_encoding("CP932")]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mysql
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Tomita Masahiro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-23 00:00:00.000000000 Z
+date: 2021-10-31 00:00:00.000000000 Z
 dependencies: []
 description: This is MySQL connector. pure Ruby version
 email: tommy@tmtm.org
@@ -19,6 +19,10 @@ extra_rdoc_files:
 files:
 - README.rdoc
 - lib/mysql.rb
+- lib/mysql/authenticator.rb
+- lib/mysql/authenticator/caching_sha2_password.rb
+- lib/mysql/authenticator/mysql_native_password.rb
+- lib/mysql/authenticator/sha256_password.rb
 - lib/mysql/charset.rb
 - lib/mysql/constants.rb
 - lib/mysql/error.rb