mysql2 0.4.10 → 0.5.4

data/lib/mysql2/statement.rb

@@ -1,16 +1,8 @@
 module Mysql2
   class Statement
-    include Enumerable
-
-    if Thread.respond_to?(:handle_interrupt)
-      def execute(*args)
-        Thread.handle_interrupt(::Mysql2::Util::TimeoutError => :never) do
-          _execute(*args)
-        end
-      end
-    else
-      def execute(*args)
-        _execute(*args)
+    def execute(*args, **kwargs)
+      Thread.handle_interrupt(::Mysql2::Util::TIMEOUT_ERROR_NEVER) do
+        _execute(*args, **kwargs)
       end
     end
   end

data/lib/mysql2/version.rb

@@ -1,3 +1,3 @@
 module Mysql2
-  VERSION = "0.4.10"
+  VERSION = "0.5.4".freeze
 end

data/lib/mysql2.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
 require 'date'
 require 'bigdecimal'
-require 'rational' unless RUBY_VERSION >= '1.9.2'
 
 # Load libmysql.dll before requiring mysql2/mysql2.so
 # This gives a chance to be flexible about the load path
@@ -13,16 +11,23 @@ if RUBY_PLATFORM =~ /mswin|mingw/
     ENV['RUBY_MYSQL2_LIBMYSQL_DLL']
   elsif File.exist?(File.expand_path('../vendor/libmysql.dll', File.dirname(__FILE__)))
     # Use vendor/libmysql.dll if it exists, convert slashes for Win32 LoadLibrary
-    File.expand_path('../vendor/libmysql.dll', File.dirname(__FILE__)).tr('/', '\\')
+    File.expand_path('../vendor/libmysql.dll', File.dirname(__FILE__))
+  elsif defined?(RubyInstaller)
+    # RubyInstaller-2.4+ native build doesn't need DLL preloading
   else
     # This will use default / system library paths
     'libmysql.dll'
   end
 
-  require 'Win32API'
-  LoadLibrary = Win32API.new('Kernel32', 'LoadLibrary', ['P'], 'I')
-  if 0 == LoadLibrary.call(dll_path)
-    abort "Failed to load libmysql.dll from #{dll_path}"
+  if dll_path
+    require 'fiddle'
+    kernel32 = Fiddle.dlopen 'kernel32'
+    load_library = Fiddle::Function.new(
+      kernel32['LoadLibraryW'], [Fiddle::TYPE_VOIDP], Fiddle::TYPE_INT,
+    )
+    if load_library.call(dll_path.encode('utf-16le')).zero?
+      abort "Failed to load libmysql.dll from #{dll_path}"
+    end
   end
 end
 
@@ -71,14 +76,12 @@ module Mysql2
     # Timeout::ExitException was removed in Ruby 2.3.0, 2.2.3, and 2.1.8,
     # but is present in earlier 2.1.x and 2.2.x, so we provide a shim.
     #
-    if Thread.respond_to?(:handle_interrupt)
-      require 'timeout'
-      # rubocop:disable Style/ConstantName
-      TimeoutError = if defined?(::Timeout::ExitException)
-        ::Timeout::ExitException
-      else
-        ::Timeout::Error
-      end
+    require 'timeout'
+    TIMEOUT_ERROR_CLASS = if defined?(::Timeout::ExitException)
+      ::Timeout::ExitException
+    else
+      ::Timeout::Error
     end
+    TIMEOUT_ERROR_NEVER = { TIMEOUT_ERROR_CLASS => :never }.freeze
   end
 end

data/support/3A79BD29.asc

@@ -0,0 +1,49 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: SKS 1.1.6
+Comment: Hostname: pgp.mit.edu
+
+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
+sTSKHe+QnnnoFmu4gnmDU31i
+=Xqbo
+-----END PGP PUBLIC KEY BLOCK-----

data/support/5072E1F5.asc

@@ -1,5 +1,5 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1
 
 mQGiBD4+owwRBAC14GIfUfCyEDSIePvEW3SAFUdJBtoQHH/nJKZyQT7h9bPlUWC3
 RODjQReyCITRrdwyrKUGku2FmeVGwn2u2WmDMNABLnpprWPkBdCk96+OmSLN9brZ
@@ -11,9 +11,9 @@ kYpXBACmWpP8NJTkamEnPCia2ZoOHODANwpUkP43I7jsDmgtobZX9qnrAXw+uNDI
 QJEXM6FSbi0LLtZciNlYsafwAPEOMDKpMqAK6IyisNtPvaLd8lH0bPAnWqcyefep
 rv0sxxqUEMcM3o7wwgfN83POkDasDbs3pjwPhxvhz6//62zQJ7Q2TXlTUUwgUmVs
 ZWFzZSBFbmdpbmVlcmluZyA8bXlzcWwtYnVpbGRAb3NzLm9yYWNsZS5jb20+iGwE
