mysql2 0.2.6 → 0.2.7

data/spec/em/em_fiber_spec.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+if defined? EventMachine && defined? Fiber
+  require 'spec_helper'
+  require 'mysql2/em_fiber'
+
+  describe Mysql2::EM::Fiber::Client do
+    it 'should support queries' do
+      results = []
+      EM.run do
+        Fiber.new {
+          client1 = Mysql2::EM::Fiber::Client.new
+          results = client1.query "SELECT sleep(0.1) as first_query"
+          EM.stop_event_loop
+        }.resume
+      end
+
+      results.first.keys.should include("first_query")
+    end
+  end
+else
+  puts "Either EventMachine or Fibers not available. Skipping tests that use them."
+end

data/spec/mysql2/client_spec.rb

@@ -85,7 +85,19 @@ describe Mysql2::Client do
     @client.should respond_to(:query)
   end
 
+  it "should expect read_timeout to be a positive integer" do
+    lambda {
+      Mysql2::Client.new(:read_timeout => -1)
+    }.should raise_error(Mysql2::Error)
+  end
+
   context "#query" do
+    it "should only accept strings as the query parameter" do
+      lambda {
+        @client.query ["SELECT 'not right'"]
+      }.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))
@@ -118,6 +130,13 @@ describe Mysql2::Client do
       }.should raise_error(Mysql2::Error)
     end
 
+    it "should timeout if we wait longer than :read_timeout" do
+      client = Mysql2::Client.new(:read_timeout => 1)
+      lambda {
+        client.query("SELECT sleep(2)")
+      }.should raise_error(Mysql2::Error)
+    end
+
     # XXX this test is not deterministic (because Unix signal handling is not)
     # and may fail on a loaded system
     if RUBY_PLATFORM !~ /mingw|mswin/
@@ -271,7 +290,7 @@ describe Mysql2::Client do
 
   it "should raise a Mysql2::Error exception upon connection failure" do
     lambda {
-      bad_client = Mysql2::Client.new :host => "dfjhdi9wrhw", :username => 'asdfasdf8d2h'
+      bad_client = Mysql2::Client.new :host => "localhost", :username => 'asdfasdf8d2h', :password => 'asdfasdfw42'
     }.should raise_error(Mysql2::Error)
 
     lambda {
@@ -345,4 +364,28 @@ describe Mysql2::Client do
       @client.affected_rows.should eql(1)
     end
   end
+
+  it "should respond to #thread_id" do
+    @client.should respond_to(:thread_id)
+  end
+
+  it "#thread_id should be a Fixnum" do
+    @client.thread_id.class.should eql(Fixnum)
+  end
+
+  it "should respond to #ping" do
+    @client.should respond_to(:ping)
+  end
+
+  it "#thread_id should return a boolean" do
+    @client.ping.should eql(true)
+    @client.close
+    @client.ping.should eql(false)
+  end
+
+if RUBY_VERSION =~ /1.9/
+  it "should respond to #encoding" do
+    @client.should respond_to(:encoding)
+  end
+end
 end

data/spec/mysql2/error_spec.rb

@@ -3,13 +3,25 @@ require 'spec_helper'
 
 describe Mysql2::Error do
   before(:each) do
-    @error = Mysql2::Error.new "testing"
+    @client = Mysql2::Client.new :encoding => "utf8"
+    begin
+      @client.query("HAHAHA")
+    rescue Mysql2::Error => e
+      @error = e
+    end
+
+    @client2 = Mysql2::Client.new :encoding => "big5"
+    begin
+      @client2.query("HAHAHA")
+    rescue Mysql2::Error => e
+      @error2 = e
+    end
   end
-  
+
   it "should respond to #error_number" do
     @error.should respond_to(:error_number)
   end
-  
+
   it "should respond to #sql_state" do
     @error.should respond_to(:sql_state)
   end
@@ -22,4 +34,36 @@ describe Mysql2::Error do
   it "should alias #message to #error" do
     @error.should respond_to(:error)
   end
+
+  if RUBY_VERSION =~ /1.9/
+    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)
+        @error2.message.encoding.should eql(@client2.encoding)
+      else
+        @error.message.encoding.should eql(Encoding.default_internal)
+        @error2.message.encoding.should eql(Encoding.default_internal)
+      end
+    end
+
+    it "#error encoding should match the connection's encoding, or Encoding.default_internal if set" do
+      if Encoding.default_internal.nil?
+        @error.error.encoding.should eql(@client.encoding)
+        @error2.error.encoding.should eql(@client2.encoding)
+      else
+        @error.error.encoding.should eql(Encoding.default_internal)
+        @error2.error.encoding.should eql(Encoding.default_internal)
+      end
+    end
+
+    it "#sql_state encoding should match the connection's encoding, or Encoding.default_internal if set" do
+      if Encoding.default_internal.nil?
+        @error.sql_state.encoding.should eql(@client.encoding)
+        @error2.sql_state.encoding.should eql(@client2.encoding)
+      else
+        @error.sql_state.encoding.should eql(Encoding.default_internal)
+        @error2.sql_state.encoding.should eql(Encoding.default_internal)
+      end
+    end
+  end
 end

data/spec/mysql2/result_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe Mysql2::Result do
   before(:each) do
-    @client = Mysql2::Client.new :host => "localhost", :username => "root"
+    @client = Mysql2::Client.new :host => "localhost", :username => "root", :database => 'test'
   end
 
   before(:each) do
@@ -153,8 +153,23 @@ describe Mysql2::Result do
       @test_result['date_time_test'].strftime("%F %T").should eql('2010-04-04 11:44:00')
     end
 
-    it "should return DateTime for a DATETIME value when outside the supported range" do
-      r = @client.query("SELECT CAST('1901-1-1 01:01:01' AS DATETIME) as test")
+    it "should return DateTime for a DATETIME value when outside the supported range, Time if otherwise" do
+      if RUBY_PLATFORM =~ /mswin/
+        inside_year = 1970
+        outside_year = inside_year-1
+      else
+        inside_year = 1902
+        outside_year = inside_year-1
+      end
+      r = @client.query("SELECT CAST('#{inside_year}-1-1 01:01:01' AS DATETIME) as test")
+      if defined?(RUBY_ENGINE) && RUBY_ENGINE =~ /rbx/
+        klass = DateTime
+      else
+        klass = Time
+      end
+      r.first['test'].class.should eql(klass)
+
+      r = @client.query("SELECT CAST('#{outside_year}-1-1 01:01:01' AS DATETIME) as test")
       r.first['test'].class.should eql(DateTime)
     end
 

data/spec/spec_helper.rb

@@ -1,13 +1,12 @@
 # encoding: UTF-8
 
-$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
 require 'rspec'
 require 'mysql2'
 require 'timeout'
 
 RSpec.configure do |config|
   config.before(:all) do
-    client = Mysql2::Client.new :database => 'test'
+    client = Mysql2::Client.new :host => "localhost", :username => "root", :database => 'test'
     client.query %[
       CREATE TABLE IF NOT EXISTS mysql2_test (
         id MEDIUMINT NOT NULL AUTO_INCREMENT,

data/tasks/benchmarks.rake

@@ -1,8 +1,20 @@
+BENCHMARKS = Dir["#{File.dirname(__FILE__)}/../benchmark/*.rb"].map do |path|
+  File.basename(path, '.rb')
+end.select { |x| x != 'setup_db' }
+
 namespace :bench do
-  [ :active_record, :escape, :query_with_mysql_casting,
-    :query_without_mysql_casting, :sequel, :allocations,
-    :thread_alone].each do |feature|
+  BENCHMARKS.each do |feature|
       desc "Run #{feature} benchmarks"
       task(feature){ ruby "benchmark/#{feature}.rb" }
   end
+
+  task :all do
+    BENCHMARKS.each do |feature|
+      ruby "benchmark/#{feature}.rb"
+    end
+  end
+
+  task :setup do
+    ruby 'benchmark/setup_db'
+  end
 end

data/tasks/compile.rake

@@ -1,4 +1,3 @@
-gem 'rake-compiler', '~> 0.7.1'
 require "rake/extensiontask"
 
 MYSQL_VERSION = "5.1.51"

metadata

@@ -1,40 +1,121 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mysql2
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 6
-  version: 0.2.6
+version: !ruby/object:Gem::Version
+  version: 0.2.7
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Brian Lopez
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-19 00:00:00 -07:00
+date: 2011-03-28 00:00:00.000000000 -07:00
 default_executable: 
-dependencies: []
-
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: &2161341260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2161341260
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: &2161340760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: *2161340760
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2161340340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2161340340
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &2161339880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2161339880
+- !ruby/object:Gem::Dependency
+  name: mysql
+  requirement: &2161339460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2161339460
+- !ruby/object:Gem::Dependency
+  name: do_mysql
+  requirement: &2161339040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2161339040
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: &2161338620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2161338620
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: &2161338200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2161338200
 description: 
 email: seniorlopez@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/mysql2/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .gitignore
 - .rspec
+- .rvmrc
 - CHANGELOG.md
+- Gemfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - benchmark/active_record.rb
 - benchmark/allocations.rb
 - benchmark/escape.rb
@@ -58,9 +139,12 @@ files:
 - lib/mysql2.rb
 - lib/mysql2/client.rb
 - lib/mysql2/em.rb
+- lib/mysql2/em_fiber.rb
 - lib/mysql2/error.rb
 - lib/mysql2/result.rb
+- lib/mysql2/version.rb
 - mysql2.gemspec
+- spec/em/em_fiber_spec.rb
 - spec/em/em_spec.rb
 - spec/mysql2/client_spec.rb
 - spec/mysql2/error_spec.rb
@@ -69,49 +153,42 @@ files:
 - spec/spec_helper.rb
 - tasks/benchmarks.rake
 - tasks/compile.rake
-- tasks/jeweler.rake
 - tasks/rspec.rake
 - tasks/vendor_mysql.rake
 has_rdoc: true
 homepage: http://github.com/brianmario/mysql2
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: A simple, fast Mysql library for Ruby, binding to libmysql
-test_files: 
+test_files:
+- examples/eventmachine.rb
+- examples/threaded.rb
+- spec/em/em_fiber_spec.rb
 - spec/em/em_spec.rb
 - spec/mysql2/client_spec.rb
 - spec/mysql2/error_spec.rb
 - spec/mysql2/result_spec.rb
+- spec/rcov.opts
 - spec/spec_helper.rb
-- examples/eventmachine.rb
-- examples/threaded.rb