ruby-mysql 2.9.13 → 2.11.1

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 == 20913 }
+      assert{ Mysql::VERSION == 21101 }
     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
@@ -160,16 +160,63 @@ class TestMysql < Test::Unit::TestCase
       @m.query("load data local infile '#{tmpf.path}' into table t")
       assert{ @m.query('select * from t').fetch_row == ['123','abc'] }
     end
+    test 'OPT_LOAD_DATA_LOCAL_DIR: client can execute LOAD DATA LOCAL INFILE query with specified directory' do
+      require 'tempfile'
+      tmpf = Tempfile.new 'mysql_spec'
+      tmpf.puts "123\tabc\n"
+      tmpf.close
+      assert{ @m.options(Mysql::OPT_LOAD_DATA_LOCAL_DIR, File.dirname(tmpf.path)) == @m }
+      @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))')
+      @m.query("load data local infile '#{tmpf.path}' into table t")
+      assert{ @m.query('select * from t').fetch_row == ['123','abc'] }
+    end
+    test 'OPT_LOAD_DATA_LOCAL_DIR: client cannot execute LOAD DATA LOCAL INFILE query without specified directory' do
+      require 'tempfile'
+      tmpf = Tempfile.new 'mysql_spec'
+      tmpf.puts "123\tabc\n"
+      tmpf.close
+      assert{ @m.options(Mysql::OPT_LOAD_DATA_LOCAL_DIR, '/hoge') == @m }
+      @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::ClientError::LoadDataLocalInfileRejected, 'LOAD DATA LOCAL INFILE file request rejected due to restrictions on access.' do
+        @m.query("load data local infile '#{tmpf.path}' into table t")
+      end
+    end
+    test 'without OPT_LOCAL_INFILE and OPT_LOAD_DATA_LOCAL_DIR: client cannot execute LOAD DATA LOCAL INFILE query' do
+      require 'tempfile'
+      tmpf = Tempfile.new 'mysql_spec'
+      tmpf.puts "123\tabc\n"
+      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))')
+      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
 
@@ -537,6 +584,10 @@ class TestMysql < Test::Unit::TestCase
     end
 
     sub_test_case '#warning_count' do
+      setup do
+        @m.query("set sql_mode=''")
+        @m.query("set sql_mode=''")  # clear warnings on previous `set' statement.
+      end
       test 'default values is zero' do
         assert{ @m.warning_count == 0 }
       end
@@ -683,7 +734,7 @@ class TestMysql < Test::Unit::TestCase
     setup do
       @m = Mysql.new(MYSQL_SERVER, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE, MYSQL_PORT, MYSQL_SOCKET)
       @m.charset = 'latin1'
-      @m.query 'create temporary table t (id int, str char(10), primary key (id))'
+      @m.query 'create temporary table t (id int default 0, str char(10), primary key (id))'
       @m.query "insert into t values (1,'abc'),(2,'defg'),(3,'hi'),(4,null)"
       @res = @m.query 'select * from t'
     end
@@ -707,7 +758,7 @@ class TestMysql < Test::Unit::TestCase
       assert{ f.def == nil }
       assert{ f.type == Mysql::Field::TYPE_LONG }
       assert{ f.length == 11 }
-      f.max_length == 1
+      assert{ f.max_length == 1 }
       assert{ f.flags == Mysql::Field::NUM_FLAG|Mysql::Field::PRI_KEY_FLAG|Mysql::Field::PART_KEY_FLAG|Mysql::Field::NOT_NULL_FLAG }
       assert{ f.decimals == 0 }
 
@@ -717,7 +768,7 @@ class TestMysql < Test::Unit::TestCase
       assert{ f.def == nil }
       assert{ f.type == Mysql::Field::TYPE_STRING }
       assert{ f.length == 10 }
-      f.max_length == 4
+      assert{ f.max_length == 4 }
       assert{ f.flags == 0 }
       assert{ f.decimals == 0 }
 
@@ -955,6 +1006,7 @@ class TestMysql < Test::Unit::TestCase
   sub_test_case 'Mysql::Stmt' do
     setup do
       @m = Mysql.new(MYSQL_SERVER, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE, MYSQL_PORT, MYSQL_SOCKET)
+      @m.query("set sql_mode=''")
       @s = @m.stmt_init
     end
 
@@ -1000,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
@@ -1559,6 +1605,16 @@ class TestMysql < Test::Unit::TestCase
       assert{ @s.entries == [[nil], [''], ['abc'], ['def'], ['abc,def'], ['abc'], ['def'], ['abc,def'], ['']] }
     end
 
+    test '#fetch json column' do
+      if @m.server_version >= 50700
+        @m.query "create temporary table t (i json)"
+        @m.query "insert into t values ('123'),('{\"a\":1,\"b\":2,\"c\":3}'),('[1,2,3]')"
+        @s.prepare 'select i from t'
+        @s.execute
+        assert{ @s.entries == [['123'], ['{"a": 1, "b": 2, "c": 3}'], ['[1, 2, 3]']] }
+      end
+    end
+
     test '#field_count' do
       @s.prepare 'select 1,2,3'
       assert{ @s.field_count == 3 }
@@ -1760,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.9.13
+  version: 2.11.1
 platform: ruby
 authors:
 - Tomita Masahiro
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2021-11-13 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
@@ -28,9 +32,9 @@ files:
 - test/test_mysql_packet.rb
 homepage: http://github.com/tmtm/ruby-mysql
 licenses:
-- Ruby's
+- Ruby
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -45,11 +49,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.1
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: MySQL connector
 test_files:
-- test/test_mysql_packet.rb
 - test/test_mysql.rb
+- test/test_mysql_packet.rb