mysql2 0.3.8 → 0.4.10

data/support/mysql_enc_to_ruby.rb

@@ -0,0 +1,81 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'mysql2'
+
+user, pass, host, port = ENV.values_at('user', 'pass', 'host', 'port')
+
+mysql_to_rb = {
+  "big5"     => "Big5",
+  "dec8"     => "NULL",
+  "cp850"    => "CP850",
+  "hp8"      => "NULL",
+  "koi8r"    => "KOI8-R",
+  "latin1"   => "ISO-8859-1",
+  "latin2"   => "ISO-8859-2",
+  "swe7"     => "NULL",
+  "ascii"    => "US-ASCII",
+  "ujis"     => "eucJP-ms",
+  "sjis"     => "Shift_JIS",
+  "hebrew"   => "ISO-8859-8",
+  "tis620"   => "TIS-620",
+  "euckr"    => "EUC-KR",
+  "koi8u"    => "KOI8-R",
+  "gb2312"   => "GB2312",
+  "greek"    => "ISO-8859-7",
+  "cp1250"   => "Windows-1250",
+  "gbk"      => "GBK",
+  "latin5"   => "ISO-8859-9",
+  "armscii8" => "NULL",
+  "utf8"     => "UTF-8",
+  "ucs2"     => "UTF-16BE",
+  "cp866"    => "IBM866",
+  "keybcs2"  => "NULL",
+  "macce"    => "macCentEuro",
+  "macroman" => "macRoman",
+  "cp852"    => "CP852",
+  "latin7"   => "ISO-8859-13",
+  "utf8mb4"  => "UTF-8",
+  "cp1251"   => "Windows-1251",
+  "utf16"    => "UTF-16",
+  "cp1256"   => "Windows-1256",
+  "cp1257"   => "Windows-1257",
+  "utf32"    => "UTF-32",
+  "binary"   => "ASCII-8BIT",
+  "geostd8"  => "NULL",
+  "cp932"    => "Windows-31J",
+  "eucjpms"  => "eucJP-ms",
+}
+
+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]
+end
+
+encodings.each_with_index do |encoding, idx|
+  encodings_with_nil[idx] = (encoding || [idx, "NULL"])
+end
+
+encodings_with_nil.sort! do |a, b|
+  a[0] <=> b[0]
+end
+
+encodings_with_nil = encodings_with_nil.map do |encoding|
+  name = if encoding.nil? || encoding[1] == 'NULL'
+    'NULL'
+  else
+    "\"#{encoding[1]}\""
+  end
+
+  "  #{name}"
+end
+
+# start printing output
+
+puts "static const char *mysql2_mysql_enc_to_rb[] = {"
+puts encodings_with_nil.join(",\n")
+puts "};"

data/support/ruby_enc_to_mysql.rb

@@ -0,0 +1,61 @@
+mysql_to_rb = {
+  "big5"     => "Big5",
+  "dec8"     => nil,
+  "cp850"    => "CP850",
+  "hp8"      => nil,
+  "koi8r"    => "KOI8-R",
+  "latin1"   => "ISO-8859-1",
+  "latin2"   => "ISO-8859-2",
+  "swe7"     => nil,
+  "ascii"    => "US-ASCII",
+  "ujis"     => "eucJP-ms",
+  "sjis"     => "Shift_JIS",
+  "hebrew"   => "ISO-8859-8",
+  "tis620"   => "TIS-620",
+  "euckr"    => "EUC-KR",
+  "koi8u"    => "KOI8-R",
+  "gb2312"   => "GB2312",
+  "greek"    => "ISO-8859-7",
+  "cp1250"   => "Windows-1250",
+  "gbk"      => "GBK",
+  "latin5"   => "ISO-8859-9",
+  "armscii8" => nil,
+  "utf8"     => "UTF-8",
+  "ucs2"     => "UTF-16BE",
+  "cp866"    => "IBM866",
+  "keybcs2"  => nil,
+  "macce"    => "macCentEuro",
+  "macroman" => "macRoman",
+  "cp852"    => "CP852",
+  "latin7"   => "ISO-8859-13",
+  "utf8mb4"  => "UTF-8",
+  "cp1251"   => "Windows-1251",
+  "utf16"    => "UTF-16",
+  "cp1256"   => "Windows-1256",
+  "cp1257"   => "Windows-1257",
+  "utf32"    => "UTF-32",
+  "binary"   => "ASCII-8BIT",
+  "geostd8"  => nil,
+  "cp932"    => "Windows-31J",
+  "eucjpms"  => "eucJP-ms",
+}
+
+puts <<-header
+%readonly-tables
+%enum
+%define lookup-function-name mysql2_mysql_enc_name_to_rb
+%define hash-function-name mysql2_mysql_enc_name_to_rb_hash
+%struct-type
+struct mysql2_mysql_enc_name_to_rb_map { const char *name; const char *rb_name; }
+%%
+header
+
+mysql_to_rb.each do |mysql, ruby|
+  if ruby.nil?
+    name = "NULL"
+  else
+    name = "\"#{ruby}\""
+  end
+
+  puts "#{mysql}, #{name}"
+end

