mysql2 0.2.19b4 → 0.2.19b5

data/lib/mysql2/version.rb

@@ -1,3 +1,3 @@
 module Mysql2
-  VERSION = "0.2.19b4"
+  VERSION = "0.2.19b5"
 end

data/spec/mysql2/client_spec.rb

@@ -6,12 +6,30 @@ describe Mysql2::Client do
     @client = Mysql2::Client.new DatabaseCredentials['root']
   end
 
+  it "should raise an exception upon connection failure" do
+    lambda {
+      # The odd local host IP address forces the mysql client library to
+      # use a TCP socket rather than a domain socket.
+      Mysql2::Client.new DatabaseCredentials['root'].merge('host' => '127.0.0.2', 'port' => 999999)
+    }.should raise_error(Mysql2::Error)
+  end
+
   if defined? Encoding
     it "should raise an exception on create for invalid encodings" do
       lambda {
         c = Mysql2::Client.new(:encoding => "fake")
       }.should raise_error(Mysql2::Error)
     end
+
+    it "should not raise an exception on create for a valid encoding" do
+      lambda {
+        c = Mysql2::Client.new(:encoding => "utf8")
+      }.should_not raise_error(Mysql2::Error)
+
+      lambda {
+        c = Mysql2::Client.new(:encoding => "big5")
+      }.should_not raise_error(Mysql2::Error)
+    end
   end
 
   it "should accept connect flags and pass them to #connect" do
@@ -85,6 +103,31 @@ describe Mysql2::Client do
     @client.should respond_to(:query)
   end
 
+  it "should respond to #warning_count" do
+    @client.should respond_to(:warning_count)
+  end
+
+  context "#warning_count" do
+    context "when no warnings" do
+      before(:each) do
+        @client.query('select 1')
+      end
+      it "should 0" do
+        @client.warning_count.should == 0
+      end
+    end
+    context "when has a warnings" do
+      before(:each) do
+        # "the statement produces extra information that can be viewed by issuing a SHOW WARNINGS"
+        # http://dev.mysql.com/doc/refman/5.0/en/explain-extended.html
+        @client.query("explain extended select 1")
+      end
+      it "should > 0" do
+        @client.warning_count.should > 0
+      end
+    end
+  end
+
   it "should expect connect_timeout to be a positive integer" do
     lambda {
       Mysql2::Client.new(:connect_timeout => -1)
@@ -126,9 +169,26 @@ describe Mysql2::Client do
       }.should raise_error(TypeError)
     end
 
-    it "should accept an options hash that inherits from Mysql2::Client.default_query_options" do
-      @client.query "SELECT 1", :something => :else
-      @client.query_options.should eql(@client.query_options.merge(:something => :else))
+    it "should not retain query options set on a query for subsequent queries, but should retain it in the result" do
+      result = @client.query "SELECT 1", :something => :else
+      @client.query_options[:something].should be_nil
+      result.instance_variable_get('@query_options').should eql(@client.query_options.merge(:something => :else))
+      @client.instance_variable_get('@current_query_options').should eql(@client.query_options.merge(:something => :else))
+
+      result = @client.query "SELECT 1"
+      result.instance_variable_get('@query_options').should eql(@client.query_options)
+      @client.instance_variable_get('@current_query_options').should eql(@client.query_options)
+    end
+
+    it "should allow changing query options for subsequent queries" do
+      @client.query_options.merge!(:something => :else)
+      result = @client.query "SELECT 1"
+      @client.query_options[:something].should eql(:else)
+      result.instance_variable_get('@query_options')[:something].should eql(:else)
+
+      # Clean up after this test
+      @client.query_options.delete(:something)
+      @client.query_options[:something].should be_nil
     end
 
     it "should return results as a hash by default" do
@@ -245,15 +305,47 @@ describe Mysql2::Client do
         }.should_not raise_error(Mysql2::Error)
       end
 
+      it "should handle Timeouts without leaving the connection hanging if reconnect is set to true after construction true" do
+        client = Mysql2::Client.new(DatabaseCredentials['root'])
+        begin
+          Timeout.timeout(1) do
+            client.query("SELECT sleep(2)")
+          end
+        rescue Timeout::Error
+        end
+
+        lambda {
+          client.query("SELECT 1")
+        }.should raise_error(Mysql2::Error)
+
+        client.reconnect = true
+
+        begin
+          Timeout.timeout(1) do
+            client.query("SELECT sleep(2)")
+          end
+        rescue Timeout::Error
+        end
+
+        lambda {
+          client.query("SELECT 1")
+        }.should_not raise_error(Mysql2::Error)
+
+      end
+
       it "threaded queries should be supported" do
         threads, results = [], {}
+        lock = Mutex.new
         connect = lambda{
           Mysql2::Client.new(DatabaseCredentials['root'])
         }
         Timeout.timeout(0.7) do
           5.times {
             threads << Thread.new do
-              results[Thread.current.object_id] = connect.call.query("SELECT sleep(0.5) as result")
+              result = connect.call.query("SELECT sleep(0.5) as result")
+              lock.synchronize do
+                results[Thread.current.object_id] = result
+              end
             end
           }
         end
@@ -281,14 +373,6 @@ describe Mysql2::Client do
         result = @client.async_result
         result.class.should eql(Mysql2::Result)
       end
-
-      it "should not allow options to be set on an open connection" do
-        lambda {
-          @client.escape ""
-          @client.query("SELECT 1")
-          @client.options(0, 0)
-        }.should raise_error(Mysql2::Error)
-      end
     end
 
     context "Multiple results sets" do
@@ -313,6 +397,31 @@ describe Mysql2::Client do
 
         @multi_client.query( "select 3 as 'next'").first.should == { 'next' => 3 }
       end
+
+      it "will raise on query if there are outstanding results to read" do
+        @multi_client.query("SELECT 1; SELECT 2; SELECT 3")
+        lambda {
+          @multi_client.query("SELECT 4")
+        }.should raise_error(Mysql2::Error)
+      end
+
+      it "#abandon_results! should work" do
+        @multi_client.query("SELECT 1; SELECT 2; SELECT 3")
+        @multi_client.abandon_results!
+        lambda {
+          @multi_client.query("SELECT 4")
+        }.should_not raise_error(Mysql2::Error)
+      end
+
+      it "#more_results? should work" do
+        @multi_client.query( "select 1 as 'set_1'; select 2 as 'set_2'")
+        @multi_client.more_results?.should == true
+ 
+        @multi_client.next_result
+        @multi_client.store_result
+ 
+        @multi_client.more_results?.should == false
+      end
     end
   end
 
@@ -354,7 +463,7 @@ describe Mysql2::Client do
       }.should_not raise_error(SystemStackError)
     end
 
-    if RUBY_VERSION =~ /1.9/
+    unless RUBY_VERSION =~ /1.8/
       it "should carry over the original string's encoding" do
         str = "abc'def\"ghi\0jkl%mno"
         escaped = Mysql2::Client.escape(str)
@@ -571,7 +680,7 @@ describe Mysql2::Client do
     @client.ping.should eql(false)
   end
 
-  if RUBY_VERSION =~ /1.9/
+  unless RUBY_VERSION =~ /1.8/
     it "should respond to #encoding" do
       @client.should respond_to(:encoding)
     end

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.2.19b4
+  version: 0.2.19b5
   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
@@ -203,7 +106,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_fiber_spec.rb
 - spec/em/em_spec.rb
@@ -212,10 +118,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: 
@@ -252,3 +154,4 @@ test_files:
 - spec/mysql2/result_spec.rb
 - spec/rcov.opts
 - spec/spec_helper.rb
+has_rdoc: