mysql2 0.5.0 → 0.5.4

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,6 +43,8 @@ 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)
@@ -52,7 +54,10 @@ 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,6 +38,8 @@ mysql_to_rb = {
   "geostd8"  => nil,
   "cp932"    => "Windows-31J",
   "eucjpms"  => "eucJP-ms",
+  "utf16le"  => "UTF-16LE",
+  "gb18030"  => "GB18030",
 }
 
 puts <<-HEADER

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysql2
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.4
 platform: ruby
 authors:
 - Brian Lopez
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-20 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,29 +46,7 @@ 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
@@ -79,6 +55,11 @@ homepage: https://github.com/brianmario/mysql2
 licenses:
 - MIT
 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:
@@ -96,34 +77,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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,19 +0,0 @@
-$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,16 +0,0 @@
-$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
-  Array.new(20) 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,135 +0,0 @@
-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 do
-        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
-            raise '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
-      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 do
-            client.close
-          end.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=