mysql2 0.3.12b4 → 0.3.12b5

data/spec/mysql2/error_spec.rb

@@ -35,7 +35,7 @@ describe Mysql2::Error do
     @error.should respond_to(:error)
   end
 
-  if RUBY_VERSION =~ /1.9/
+  unless RUBY_VERSION =~ /1.8/
     it "#message encoding should match the connection's encoding, or Encoding.default_internal if set" do
       if Encoding.default_internal.nil?
         @error.message.encoding.should eql(@client.encoding)

data/spec/mysql2/result_spec.rb

@@ -234,7 +234,7 @@ describe Mysql2::Result do
     end
 
     if 1.size == 4 # 32bit
-      if RUBY_VERSION =~ /1.9/
+      unless RUBY_VERSION =~ /1.8/
         klass = Time
       else
         klass = DateTime
@@ -252,7 +252,7 @@ describe Mysql2::Result do
         r.first['test'].class.should eql(klass)
       end
     elsif 1.size == 8 # 64bit
-      if RUBY_VERSION =~ /1.9/
+      unless RUBY_VERSION =~ /1.8/
         it "should return Time when timestamp is < 1901-12-13 20:45:52" do
           r = @client.query("SELECT CAST('1901-12-13 20:45:51' AS DATETIME) as test")
           r.first['test'].class.should eql(Time)

data/support/mysql_enc_to_ruby.rb

@@ -0,0 +1,82 @@
+$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 = "NULL"
+
+  if !encoding.nil? && encoding[1] != "NULL"
+    name = "\"#{encoding[1]}\""
+  end
+
+  "  #{name}"
+end
+
+# start printing output
+
+puts "const char *mysql2_mysql_enc_to_rb[] = {"
+puts encodings_with_nil.join(",\n")
+puts "};"
+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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mysql2
 version: !ruby/object:Gem::Version
-  version: 0.3.12b4
+  version: 0.3.12b5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,119 +42,39 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.7
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: do_mysql
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sequel
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: faker
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.0
 description: 
 email: seniorlopez@gmail.com
 executables: []
@@ -162,33 +82,16 @@ extensions:
 - ext/mysql2/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rbenv-version
-- .rspec
-- .rvmrc
-- .travis.yml
 - CHANGELOG.md
-- Gemfile
-- Gemfile.lock
 - MIT-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/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/wait_for_single_fd.h
@@ -198,7 +101,10 @@ files:
 - lib/mysql2/error.rb
 - lib/mysql2/result.rb
 - lib/mysql2/version.rb
-- mysql2.gemspec
+- 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/mysql2/client_spec.rb
@@ -206,10 +112,6 @@ files:
 - spec/mysql2/result_spec.rb
 - spec/rcov.opts
 - spec/spec_helper.rb
-- tasks/benchmarks.rake
-- tasks/compile.rake
-- tasks/rspec.rake
-- tasks/vendor_mysql.rake
 homepage: http://github.com/brianmario/mysql2
 licenses: []
 post_install_message: 
@@ -245,3 +147,4 @@ test_files:
 - spec/mysql2/result_spec.rb
 - spec/rcov.opts
 - spec/spec_helper.rb
+has_rdoc: 

data/.gitignore

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

data/.rbenv-version

@@ -1 +0,0 @@
-1.9.3

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/Gemfile.lock

@@ -1,61 +0,0 @@
-PATH
-  remote: .
-  specs:
-    mysql2 (0.3.12b4)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.2.1)
-      activesupport (= 3.2.1)
-      builder (~> 3.0.0)
-    activerecord (3.2.1)
-      activemodel (= 3.2.1)
-      activesupport (= 3.2.1)
-      arel (~> 3.0.0)
-      tzinfo (~> 0.3.29)
-    activesupport (3.2.1)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    addressable (2.2.6)
-    arel (3.0.0)
-    builder (3.0.0)
-    data_objects (0.10.8)
-      addressable (~> 2.1)
-    diff-lcs (1.1.3)
-    do_mysql (0.10.8)
-      data_objects (= 0.10.8)
-    eventmachine (0.12.10)
-    faker (1.0.1)
-      i18n (~> 0.4)
-    i18n (0.6.0)
-    multi_json (1.0.4)
-    mysql (2.8.1)
-    rake (0.8.7)
-    rake-compiler (0.7.9)
-      rake
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    sequel (3.32.0)
-    tzinfo (0.3.31)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord
-  do_mysql
-  eventmachine
-  faker
-  mysql
-  mysql2!
-  rake (= 0.8.7)
-  rake-compiler (~> 0.7.7)
-  rspec
-  sequel