ruby-mysql 2.9.14 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 113de8c9b46c75bf18b833a65205517938daf47d
-  data.tar.gz: 675d64d8cc1185e7f394c4f201aa18f427b18f11
+SHA256:
+  metadata.gz: '03296aa0e624e599242e8efc5d3011b4337e161c3b7bf1c9cc81e98fa99f5052'
+  data.tar.gz: c7391d48dab125e86b97b8130556e69ceadf503e11884744b7fdf19af3b58cf1
 SHA512:
-  metadata.gz: 47b396bc40fa36e588d01899569f8b0cca6b256bb2d290fe2ce5ab44dc66a566c2b47d67f64cb8f4d2a8a0a62c352e878da681f88b89bc0a6811b12205754214
-  data.tar.gz: 2aa55a288ce9c5ca4f22be8b8a2c6750be23592a0e030b0077f622b43195691f81de20831a359098ce8a270050e3ffa4ab794439b039c267d803f0d23ad2330e
+  metadata.gz: ba1a7bad362dc1523de97aa487ee8c571649854a2bb8a9342ecd525dbda0441c9562639556dcd933f7e7c643373907144329e97c2600af30a5ae6b1cc5fb5606
+  data.tar.gz: bdea4b3d97980fea097d59525b327c275374d006ddb699efda0c359608d8588a8beba742f713f0b2721433ea5efbf9eac5db8d7f4e6d7ddbe9eeb050220e6a3d

data/README.rdoc

@@ -20,6 +20,8 @@ MySQL connector for Ruby.
 
 * MySQL/Ruby 2.8.x とほぼ互換があります。
 
+* MySQL 8.0 には対応していません。
+
 == Synopsis
 
 使用例:
@@ -42,7 +44,8 @@ MySQL connector for Ruby.
 * Mysql#options でサポートしているオプションは次のものだけです:
   Mysql::INIT_COMMAND, Mysql::OPT_CONNECT_TIMEOUT,
   Mysql::OPT_LOCAL_INFILE, Mysql::OPT_READ_TIMEOUT,
-  Mysql::OPT_WRITE_TIMEOUT, Mysql::SET_CHARSET_NAME.
+  Mysql::OPT_WRITE_TIMEOUT, Mysql::SET_CHARSET_NAME,
+  Mysql::OPT_LOAD_DATA_LOCAL_DIR.
   これら以外を指定すると "option not implementted" という warning が標準エラー出力に出力されます。
 
 * Mysql#use_result は Mysql#store_result と同じです。つまりサーバーから一気に結果セットを読み込みます。
@@ -64,5 +67,5 @@ MySQL connector for Ruby.
 == Copyright
 
 Author    :: TOMITA Masahiro <tommy@tmtm.org>
-Copyright :: Copyright (c) 2009-2012 TOMITA Masahiro
+Copyright :: Copyright (c) 2008 TOMITA Masahiro
 License   :: Ruby's

data/lib/mysql/charset.rb

@@ -296,7 +296,7 @@ class Mysql
     if defined? Encoding
 
       # @private
