ruby-mysql 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f95fb29b93c207b23bbc1378ce78b10ab297269f0cf24409116a69502cdf9ae8
-  data.tar.gz: 7979ccfd21194e81a4c98f90920b7dc3cdb1165201bdf7bc0d640d16fbe8ebea
+  metadata.gz: 37cc4956fc000b612b24fe104acf96abf27e0a7016cbd05c2c5e7b4ae5e0bade
+  data.tar.gz: b2c4ded73325a5c4aadce1d81af507e2a7d4144764150fde183f0e541e25e8b8
 SHA512:
-  metadata.gz: '068b6f6008f4b77dc6d34b660c8f06b73db2c06e63fc98d69d5455ceb6ab61c3924d158de4398d6b897cc2fa44d460a879b60355dbb16ac90f0af666f750467d'
-  data.tar.gz: 769105fbd5f16a4b8ab9c55c4a1243c962db3a238f05baa16d970cb2cbaadba0f0487c2daf194b53ce0bfa48639aac37cb79527da02518607a4a0a861cdd6caf
+  metadata.gz: c81163849e312cb8cb861a1c5add93fba0973d1fbf01b9296513914931134230dbf7d2d6437e72097c8426d24daab316c2756621d3302d5ee91efb72ab951cc3
+  data.tar.gz: c4e13cea550e4659db986772663b04364c8c18f51abc9442516058cbe5ebc420dd19a95e324e149ae0966edefa1259fff9274677295849834029f827667547c2

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [3.0.1] - 2022-06-18
+
+- LICENSE: correct author
+- FIX: correct LOAD DATA LOCAL INFILE result information.
+- FIX: reset SERVER_MORE_RESULTS_EXISTS when error packet is received.
+- FIX: close the socket when the connection is disconnected.
+- FIX: allow multiple results by default.
+
 ## [3.0.0] - 2021-11-16
 
 - `Mysql.new` no longer connect. use `Mysql.connect` or `Mysql#connect`.

data/lib/mysql/protocol.rb

@@ -175,7 +175,7 @@ class Mysql
       @server_version = init_packet.server_version.split(/\D/)[0,3].inject{|a,b|a.to_i*100+b.to_i}
       @server_capabilities = init_packet.server_capabilities
       @thread_id = init_packet.thread_id
-      @client_flags = CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_TRANSACTIONS | CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION | CLIENT_PLUGIN_AUTH
+      @client_flags = CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_TRANSACTIONS | CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION | CLIENT_MULTI_RESULTS | CLIENT_PS_MULTI_RESULTS | CLIENT_PLUGIN_AUTH
       @client_flags |= CLIENT_LOCAL_FILES if @opts[:local_infile] || @opts[:load_data_local_dir]
       @client_flags |= CLIENT_CONNECT_WITH_DB if @opts[:database]
       @client_flags |= @opts[:flags]
@@ -252,6 +252,7 @@ class Mysql
         end
         if res_packet.field_count.nil?      # LOAD DATA LOCAL INFILE
           send_local_file(res_packet.message)
+          res_packet = ResultPacket.parse read
         end
         @affected_rows, @insert_id, @server_status, @warning_count, @message =
           res_packet.affected_rows, res_packet.insert_id, res_packet.server_status, res_packet.warning_count, res_packet.message
@@ -273,7 +274,6 @@ class Mysql
       end
     ensure
       write nil # EOF mark
-      read
     end
 
     # Retrieve n fields
@@ -460,6 +460,7 @@ class Mysql
         raise EOFError unless ret && ret.length == len
         data.concat ret
       rescue EOFError
+        @socket.close rescue nil
         raise ClientError::ServerGoneError, 'MySQL server has gone away'
       rescue Errno::ETIMEDOUT
         raise ClientError, "read timeout"
@@ -474,6 +475,7 @@ class Mysql
           _, errno, message = data.unpack("Cva*")    # Version 4.0 Error
           @sqlstate = ""
         end
+        @server_status &= ~SERVER_MORE_RESULTS_EXISTS
         message.force_encoding(@charset.encoding)
         if Mysql::ServerError::ERROR_MAP.key? errno
           raise Mysql::ServerError::ERROR_MAP[errno].new(message, @sqlstate)
@@ -523,6 +525,7 @@ class Mysql
         @socket.sync = true
         @socket.flush
       rescue Errno::EPIPE
+        @socket.close rescue nil
         raise ClientError::ServerGoneError, 'MySQL server has gone away'
       rescue Errno::ETIMEDOUT
         raise ClientError, "write timeout"

data/lib/mysql.rb

@@ -19,7 +19,7 @@ class Mysql
   require_relative "mysql/protocol"
   require_relative "mysql/packet.rb"
 