-ExECACwCGyMCHgECF4ACGQEGCwkIBwMCBhUKCQgCAwUWAgMBAAUCWKcFIAUJHirJ
-FAAKCRCMcY07UHLh9VcFAJ46pUyVd8BZ2r5CppMC1tmyQ3ceRgCfVPwuVsiS0VER
-5WUqtAQDt+DoetCIaQQTEQIAKQIbIwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAhkB
+ExECACwCGyMCHgECF4ACGQEGCwkIBwMCBhUKCQgCAwUWAgMBAAUCXEBY+wUJI87e
+5AAKCRCMcY07UHLh9RZPAJ9uvm0zlzfCN+DHxHVaoFLFjdVYTQCfborsC9tmEZYa
+whhogjeBkZkorbyIaQQTEQIAKQIbIwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAhkB
 BQJTAdRmBQkaZsvLAAoJEIxxjTtQcuH1X4MAoKNLWAbCBUj96637kv6Xa/fJuX5m
 AJwPtmgDfjUe2iuhXdTrFEPT19SB6ohmBBMRAgAmAhsjBgsJCAcDAgQVAggDBBYC
 AwECHgECF4AFAk53PioFCRP7AhUACgkQjHGNO1By4fUmzACeJdfqgc9gWTUhgmcM
@@ -428,5 +428,5 @@ GoaU9u41oyZTIiXPiFidJoIZCh7fdurP8pn3X+R5HUNXMr7M+ba8lSNxce/F3kmH
 0L7rsKqdh9d/aVxhJINJ+inVDnrXWVoXu9GBjT8Nco1iU9SIVAQYEQIADAUCTnc9
 7QUJE/sBuAASB2VHUEcAAQEJEIxxjTtQcuH1FJsAmwWK9vmwRJ/y9gTnJ8PWf0BV
 roUTAKClYAhZuX2nUNwH4vlEJQHDqYa5yQ==
-=HfUN
+=ghXk
 -----END PGP PUBLIC KEY BLOCK-----

data/support/mysql_enc_to_ruby.rb

@@ -43,16 +43,21 @@ mysql_to_rb = {
   "geostd8"  => "NULL",
   "cp932"    => "Windows-31J",
   "eucjpms"  => "eucJP-ms",
+  "utf16le"  => "UTF-16LE",
+  "gb18030"  => "GB18030",
 }
 
-client     = Mysql2::Client.new(:username => user, :password => pass, :host => host, :port => port.to_i)
-collations = client.query "SHOW COLLATION", :as => :array
+client     = Mysql2::Client.new(username: user, password: pass, host: host, port: port.to_i)
+collations = client.query "SHOW COLLATION", as: :array
 encodings  = Array.new(collations.to_a.last[2].to_i)
 encodings_with_nil = Array.new(encodings.size)
 
 collations.each do |collation|
   mysql_col_idx = collation[2].to_i
-  rb_enc = mysql_to_rb[collation[1]]
+  rb_enc = mysql_to_rb.fetch(collation[1]) do |mysql_enc|
+    $stderr.puts "WARNING: Missing mapping for collation \"#{collation[0]}\" with encoding \"#{mysql_enc}\" and id #{mysql_col_idx}, assuming NULL"
+    "NULL"
+  end
   encodings[mysql_col_idx - 1] = [mysql_col_idx, rb_enc]
 end
 

data/support/ruby_enc_to_mysql.rb

@@ -38,9 +38,11 @@ mysql_to_rb = {
   "geostd8"  => nil,
   "cp932"    => "Windows-31J",
   "eucjpms"  => "eucJP-ms",
+  "utf16le"  => "UTF-16LE",
+  "gb18030"  => "GB18030",
 }
 
-puts <<-header
+puts <<-HEADER
 %readonly-tables
 %enum
 %define lookup-function-name mysql2_mysql_enc_name_to_rb
@@ -48,13 +50,13 @@ puts <<-header
 %struct-type
 struct mysql2_mysql_enc_name_to_rb_map { const char *name; const char *rb_name; }
 %%
-header
+HEADER
 
 mysql_to_rb.each do |mysql, ruby|
-  if ruby.nil?
-    name = "NULL"
+  name = if ruby.nil?
+    "NULL"
   else
-    name = "\"#{ruby}\""
+    "\"#{ruby}\""
   end
 
   puts "#{mysql}, #{name}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysql2
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.5.4
 platform: ruby
 authors:
 - Brian Lopez
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-14 00:00:00.000000000 Z
+date: 2022-05-03 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -23,8 +23,6 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
-- examples/eventmachine.rb
-- examples/threaded.rb
 - ext/mysql2/client.c
 - ext/mysql2/client.h
 - ext/mysql2/extconf.rb