metadata

@@ -1,247 +1,128 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mysql2
-version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 8
-  version: 0.3.8
+version: !ruby/object:Gem::Version
+  version: 0.4.10
 platform: ruby
-authors: 
+authors:
 - Brian Lopez
+- Aaron Stone
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-09 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake-compiler
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 7
-        - 7
-        version: 0.7.7
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: activerecord
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: mysql
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: do_mysql
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: sequel
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: faker
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id009
+date: 2017-11-14 00:00:00.000000000 Z
+dependencies: []
 description: 
-email: seniorlopez@gmail.com
+email:
+- seniorlopez@gmail.com
+- aaron@serendipity.cx
 executables: []
-
-extensions: 
+extensions:
 - ext/mysql2/extconf.rb
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .rspec
-- .rvmrc
-- .travis.yml
+files:
 - CHANGELOG.md
-- Gemfile
-- MIT-LICENSE
+- LICENSE
 - README.md
-- Rakefile
-- benchmark/active_record.rb
-- benchmark/active_record_threaded.rb
-- benchmark/allocations.rb
-- benchmark/escape.rb
-- benchmark/query_with_mysql_casting.rb
-- benchmark/query_without_mysql_casting.rb
-- benchmark/sequel.rb
-- benchmark/setup_db.rb
-- benchmark/threaded.rb
 - examples/eventmachine.rb
 - examples/threaded.rb
 - ext/mysql2/client.c
 - ext/mysql2/client.h
 - ext/mysql2/extconf.rb
+- ext/mysql2/infile.c
+- ext/mysql2/infile.h
 - ext/mysql2/mysql2_ext.c
 - ext/mysql2/mysql2_ext.h
+- ext/mysql2/mysql_enc_name_to_ruby.h
+- 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/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
-- mysql2.gemspec
+- 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
-- tasks/benchmarks.rake
-- tasks/compile.rake
-- tasks/rspec.rake
-- tasks/vendor_mysql.rake
-has_rdoc: true
+- 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/5072E1F5.asc
+- support/libmysql.def
+- support/mysql_enc_to_ruby.rb
+- support/ruby_enc_to_mysql.rb
 homepage: http://github.com/brianmario/mysql2
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options:
+- "--charset=UTF-8"
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.5.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A simple, fast Mysql library for Ruby, binding to libmysql
-test_files: 
+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

data/.gitignore

@@ -1,12 +0,0 @@
-Makefile
-*.dSYM
-*.o
-*.bundle
-*.so
-*.a
-*.rbc
-mkmf.log
-pkg/
-tmp
-vendor
-lib/mysql2/mysql2.rb

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---colour
---fail-fast

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.3@mysql2 --create

data/.travis.yml

@@ -1,7 +0,0 @@
-rvm:
-  - 1.8.7
-  - 1.9.2
-  - 1.9.3
-  - ree
-before_script:
-  - "mysql -e 'create database test;' >/dev/null"

data/Gemfile

@@ -1,3 +0,0 @@
-source :rubygems
-
-gemspec

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/Rakefile

@@ -1,5 +0,0 @@
-# encoding: UTF-8
-require 'rake'
-
-# Load custom tasks
-Dir['tasks/*.rake'].sort.each { |f| load f }

data/benchmark/active_record.rb