-  VERSION            = '3.0.0'             # Version number of this library
+  VERSION            = '3.0.1'             # Version number of this library
   MYSQL_UNIX_PORT    = "/tmp/mysql.sock"   # UNIX domain socket filename
   MYSQL_TCP_PORT     = 3306                # TCP socket port number
 

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 == '3.0.0' }
+      assert{ Mysql::VERSION == '3.0.1' }
     end
   end
 
@@ -174,8 +174,12 @@ class TestMysql < Test::Unit::TestCase
       tmpf.close
       @m.local_infile = true
       @m.connect(MYSQL_SERVER, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE, MYSQL_PORT, MYSQL_SOCKET)
+      if @m.query('select @@local_infile').fetch[0] == '0'
+        omit 'skip because local_infile variable is false'
+      end
       @m.query('create temporary table t (i int, c char(10))')
       @m.query("load data local infile '#{tmpf.path}' into table t")
+      assert{ @m.info == 'Records: 1  Deleted: 0  Skipped: 0  Warnings: 0' }
       assert{ @m.query('select * from t').fetch_row == ['123','abc'] }
     end
     test 'load_data_local_dir: client can execute LOAD DATA LOCAL INFILE query with specified directory' do
@@ -185,6 +189,9 @@ class TestMysql < Test::Unit::TestCase
       tmpf.close
       @m.load_data_local_dir = File.dirname(tmpf.path)
       @m.connect(MYSQL_SERVER, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE, MYSQL_PORT, MYSQL_SOCKET)
+      if @m.query('select @@local_infile').fetch[0] == '0'
+        omit 'skip because local_infile variable is false'
+      end
       @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'] }
@@ -196,6 +203,9 @@ class TestMysql < Test::Unit::TestCase
       tmpf.close
       @m.load_data_local_dir = '/hoge'
       @m.connect(MYSQL_SERVER, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE, MYSQL_PORT, MYSQL_SOCKET)
+      if @m.query('select @@local_infile').fetch[0] == '0'
+        omit 'skip because local_infile variable is false'
+      end
       @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")
@@ -207,6 +217,9 @@ class TestMysql < Test::Unit::TestCase
       tmpf.puts "123\tabc\n"
       tmpf.close
       @m.connect(MYSQL_SERVER, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE, MYSQL_PORT, MYSQL_SOCKET)
+      if @m.query('select @@local_infile').fetch[0] == '0'
+        omit 'skip because local_infile variable is false'
+      end
       @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
@@ -550,6 +563,30 @@ class TestMysql < Test::Unit::TestCase
     end
   end
 
+  test 'multiple statement error' do
+    m = Mysql.connect(MYSQL_SERVER, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE, MYSQL_PORT, MYSQL_SOCKET)
+    m.set_server_option(Mysql::OPTION_MULTI_STATEMENTS_ON)
+    res = m.query 'select 1; select hoge; select 2'
+    assert{ res.entries == [['1']] }
+    assert{ m.more_results? == true }
+    assert_raise(Mysql::ServerError::BadFieldError){ m.next_result }
+    assert{ m.more_results? == false }
+  end
+
+  test 'procedure returns multiple results' do
+    m = Mysql.connect(MYSQL_SERVER, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE, MYSQL_PORT, MYSQL_SOCKET)
+    m.query 'drop procedure if exists test_proc'
+    m.query 'create procedure test_proc() begin select 1 as a; select 2 as b; end'
+    res = m.query 'call test_proc()'
+    assert{ res.entries == [['1']] }
+    assert{ m.more_results? == true }
+    assert{ m.next_result == true }
+    assert{ m.store_result.entries == [['2']] }
+    assert{ m.more_results? == true }
+    assert{ m.next_result == true }
+    assert{ m.more_results? == false }
+  end
+
   sub_test_case 'Mysql::Result' do
     setup do
       @m = Mysql.connect(MYSQL_SERVER, MYSQL_USER, MYSQL_PASSWORD, MYSQL_DATABASE, MYSQL_PORT, MYSQL_SOCKET)
@@ -828,7 +865,7 @@ class TestMysql < Test::Unit::TestCase
 
     teardown do
       @s.close if @s rescue nil
-      @m.close if @m
+      @m.close if @m rescue nil
     end
 
     test '#affected_rows returns number of affected records' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mysql
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Tomita Masahiro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-16 00:00:00.000000000 Z
+date: 2022-06-18 00:00:00.000000000 Z
 dependencies: []
 description: This is MySQL connector. pure Ruby version
 email: tommy@tmtm.org
@@ -35,7 +35,7 @@ licenses:
 - Ruby
 metadata:
   homepage_uri: http://github.com/tmtm/ruby-mysql
-  documentation_uri: https://www.rubydoc.info/github/tmtm/ruby-mysql/
+  documentation_uri: https://www.rubydoc.info/gems/ruby-mysql
   source_code_uri: http://github.com/tmtm/ruby-mysql
 post_install_message:
 rdoc_options: []
@@ -52,7 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: MySQL connector