@@ -48,37 +46,21 @@ files:
 - lib/mysql2/result.rb
 - lib/mysql2/statement.rb
 - lib/mysql2/version.rb
-- spec/configuration.yml.example
-- spec/em/em_spec.rb
-- spec/my.cnf.example
-- spec/mysql2/client_spec.rb
-- spec/mysql2/error_spec.rb
-- spec/mysql2/result_spec.rb
-- spec/mysql2/statement_spec.rb
-- spec/rcov.opts
-- spec/spec_helper.rb
-- spec/ssl/ca-cert.pem
-- spec/ssl/ca-key.pem
-- spec/ssl/ca.cnf
-- spec/ssl/cert.cnf
-- spec/ssl/client-cert.pem
-- spec/ssl/client-key.pem
-- spec/ssl/client-req.pem
-- spec/ssl/gen_certs.sh
-- spec/ssl/pkcs8-client-key.pem
-- spec/ssl/pkcs8-server-key.pem
-- spec/ssl/server-cert.pem
-- spec/ssl/server-key.pem
-- spec/ssl/server-req.pem
-- spec/test_data
+- support/3A79BD29.asc
 - support/5072E1F5.asc
 - support/libmysql.def
 - support/mysql_enc_to_ruby.rb
 - support/ruby_enc_to_mysql.rb
-homepage: http://github.com/brianmario/mysql2
+homepage: https://github.com/brianmario/mysql2
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/brianmario/mysql2/issues
+  changelog_uri: https://github.com/brianmario/mysql2/releases/tag/0.5.4
+  documentation_uri: https://www.rubydoc.info/gems/mysql2/0.5.4
+  homepage_uri: https://github.com/brianmario/mysql2
+  source_code_uri: https://github.com/brianmario/mysql2/tree/0.5.4
+  msys2_mingw_dependencies: libmariadbclient
 post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
@@ -88,41 +70,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: A simple, fast Mysql library for Ruby, binding to libmysql
-test_files:
-- examples/eventmachine.rb
-- examples/threaded.rb
-- spec/configuration.yml.example
-- spec/em/em_spec.rb
-- spec/my.cnf.example
-- spec/mysql2/client_spec.rb
-- spec/mysql2/error_spec.rb
-- spec/mysql2/result_spec.rb
-- spec/mysql2/statement_spec.rb
-- spec/rcov.opts
-- spec/spec_helper.rb
-- spec/ssl/ca-cert.pem
-- spec/ssl/ca-key.pem
-- spec/ssl/ca.cnf
-- spec/ssl/cert.cnf
-- spec/ssl/client-cert.pem
-- spec/ssl/client-key.pem
-- spec/ssl/client-req.pem
-- spec/ssl/gen_certs.sh
-- spec/ssl/pkcs8-client-key.pem
-- spec/ssl/pkcs8-server-key.pem
-- spec/ssl/server-cert.pem
-- spec/ssl/server-key.pem
-- spec/ssl/server-req.pem
-- spec/test_data
+test_files: []

data/examples/eventmachine.rb

@@ -1,21 +0,0 @@
-# encoding: utf-8
-
-$LOAD_PATH.unshift 'lib'
-
-require 'rubygems'
-require 'eventmachine'
-require 'mysql2/em'
-
-EM.run do
-  client1 = Mysql2::EM::Client.new
-  defer1 = client1.query "SELECT sleep(3) as first_query"
-  defer1.callback do |result|
-    puts "Result: #{result.to_a.inspect}"
-  end
-
-  client2 = Mysql2::EM::Client.new
-  defer2 = client2.query "SELECT sleep(1) second_query"
-  defer2.callback do |result|
-    puts "Result: #{result.to_a.inspect}"
-  end
-end

data/examples/threaded.rb

@@ -1,18 +0,0 @@
-# encoding: utf-8
-
-$LOAD_PATH.unshift 'lib'
-require 'mysql2'
-require 'timeout'
-
-# Should never exceed worst case 3.5 secs across all 20 threads
-Timeout.timeout(3.5) do
-  20.times.map do
-    Thread.new do
-      overhead = rand(3)
-      puts ">> thread #{Thread.current.object_id} query, #{overhead} sec overhead"
-      # 3 second overhead per query
-      Mysql2::Client.new(:host => "localhost", :username => "root").query("SELECT sleep(#{overhead}) as result")
-      puts "<< thread #{Thread.current.object_id} result, #{overhead} sec overhead"
-    end
-  end.each(&:join)
-end