@@ -1,51 +0,0 @@
-# encoding: UTF-8
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
-require 'rubygems'
-require 'benchmark'
-require 'active_record'
-
-ActiveRecord::Base.default_timezone = :local
-ActiveRecord::Base.time_zone_aware_attributes = true
-
-number_of = 10
-mysql2_opts = {
-  :adapter => 'mysql2',
-  :database => 'test'
-}
-mysql_opts = {
-  :adapter => 'mysql',
-  :database => 'test'
-}
-
-class Mysql2Model < ActiveRecord::Base
-  set_table_name :mysql2_test
-end
-
-class MysqlModel < ActiveRecord::Base
-  set_table_name :mysql2_test
-end
-
-Benchmark.bmbm do |x|
-  x.report "Mysql2" do
-    Mysql2Model.establish_connection(mysql2_opts)
-    number_of.times do
-      Mysql2Model.all(:limit => 1000).each{ |r|
-        r.attributes.keys.each{ |k|
-          r.send(k.to_sym)
-        }
-      }
-    end
-  end
-
-  x.report "Mysql" do
-    MysqlModel.establish_connection(mysql_opts)
-    number_of.times do
-      MysqlModel.all(:limit => 1000).each{ |r|
-        r.attributes.keys.each{ |k|
-          r.send(k.to_sym)
-        }
-      }
-    end
-  end
-end

data/benchmark/active_record_threaded.rb

@@ -1,42 +0,0 @@
-# encoding: UTF-8
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
-require 'rubygems'
-require 'benchmark'
-require 'active_record'
-
-times = 25
-
-
-# mysql2
-mysql2_opts = {
-  :adapter => 'mysql2',
-  :database => 'test',
-  :pool => times
-}
-ActiveRecord::Base.establish_connection(mysql2_opts)
-x = Benchmark.realtime do
-  threads = []
-  times.times do
-    threads << Thread.new { ActiveRecord::Base.connection.execute("select sleep(1)") }
-  end
-  threads.each {|t| t.join }
-end
-puts "mysql2: #{x} seconds"
-
-
-# mysql
-mysql2_opts = {
-  :adapter => 'mysql',
-  :database => 'test',
-  :pool => times
-}
-ActiveRecord::Base.establish_connection(mysql2_opts)
-x = Benchmark.realtime do
-  threads = []
-  times.times do
-    threads << Thread.new { ActiveRecord::Base.connection.execute("select sleep(1)") }
-  end
-  threads.each {|t| t.join }
-end
-puts "mysql: #{x} seconds"

data/benchmark/allocations.rb

@@ -1,33 +0,0 @@
-# encoding: UTF-8
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
-raise Mysql2::Mysql2Error.new("GC allocation benchmarks only supported on Ruby 1.9!") unless RUBY_VERSION =~ /1\.9/
-
-require 'rubygems'
-require 'benchmark'
-require 'active_record'
-
-ActiveRecord::Base.default_timezone = :local
-ActiveRecord::Base.time_zone_aware_attributes = true
-
-class Mysql2Model < ActiveRecord::Base
-  set_table_name :mysql2_test
-end
-
-def bench_allocations(feature, iterations = 10, &blk)
-  puts "GC overhead for #{feature}"
-  Mysql2Model.establish_connection(:adapter => 'mysql2', :database => 'test')
-  GC::Profiler.clear
-  GC::Profiler.enable
-  iterations.times{ blk.call }
-  GC::Profiler.report(STDOUT)
-  GC::Profiler.disable
-end
-
-bench_allocations('coercion') do
-  Mysql2Model.all(:limit => 1000).each{ |r|
-    r.attributes.keys.each{ |k|
-      r.send(k.to_sym)
-    }
-  }
-end

data/benchmark/escape.rb

@@ -1,36 +0,0 @@
-# encoding: UTF-8
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
-require 'rubygems'
-require 'benchmark'
-require 'mysql'
-require 'mysql2'
-require 'do_mysql'
-
-def run_escape_benchmarks(str, number_of = 1000)
-  Benchmark.bmbm do |x|
-    mysql = Mysql.new("localhost", "root")
-    x.report "Mysql #{str.inspect}" do
-      number_of.times do
-        mysql.quote str
-      end
-    end
-
-    mysql2 = Mysql2::Client.new(:host => "localhost", :username => "root")
-    x.report "Mysql2 #{str.inspect}" do
-      number_of.times do
-        mysql2.escape str
-      end
-    end
-
-    do_mysql = DataObjects::Connection.new("mysql://localhost/test")
-    x.report "do_mysql #{str.inspect}" do
-      number_of.times do
-        do_mysql.quote_string str
-      end
-    end
-  end
-end
-
-run_escape_benchmarks "abc'def\"ghi\0jkl%mno"
-run_escape_benchmarks "clean string"