mysql2 0.2.24 → 0.5.4

data/support/mysql_enc_to_ruby.rb

@@ -42,18 +42,23 @@ mysql_to_rb = {
   "binary"   => "ASCII-8BIT",
   "geostd8"  => "NULL",
   "cp932"    => "Windows-31J",
-  "eucjpms"  => "eucJP-ms"
+  "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]]
-  encodings[mysql_col_idx-1] = [mysql_col_idx, rb_enc]
+  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
 
 encodings.each_with_index do |encoding, idx|
@@ -65,10 +70,10 @@ encodings_with_nil.sort! do |a, b|
 end
 
 encodings_with_nil = encodings_with_nil.map do |encoding|
-  name = "NULL"
-
-  if !encoding.nil? && encoding[1] != "NULL"
-    name = "\"#{encoding[1]}\""
+  name = if encoding.nil? || encoding[1] == 'NULL'
+    'NULL'
+  else
+    "\"#{encoding[1]}\""
   end
 
   "  #{name}"
@@ -76,7 +81,6 @@ end
 
 # start printing output
 
-puts "const char *mysql2_mysql_enc_to_rb[] = {"
+puts "static const char *mysql2_mysql_enc_to_rb[] = {"
 puts encodings_with_nil.join(",\n")
 puts "};"
-puts

data/support/ruby_enc_to_mysql.rb

@@ -37,10 +37,12 @@ mysql_to_rb = {
   "binary"   => "ASCII-8BIT",
   "geostd8"  => nil,
   "cp932"    => "Windows-31J",
-  "eucjpms"  => "eucJP-ms"
+  "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,79 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: mysql2
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  version: 0.5.4
 platform: ruby
 authors:
 - Brian Lopez
+- Aaron Stone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.3
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.8.0
+date: 2022-05-03 00:00:00.000000000 Z
+dependencies: []
 description: 
-email: seniorlopez@gmail.com
+email:
+- seniorlopez@gmail.com
+- aaron@serendipity.cx
 executables: []
 extensions:
 - ext/mysql2/extconf.rb
 extra_rdoc_files: []
 files:
-- MIT-LICENSE
+- CHANGELOG.md
+- LICENSE
 - README.md
 - ext/mysql2/client.c
 - ext/mysql2/client.h
@@ -86,63 +34,51 @@ files:
 - ext/mysql2/mysql_enc_to_ruby.h
 - ext/mysql2/result.c
 - ext/mysql2/result.h
+- ext/mysql2/statement.c
+- ext/mysql2/statement.h
 - ext/mysql2/wait_for_single_fd.h
-- lib/active_record/connection_adapters/mysql2_adapter.rb
-- lib/arel/engines/sql/compilers/mysql2_compiler.rb
 - lib/mysql2.rb
 - lib/mysql2/client.rb
 - lib/mysql2/console.rb
 - lib/mysql2/em.rb
 - lib/mysql2/error.rb
+- lib/mysql2/field.rb
 - lib/mysql2/result.rb
+- lib/mysql2/statement.rb
 - lib/mysql2/version.rb
+- support/3A79BD29.asc
+- support/5072E1F5.asc
+- support/libmysql.def
 - support/mysql_enc_to_ruby.rb
 - support/ruby_enc_to_mysql.rb
-- 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/rcov.opts
-- spec/spec_helper.rb
-- spec/test_data
-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
+- "--charset=UTF-8"
 require_paths:
 - lib
 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.0.14
+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/rcov.opts
-- spec/spec_helper.rb
-- spec/test_data
+test_files: []

data/MIT-LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2010-2011 Brian Lopez - http://github.com/brianmario
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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,20 +0,0 @@
-# encoding: utf-8
-
-$LOAD_PATH.unshift 'lib'
-require 'mysql2'
-require 'timeout'
-
-threads = []
-# Should never exceed worst case 3.5 secs across all 20 threads
-Timeout.timeout(3.5) do
-  20.times do
-    threads << 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
-  threads.each{|t| t.join }
-end