data/spec/configuration.yml.example

@@ -1,11 +0,0 @@
-root:
-  host: localhost
-  username: root
-  password:
-  database: test
-
-user:
-  host: localhost
-  username: LOCALUSERNAME
-  password:
-  database: mysql2_test

data/spec/em/em_spec.rb

@@ -1,136 +0,0 @@
-# encoding: UTF-8
-require 'spec_helper'
-begin
-  require 'eventmachine'
-  require 'mysql2/em'
-
-  RSpec.describe Mysql2::EM::Client do
-    it "should support async queries" do
-      results = []
-      EM.run do
-        client1 = Mysql2::EM::Client.new DatabaseCredentials['root']
-        defer1 = client1.query "SELECT sleep(0.1) as first_query"
-        defer1.callback do |result|
-          results << result.first
-          client1.close
-          EM.stop_event_loop
-        end
-
-        client2 = Mysql2::EM::Client.new DatabaseCredentials['root']
-        defer2 = client2.query "SELECT sleep(0.025) second_query"
-        defer2.callback do |result|
-          results << result.first
-          client2.close
-        end
-      end
-
-      expect(results[0].keys).to include("second_query")
-      expect(results[1].keys).to include("first_query")
-    end
-
-    it "should support queries in callbacks" do
-      results = []
-      EM.run do
-        client = Mysql2::EM::Client.new DatabaseCredentials['root']
-        defer1 = client.query "SELECT sleep(0.025) as first_query"
-        defer1.callback do |result|
-          results << result.first
-          defer2 = client.query "SELECT sleep(0.025) as second_query"
-          defer2.callback do |r|
-            results << r.first
-            client.close
-            EM.stop_event_loop
-          end
-        end
-      end
-
-      expect(results[0].keys).to include("first_query")
-      expect(results[1].keys).to include("second_query")
-    end
-
-    it "should not swallow exceptions raised in callbacks" do
-      expect {
-        EM.run do
-          client = Mysql2::EM::Client.new DatabaseCredentials['root']
-          defer = client.query "SELECT sleep(0.1) as first_query"
-          defer.callback do
-            client.close
-            fail 'some error'
-          end
-          defer.errback do
-            # This _shouldn't_ be run, but it needed to prevent the specs from
-            # freezing if this test fails.
-            EM.stop_event_loop
-          end
-        end
-      }.to raise_error('some error')
-    end
-
-    context 'when an exception is raised by the client' do
-      let(:client) { Mysql2::EM::Client.new DatabaseCredentials['root'] }
-      let(:error) { StandardError.new('some error') }
-      before { allow(client).to receive(:async_result).and_raise(error) }
-      after { client.close }
-
-      it "should swallow exceptions raised in by the client" do
-        errors = []
-        EM.run do
-          defer = client.query "SELECT sleep(0.1) as first_query"
-          defer.callback do
-            # This _shouldn't_ be run, but it is needed to prevent the specs from
-            # freezing if this test fails.
-            EM.stop_event_loop
-          end
-          defer.errback do |err|
-            errors << err
-            EM.stop_event_loop
-          end
-        end
-        expect(errors).to eq([error])
-      end
-
-      it "should fail the deferrable" do
-        callbacks_run = []
-        EM.run do
-          defer = client.query "SELECT sleep(0.025) as first_query"
-          EM.add_timer(0.1) do
-            defer.callback do
-              callbacks_run << :callback
-              # This _shouldn't_ be run, but it is needed to prevent the specs from
-              # freezing if this test fails.
-              EM.stop_event_loop
-            end
-            defer.errback do
-              callbacks_run << :errback
-              EM.stop_event_loop
-            end
-          end
-        end
-        expect(callbacks_run).to eq([:errback])
-      end
-    end
-
-    it "should not raise error when closing client with no query running" do
-      callbacks_run = []
-      EM.run do
-        client = Mysql2::EM::Client.new DatabaseCredentials['root']
-        defer = client.query("select sleep(0.025)")
-        defer.callback do
-          callbacks_run << :callback
-        end
-        defer.errback do
-          callbacks_run << :errback
-        end
-        EM.add_timer(0.1) do
-          expect(callbacks_run).to eq([:callback])
-          expect {
-            client.close
-          }.not_to raise_error
-          EM.stop_event_loop
-        end
-      end
-    end
-  end
-rescue LoadError
-  puts "EventMachine not installed, skipping the specs that use it"
-end

data/spec/my.cnf.example

@@ -1,9 +0,0 @@
-[root]
-host=localhost
-user=LOCALUSERNAME
-password=
-
-[client]
-host=localhost
-user=LOCALUSERNAME
-password=