ruby-mysql 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd37c2f40ef7277952c0be41848abc338e29d3a4e9da3f3eed1d1d8f61407c76
-  data.tar.gz: 754994f1cb1f5e4cb007d5f1a3d81238e626ce8d224aef23c58c8af3d5fd351f
+  metadata.gz: b0fae682668684b92f92ebf353cc0bcfaaeffc5afc922a82f6203fce60fc21ce
+  data.tar.gz: d289a2371c8cf2e60188ee6c0364640297116629c15a825b24048914b7470bc4
 SHA512:
-  metadata.gz: c31c8170682621713905f820a2816377a045b3ba489adc39d3575543483475411bdd7ecead30f806494533dd91819e8e53dad1bd3c090164b80d7600666ea1a4
-  data.tar.gz: 6f59d7638d0f09bd3c21cd34e32cae9e995f26219efc5594b3982b94562a0c3726a1258ebfff5e3b0afbe53764135d96eff0250d57d6d75289f65e3b9957e720
+  metadata.gz: 6581d6cc73e910bbce33bb6024eda12971a0757a8d53ffa79b7c2fee983c19007821250af2a717217f6213b0a8a7b34285731988fba77f67b66496a03342e035
+  data.tar.gz: 8be3f83e953ea70aa80da335f8f2b4dbb7bd23bdb463b1abf3d6625e16f73558ff485112a958ffa737c10febb115c7de7538c8994b420fdd56525052e22c440b

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [4.2.0] - 2024-12-23
+
+- Skip storing records if auto_store_result is false <https://gitlab.com/tmtms/ruby-mysql/-/merge_requests/6>
+-  Ruby 3.3 & MySQL 8.4 <https://gitlab.com/tmtms/ruby-mysql/-/merge_requests/7>
+- COM_KILL and COM_REFRESH are not supported by MySQL 8.4 <https://gitlab.com/tmtms/ruby-mysql/-/merge_requests/8>
+- add Mysql#use_result and fix Mysql::Result#size <https://gitlab.com/tmtms/ruby-mysql/-/merge_requests/9>
+- avoid warning for Ruby 3.4 <https://gitlab.com/tmtms/ruby-mysql/-/merge_requests/10>
+- bundle update and rubocop <https://gitlab.com/tmtms/ruby-mysql/-/merge_requests/11>
+
 ## [4.1.0] - 2023-10-08
 
 - Support geometry column <https://gitlab.com/tmtms/ruby-mysql/-/merge_requests/1>

data/lib/mysql/error.rb

@@ -14,7 +14,7 @@ class Mysql
         errname = errname.to_s
         next unless errname =~ prefix_re
         errno = self.const_get errname
-        excname = errname.sub(prefix_re, '').gsub(/(\A.|_.)([A-Z]+)/){$1+$2.downcase}.gsub(/_/, '')
+        excname = errname.sub(prefix_re, '').gsub(/(\A.|_.)([A-Z]+)/){$1+$2.downcase}.gsub('_', '')
         klass = Class.new self
         klass.const_set 'ERRNO', errno
         self.const_set excname, klass
@@ -908,7 +908,7 @@ class Mysql
   end
 
   ServerError.define_error_class(/\AER_/)
-  ServerError::ERROR_MAP.each_value{|v| Mysql.const_set v.name.split(/::/).last, v} # for compatibility
+  ServerError::ERROR_MAP.each_value{|v| Mysql.const_set v.name.split('::').last, v} # for compatibility
 
   # client side error
   class ClientError < Error

data/lib/mysql/protocol.rb

@@ -513,7 +513,7 @@ class Mysql
     # @return [Packet] packet data
     # @rails [ProtocolError] invalid packet sequence number
     def read
-      data = ''
+      data = +''
       len = nil
       begin
         timeout = @state == :INIT ? @opts[:connect_timeout] : @opts[:read_timeout]
@@ -554,7 +554,7 @@ class Mysql
 
     def read_timeout(len, timeout)
       return @socket.read(len) if timeout.nil? || timeout == 0
-      result = ''
+      result = +''
       e = Time.now + timeout
       while result.size < len
         now = Time.now
@@ -789,7 +789,7 @@ class Mysql
           username,
           Packet.lcs(scrambled_password),
         ]
-        pack = "VVCa23Z*A*"
+        pack = +"VVCa23Z*A*"
         if databasename
           data.push databasename
           pack.concat "Z*"
@@ -817,7 +817,7 @@ class Mysql
     class ExecutePacket
       def self.serialize(statement_id, cursor_type, values)
         nbm = null_bitmap values
-        netvalues = ""
+        netvalues = +""
         types = values.map do |v|
           t, n = Protocol.value2net v
           netvalues.concat n unless v.nil?

data/lib/mysql/result.rb

@@ -15,8 +15,9 @@ class Mysql
     def initialize(fields, protocol, record_class, **opts)
       @fields = fields
       @field_index = 0             # index of field
-      @records = []                # all records
+      @records = nil               # all records
       @index = 0                   # index of record
+      @size = 0                    # retrieved record count
       @fieldname_with_table = nil
       @protocol = protocol
       @record_class = record_class
@@ -25,6 +26,7 @@ class Mysql
 
     def retrieve
       @records = @protocol.retr_all_records(@record_class)
+      @size = @records.size
     end
 
     # ignore
@@ -34,22 +36,22 @@ class Mysql
     end
 
     # @return [Integer] number of record
-    def size
-      @records.size
-    end
+    attr_reader :size
     alias num_rows size
+    alias count size
 
     # @return [Array] current record data
     def fetch(**)