-      # MySQL Charset -> Ruby's Encodeing
+      # MySQL Charset -> Ruby's Encoding
       CHARSET_ENCODING = {
         "armscii8" => nil,
         "ascii"    => Encoding::US_ASCII,

data/lib/mysql/constants.rb

@@ -1,5 +1,5 @@
 # coding: ascii-8bit
-# Copyright (C) 2003-2008 TOMITA Masahiro
+# Copyright (C) 2003 TOMITA Masahiro
 # mailto:tommy@tmtm.org
 
 class Mysql
@@ -36,6 +36,7 @@ class Mysql
   COM_DAEMON              = 29
   COM_BINLOG_DUMP_GTID    = 30
   COM_RESET_CONNECTION    = 31
+  COM_CLONE               = 32
 
   # Client flag
   CLIENT_LONG_PASSWORD                  = 1         # new more secure passwords
@@ -63,32 +64,57 @@ class Mysql
   CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS   = 1 << 22   # Don't close the connection for a connection with expired password.
   CLIENT_SESSION_TRACK                  = 1 << 23   # Capable of handling server state change information. Its a hint to the server to include the state change information in Ok packet.
   CLIENT_DEPRECATE_EOF                  = 1 << 24   # Client no longer needs EOF packet
-  CLIENT_SSL_VERIFY_SERVER_CERT         = 1 << 30
-  CLIENT_REMEMBER_OPTIONS               = 1 << 31
+  CLIENT_OPTIONAL_RESULTSET_METADATA    = 1 << 25   # The client can handle optional metadata information in the resultset.
+  CLIENT_ZSTD_COMPRESSION_ALGORITHM     = 1 << 26   # Compression protocol extended to support zstd compression method
+  CLIENT_CAPABILITY_EXTENSION           = 1 << 29   # This flag will be reserved to extend the 32bit capabilities structure to 64bits.
+  CLIENT_SSL_VERIFY_SERVER_CERT         = 1 << 30   # Verify server certificate.
+  CLIENT_REMEMBER_OPTIONS               = 1 << 31   # Don't reset the options after an unsuccessful connect
 
   # Connection Option
-  OPT_CONNECT_TIMEOUT         = 0
-  OPT_COMPRESS                = 1
-  OPT_NAMED_PIPE              = 2
-  INIT_COMMAND                = 3
-  READ_DEFAULT_FILE           = 4
-  READ_DEFAULT_GROUP          = 5
-  SET_CHARSET_DIR             = 6
-  SET_CHARSET_NAME            = 7
-  OPT_LOCAL_INFILE            = 8
-  OPT_PROTOCOL                = 9
-  SHARED_MEMORY_BASE_NAME     = 10
-  OPT_READ_TIMEOUT            = 11
-  OPT_WRITE_TIMEOUT           = 12
-  OPT_USE_RESULT              = 13
-  OPT_USE_REMOTE_CONNECTION   = 14
-  OPT_USE_EMBEDDED_CONNECTION = 15
-  OPT_GUESS_CONNECTION        = 16
-  SET_CLIENT_IP               = 17
-  SECURE_AUTH                 = 18
-  REPORT_DATA_TRUNCATION      = 19
-  OPT_RECONNECT               = 20
-  OPT_SSL_VERIFY_SERVER_CERT  = 21
+  OPT_CONNECT_TIMEOUT              = 0
+  OPT_COMPRESS                     = 1
+  OPT_NAMED_PIPE                   = 2
+  INIT_COMMAND                     = 3
+  READ_DEFAULT_FILE                = 4
+  READ_DEFAULT_GROUP               = 5
+  SET_CHARSET_DIR                  = 6
+  SET_CHARSET_NAME                 = 7
+  OPT_LOCAL_INFILE                 = 8
+  OPT_PROTOCOL                     = 9
+  SHARED_MEMORY_BASE_NAME          = 10
+  OPT_READ_TIMEOUT                 = 11
+  OPT_WRITE_TIMEOUT                = 12
+  OPT_USE_RESULT                   = 13
+  REPORT_DATA_TRUNCATION           = 14
+  OPT_RECONNECT                    = 15
+  PLUGIN_DIR                       = 16
+  DEFAULT_AUTH                     = 17
+  OPT_BIND                         = 18
+  OPT_SSL_KEY                      = 19
+  OPT_SSL_CERT                     = 20
+  OPT_SSL_CA                       = 21
+  OPT_SSL_CAPATH                   = 22
+  OPT_SSL_CIPHER                   = 23
+  OPT_SSL_CRL                      = 24
+  OPT_SSL_CRLPATH                  = 25
+  OPT_CONNECT_ATTR_RESET           = 26
+  OPT_CONNECT_ATTR_ADD             = 27
+  OPT_CONNECT_ATTR_DELETE          = 28
+  SERVER_PUBLIC_KEY                = 29
+  ENABLE_CLEARTEXT_PLUGIN          = 30
+  OPT_CAN_HANDLE_EXPIRED_PASSWORDS = 31
+  OPT_MAX_ALLOWED_PACKET           = 32
+  OPT_NET_BUFFER_LENGTH            = 33
+  OPT_TLS_VERSION                  = 34
+  OPT_SSL_MODE                     = 35
+  OPT_GET_SERVER_PUBLIC_KEY        = 36
+  OPT_RETRY_COUNT                  = 37
+  OPT_OPTIONAL_RESULTSET_METADATA  = 38
+  OPT_SSL_FIPS_MODE                = 39
+  OPT_TLS_CIPHERSUITES             = 40
+  OPT_COMPRESSION_ALGORITHMS       = 41
+  OPT_ZSTD_COMPRESSION_LEVEL       = 42
+  OPT_LOAD_DATA_LOCAL_DIR          = 43
 
   # Server Option
   OPTION_MULTI_STATEMENTS_ON  = 0
@@ -133,6 +159,7 @@ class Mysql
   REFRESH_USER_RESOURCES   = 1 << 19
   REFRESH_FOR_EXPORT       = 1 << 20
   REFRESH_OPTIMIZER_COSTS  = 1 << 21
+  REFRESH_PERSIST          = 1 << 22
 
   class Field
     # Field type
@@ -156,6 +183,9 @@ class Mysql
     TYPE_TIMESTAMP2  = 17
     TYPE_DATETIME2   = 18
     TYPE_TIME2       = 19
+    TYPE_TYPED_ARRAY = 20
+    TYPE_INVALID     = 243
+    TYPE_BOOL        = 244
     TYPE_JSON        = 245
     TYPE_NEWDECIMAL  = 246
     TYPE_ENUM        = 247
@@ -171,25 +201,35 @@ class Mysql
     TYPE_INTERVAL    = TYPE_ENUM
 
     # Flag
-    NOT_NULL_FLAG         = 1
-    PRI_KEY_FLAG          = 2
-    UNIQUE_KEY_FLAG       = 4
-    MULTIPLE_KEY_FLAG     = 8
-    BLOB_FLAG             = 16
-    UNSIGNED_FLAG         = 32
-    ZEROFILL_FLAG         = 64
-    BINARY_FLAG           = 128
-    ENUM_FLAG             = 256
-    AUTO_INCREMENT_FLAG   = 512
-    TIMESTAMP_FLAG        = 1024
-    SET_FLAG              = 2048
-    NO_DEFAULT_VALUE_FLAG = 4096
-    ON_UPDATE_NOW_FLAG    = 8192
-    NUM_FLAG              = 32768
-    PART_KEY_FLAG         = 16384
-    GROUP_FLAG            = 32768
-    UNIQUE_FLAG           = 65536
-    BINCMP_FLAG           = 131072
+    NOT_NULL_FLAG                  = 1
+    PRI_KEY_FLAG                   = 2
+    UNIQUE_KEY_FLAG                = 4
+    MULTIPLE_KEY_FLAG              = 8
+    BLOB_FLAG                      = 16
+    UNSIGNED_FLAG                  = 32
+    ZEROFILL_FLAG                  = 64
+    BINARY_FLAG                    = 128
+    ENUM_FLAG                      = 256
+    AUTO_INCREMENT_FLAG            = 512
+    TIMESTAMP_FLAG                 = 1024
+    SET_FLAG                       = 2048
+    NO_DEFAULT_VALUE_FLAG          = 4096
+    ON_UPDATE_NOW_FLAG             = 8192
+    NUM_FLAG                       = 32768
+    PART_KEY_FLAG                  = 16384
+    GROUP_FLAG                     = 32768
+    UNIQUE_FLAG                    = 65536
+    BINCMP_FLAG                    = 131072
+    GET_FIXED_FIELDS_FLAG          = 1 << 18
+    FIELD_IN_PART_FUNC_FLAG        = 1 << 19
+    FIELD_IN_ADD_INDEX             = 1 << 20
+    FIELD_IS_RENAMED               = 1 << 21
+    FIELD_FLAGS_STORAGE_MEDIA_MASK = 3 << 22
+    FIELD_FLAGS_COLUMN_FORMAT_MASK = 3 << 24
+    FIELD_IS_DROPPED               = 1 << 26
+    EXPLICIT_NULL_FLAG             = 1 << 27
+    FIELD_IS_MARKED                = 1 << 28
+    NOT_SECONDARY_FLAG             = 1 << 29
   end
 
   class Stmt

data/lib/mysql/error.rb

@@ -977,7 +977,16 @@ class Mysql
     CR_AUTH_PLUGIN_CANNOT_LOAD               = 2059
     CR_DUPLICATE_CONNECTION_ATTR             = 2060
     CR_AUTH_PLUGIN_ERR                       = 2061
-    CR_ERROR_LAST                            = 2061
+    CR_INSECURE_API_ERR                      = 2062
+    CR_FILE_NAME_TOO_LONG                    = 2063
+    CR_SSL_FIPS_MODE_ERR                     = 2064
+    CR_DEPRECATED_COMPRESSION_NOT_SUPPORTED  = 2065
+    CR_COMPRESSION_WRONGLY_CONFIGURED        = 2066
+    CR_KERBEROS_USER_NOT_FOUND               = 2067
+    CR_LOAD_DATA_LOCAL_INFILE_REJECTED       = 2068
+    CR_LOAD_DATA_LOCAL_INFILE_REALPATH_FAIL  = 2069
+    CR_DNS_SRV_LOOKUP_FAILED                 = 2070
+    CR_ERROR_LAST                            = 2070
   end
 
   ClientError.define_error_class(/\ACR_/)

data/lib/mysql/protocol.rb

@@ -1,5 +1,5 @@
 # coding: ascii-8bit
-# Copyright (C) 2008-2012 TOMITA Masahiro
+# Copyright (C) 2008 TOMITA Masahiro
 # mailto:tommy@tmtm.org
 
 require "socket"
@@ -134,15 +134,17 @@ class Mysql
     # conn_timeout :: [Integer] connect timeout (sec).
     # read_timeout :: [Integer] read timeout (sec).
     # write_timeout :: [Integer] write timeout (sec).
+    # local_infile :: [String] local infile path
     # === Exception
     # [ClientError] :: connection timeout
-    def initialize(host, port, socket, conn_timeout, read_timeout, write_timeout)
+    def initialize(host, port, socket, conn_timeout, read_timeout, write_timeout, local_infile)
       @insert_id = 0
       @warning_count = 0
       @gc_stmt_queue = []   # stmt id list which GC destroy.
       set_state :INIT
       @read_timeout = read_timeout
       @write_timeout = write_timeout
+      @local_infile = local_infile
       begin
         Timeout.timeout conn_timeout do
           if host.nil? or host.empty? or host == "localhost"
@@ -180,6 +182,7 @@ class Mysql
       @server_version = init_packet.server_version.split(/\D/)[0,3].inject{|a,b|a.to_i*100+b.to_i}
       @thread_id = init_packet.thread_id
       client_flags = CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_TRANSACTIONS | CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION
+      client_flags |= CLIENT_LOCAL_FILES if @local_infile
       client_flags |= CLIENT_CONNECT_WITH_DB if db
       client_flags |= flag
       @charset = charset
@@ -230,10 +233,7 @@ class Mysql
           return res_packet.field_count
         end
         if res_packet.field_count.nil?      # LOAD DATA LOCAL INFILE
-          filename = res_packet.message
-          File.open(filename){|f| write f}
-          write nil  # EOF mark
-          read
+          send_local_file(res_packet.message)
         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
@@ -245,6 +245,19 @@ class Mysql
       end
     end
 
+    # send local file to server
+    def send_local_file(filename)
+      filename = File.absolute_path(filename)
+      if filename.start_with? @local_infile
+        File.open(filename){|f| write f}
+      else
+        raise ClientError::LoadDataLocalInfileRejected, 'LOAD DATA LOCAL INFILE file request rejected due to restrictions on access.'
+      end
+    ensure
+      write nil # EOF mark
+      read
+    end
+
     # Retrieve n fields
     # === Argument
     # n :: [Integer] number of fields

data/lib/mysql.rb

@@ -1,5 +1,5 @@
 # coding: ascii-8bit
-# Copyright (C) 2008-2012 TOMITA Masahiro
+# Copyright (C) 2008 TOMITA Masahiro
 # mailto:tommy@tmtm.org
 
 # MySQL connection class.
@@ -21,7 +21,7 @@ class Mysql
   rescue LoadError
   end
 
-  VERSION            = 20913               # Version number of this library
+  VERSION            = 21000               # Version number of this library
   MYSQL_UNIX_PORT    = "/tmp/mysql.sock"   # UNIX domain socket filename
   MYSQL_TCP_PORT     = 3306                # TCP socket port number
 
@@ -112,8 +112,8 @@ class Mysql
       warn 'unsupported flag: CLIENT_COMPRESS' if $VERBOSE
       flag &= ~CLIENT_COMPRESS
     end
-    @protocol = Protocol.new host, port, socket, @connect_timeout, @read_timeout, @write_timeout
-    @protocol.authenticate user, passwd, db, (@local_infile ? CLIENT_LOCAL_FILES : 0) | flag, @charset
+    @protocol = Protocol.new host, port, socket, @connect_timeout, @read_timeout, @write_timeout, @local_infile
+    @protocol.authenticate user, passwd, db, flag, @charset
     @charset ||= @protocol.charset
     @host_info = (host.nil? || host == "localhost") ? 'Localhost via UNIX socket' : "#{host} via TCP/IP"
     query @init_command if @init_command
@@ -158,6 +158,8 @@ class Mysql
       @connect_timeout = value
 #    when Mysql::GUESS_CONNECTION
     when Mysql::OPT_LOCAL_INFILE
+      @local_infile = value ? '' : nil
+    when Mysql::OPT_LOAD_DATA_LOCAL_DIR
       @local_infile = value
 #    when Mysql::OPT_NAMED_PIPE
 #    when Mysql::OPT_PROTOCOL

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 == 21000 }
     end
   end
 
@@ -160,6 +160,40 @@ 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))')
+      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
     test 'OPT_READ_TIMEOUT: set timeout for reading packet' do
       assert{ @m.options(Mysql::OPT_READ_TIMEOUT, 10) == @m }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mysql
 version: !ruby/object:Gem::Version
-  version: 2.9.14
+  version: 2.10.0
 platform: ruby
 authors:
 - Tomita Masahiro
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2021-10-23 00:00:00.000000000 Z
 dependencies: []
 description: This is MySQL connector. pure Ruby version
 email: tommy@tmtm.org
@@ -30,7 +30,7 @@ homepage: http://github.com/tmtm/ruby-mysql
 licenses:
 - Ruby
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -45,11 +45,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.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