-      if @index < @records.size
+      if @records && @index < @records.size
         @records[@index] = @records[@index].to_a unless @records[@index].is_a? Array
         @index += 1
         return @records[@index-1]
       end
       rec = @protocol.retr_record(@record_class)&.to_a
       return nil unless rec
-      @records[@index] = rec
+      @records[@index] = rec if @records
       @index += 1
+      @size += 1
       return rec
     end
     alias fetch_row fetch
@@ -133,7 +135,6 @@ class Mysql
     # @private
     # @param [Array<Mysql::Field>] fields
     # @param [Mysql::Protocol] protocol
-    # @param [Boolean] auto_store_result
     def initialize(fields, protocol=nil, **opts)
       super fields, protocol, RawRecord, **opts
       return unless protocol
@@ -182,7 +183,7 @@ class Mysql
       when Field::TYPE_DATETIME, Field::TYPE_TIMESTAMP
         Time.parse(s) rescue nil
       when Field::TYPE_TIME
-        h, m, sec = s.split(/:/)
+        h, m, sec = s.split(':')
         if s =~ /\A-/
           h.to_i*3600 - m.to_i*60 - sec.to_f
         else

data/lib/mysql.rb

@@ -22,7 +22,7 @@ class Mysql
   require_relative "mysql/protocol"
   require_relative "mysql/packet"
 
-  VERSION            = -'4.1.0'             # Version number of this library
+  VERSION            = -'4.2.0'             # Version number of this library
   MYSQL_UNIX_PORT    = -"/tmp/mysql.sock"   # UNIX domain socket filename
   MYSQL_TCP_PORT     = 3306                # TCP socket port number
 
@@ -105,9 +105,6 @@ class Mysql
   # @return [Array<Mysql::Field>] fields of result set
   attr_reader :fields
 
-  # @return [Mysql::Result]
-  attr_reader :result
-
   class << self
     # Make Mysql object and connect to mysqld.
     # parameter is same as arguments for {#initialize}.
@@ -359,8 +356,7 @@ class Mysql
   # @param [Integer] pid thread id
   # @return [Mysql] self
   def kill(pid)
-    check_connection
-    @protocol.kill_command pid
+    query "KILL #{pid}"
     self
   end
 
@@ -379,11 +375,13 @@ class Mysql
     check_connection
     @fields = nil
     begin
+      @result = nil
       @protocol.query_command str
       if block
         while true
+          @result = nil
           @protocol.get_result
-          res = store_result(**opts)
+          res = result(**opts)
           block.call res if res || opts[:yield_null_result]
           break unless more_results?
         end
@@ -391,7 +389,7 @@ class Mysql
       end
       @protocol.get_result
       return self unless opts[:return_result]
-      return store_result(**opts)
+      return result(**opts)
     rescue ServerError => e
       @last_error = e
       @sqlstate = e.sqlstate
@@ -399,16 +397,32 @@ class Mysql
     end
   end
 
-  # Get all data for last query.
+  # return Mysql::Result for last query.
   # @return [Mysql::Result]
   # @return [nil] if no results
-  def store_result(**opts)
+  def result(**opts)
     return nil if @protocol.field_count.nil? || @protocol.field_count == 0
+    return @result if @result
     @fields = @protocol.retr_fields
     opts = @opts.merge(opts)
     @result = Result.new(@fields, @protocol, **opts)
   end
 
+  # return Mysql::Result for last query with all data.
+  # @return [Mysql::Result]
+  # @return [nil] if no results
+  def store_result(**opts)
+    result(auto_store_result: true, **opts.merge)
+  end
+
+  # return Mysql::Result for last query without data.
+  # Mysql::Result#data_seek, row_tell, row_seek cannot be used.
+  # @return [Mysql::Result]
+  # @return [nil] if no results
+  def use_result(**opts)
+    result(auto_store_result: false, **opts.merge)
+  end
+
   # @return [Integer] Thread ID
   def thread_id
     check_connection
@@ -437,8 +451,8 @@ class Mysql
     return nil unless more_results?
     opts = @opts.merge(opts)
     @protocol.get_result
-    @fields = nil
-    return store_result(**opts) if opts[:return_result]
+    @result = @fields = nil
+    return result(**opts) if opts[:return_result]
     true
   end
 
@@ -472,8 +486,30 @@ class Mysql
   # @param [Integer] op operation. Use Mysql::REFRESH_* value.
   # @return [Mysql] self
   def refresh(op)
-    check_connection
-    @protocol.refresh_command op
+    if server_version < 80400
+      check_connection
+      @protocol.refresh_command op
+    else
+      q = case op
+          when REFRESH_GRANT
+            "FLUSH PRIVILEGES"
+          when REFRESH_LOG
+            "FLUSH LOGS"
+          when REFRESH_TABLES
+            "FLUSH TABLES"
+          when REFRESH_HOSTS
+            "TRUNCATE TABLE performance_schema.host_cache"
+          when REFRESH_STATUS
+            "FLUSH STATUS"
+          when REFRESH_SLAVE
+            "RESET REPLICA"
+          when REFRESH_MASTER
+            "RESET BINARY LOGS AND GTIDS"
+          else
+            raise "unsupported operation for #{server_version}"
+          end
+      query q
+    end
     self
   end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mysql
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Tomita Masahiro
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-08 00:00:00.000000000 Z
+date: 2024-12-23 00:00:00.000000000 Z
 dependencies: []
 description: This is MySQL connector. pure Ruby version
 email: tommy@tmtm.org
@@ -39,7 +38,6 @@ metadata:
   documentation_uri: https://www.rubydoc.info/gems/ruby-mysql
   source_code_uri: http://gitlab.com/tmtms/ruby-mysql
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -47,15 +45,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.0.dev
-signing_key:
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: MySQL connector
 test_files: []