mysql2 0.2.6-x86-mswin32-60 → 0.2.15-x86-mswin32-60

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
@@ -28,6 +28,24 @@ describe Mysql2::Result do
     }.should_not raise_error(Mysql2::Error)
   end
 
+  it "should respond to #count, which is aliased as #size" do
+    r = @client.query "SELECT 1"
+    r.should respond_to :count
+    r.should respond_to :size
+  end
+
+  it "should be able to return the number of rows in the result set" do
+    r = @client.query "SELECT 1"
+    r.count.should eql(1)
+    r.size.should eql(1)
+  end
+
+  context "metadata queries" do
+    it "should show tables" do
+      @result = @client.query "SHOW TABLES"
+    end
+  end
+
   context "#each" do
     it "should yield rows as hash's" do
       @result.each do |row|
@@ -79,6 +97,16 @@ describe Mysql2::Result do
       @test_result = @client.query("SELECT * FROM mysql2_test ORDER BY id DESC LIMIT 1").first
     end
 
+    it "should return nil values for NULL and strings for everything else when :cast is false" do
+      result = @client.query('SELECT null_test, tiny_int_test, bool_cast_test, int_test, date_test, enum_test FROM mysql2_test WHERE bool_cast_test = 1 LIMIT 1', :cast => false).first
+      result["null_test"].should be_nil
+      result["tiny_int_test"].should  == "1"
+      result["bool_cast_test"].should == "1"
+      result["int_test"].should       == "10"
+      result["date_test"].should      == "2010-04-04"
+      result["enum_test"].should      == "val1"
+    end
+
     it "should return nil for a NULL value" do
       @test_result['null_test'].class.should eql(NilClass)
       @test_result['null_test'].should eql(nil)
@@ -150,27 +178,69 @@ describe Mysql2::Result do
 
     it "should return Time for a DATETIME value when within the supported range" do
       @test_result['date_time_test'].class.should eql(Time)
-      @test_result['date_time_test'].strftime("%F %T").should eql('2010-04-04 11:44:00')
+      @test_result['date_time_test'].strftime("%Y-%m-%d %H:%M:%S").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")
-      r.first['test'].class.should eql(DateTime)
+    if 1.size == 4 # 32bit
+      if RUBY_VERSION =~ /1.9/
+        klass = Time
+      else
+        klass = DateTime
+      end
+
+      it "should return DateTime when timestamp is < 1901-12-13 20:45:52" do
+                                      # 1901-12-13T20:45:52 is the min for 32bit Ruby 1.8
+        r = @client.query("SELECT CAST('1901-12-13 20:45:51' AS DATETIME) as test")
+        r.first['test'].class.should eql(klass)
+      end
+
+      it "should return DateTime when timestamp is > 2038-01-19T03:14:07" do
+                                      # 2038-01-19T03:14:07 is the max for 32bit Ruby 1.8
+        r = @client.query("SELECT CAST('2038-01-19 03:14:08' AS DATETIME) as test")
+        r.first['test'].class.should eql(klass)
+      end
+    elsif 1.size == 8 # 64bit
+      if RUBY_VERSION =~ /1.9/
+        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)
+        end
+
+        it "should return Time when timestamp is > 2038-01-19T03:14:07" do
+          r = @client.query("SELECT CAST('2038-01-19 03:14:08' AS DATETIME) as test")
+          r.first['test'].class.should eql(Time)
+        end
+      else
+        it "should return Time when timestamp is > 0138-12-31 11:59:59" do
+          r = @client.query("SELECT CAST('0139-1-1 00:00:00' AS DATETIME) as test")
+          r.first['test'].class.should eql(Time)
+        end
+
+        it "should return DateTime when timestamp is < 0139-1-1T00:00:00" do
+          r = @client.query("SELECT CAST('0138-12-31 11:59:59' AS DATETIME) as test")
+          r.first['test'].class.should eql(DateTime)
+        end
+
+        it "should return Time when timestamp is > 2038-01-19T03:14:07" do
+          r = @client.query("SELECT CAST('2038-01-19 03:14:08' AS DATETIME) as test")
+          r.first['test'].class.should eql(Time)
+        end
+      end
     end
 
     it "should return Time for a TIMESTAMP value when within the supported range" do
       @test_result['timestamp_test'].class.should eql(Time)
-      @test_result['timestamp_test'].strftime("%F %T").should eql('2010-04-04 11:44:00')
+      @test_result['timestamp_test'].strftime("%Y-%m-%d %H:%M:%S").should eql('2010-04-04 11:44:00')
     end
 
     it "should return Time for a TIME value" do
       @test_result['time_test'].class.should eql(Time)
-      @test_result['time_test'].strftime("%F %T").should eql('2000-01-01 11:44:00')
+      @test_result['time_test'].strftime("%Y-%m-%d %H:%M:%S").should eql('2000-01-01 11:44:00')
     end
 
     it "should return Date for a DATE value" do
       @test_result['date_test'].class.should eql(Date)
-      @test_result['date_test'].strftime("%F").should eql('2010-04-04')
+      @test_result['date_test'].strftime("%Y-%m-%d").should eql('2010-04-04')
     end
 
     it "should return String for an ENUM value" do

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,
@@ -46,6 +45,7 @@ RSpec.configure do |config|
         PRIMARY KEY (id)
       )
     ]
+    client.query "DELETE FROM mysql2_test;"
     client.query %[
       INSERT INTO mysql2_test (
         null_test, bit_test, tiny_int_test, bool_cast_test, small_int_test, medium_int_test, int_test, big_int_test,

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,8 +1,7 @@
-gem 'rake-compiler', '~> 0.7.1'
 require "rake/extensiontask"
 
-MYSQL_VERSION = "5.1.51"
-MYSQL_MIRROR  = ENV['MYSQL_MIRROR'] || "http://mysql.he.net/"
+CONNECTOR_VERSION = "6.0.2" #"mysql-connector-c-noinstall-6.0.2-win32.zip"
+CONNECTOR_MIRROR = ENV['CONNECTOR_MIRROR'] || ENV['MYSQL_MIRROR'] || "http://mysql.he.net/"
 
 def gemspec
   @clean_gemspec ||= eval(File.read(File.expand_path('../../mysql2.gemspec', __FILE__)))
@@ -10,12 +9,12 @@ end
 
 Rake::ExtensionTask.new("mysql2", gemspec) do |ext|
   # reference where the vendored MySQL got extracted
-  mysql_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', "mysql-#{MYSQL_VERSION}-win32"))
+  connector_lib = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', "mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32"))
 
   # DRY options feed into compile or cross-compile process
   windows_options = [
-    "--with-mysql-include=#{mysql_lib}/include",
-    "--with-mysql-lib=#{mysql_lib}/lib/opt"
+    "--with-mysql-include=#{connector_lib}/include",
+    "--with-mysql-lib=#{connector_lib}/lib"
   ]
 
   # automatically add build options to avoid need of manual input
@@ -29,6 +28,24 @@ Rake::ExtensionTask.new("mysql2", gemspec) do |ext|
     # inject 1.8/1.9 pure-ruby entry point when cross compiling only
     ext.cross_compiling do |spec|
       spec.files << 'lib/mysql2/mysql2.rb'
+      spec.post_install_message = <<-POST_INSTALL_MESSAGE
+
+======================================================================================================
+
+  You've installed the binary version of #{spec.name}.
+  It was built using MySQL Connector/C version #{CONNECTOR_VERSION}.
+  It's recommended to use the exact same version to avoid potential issues.
+
+  At the time of building this gem, the necessary DLL files where available
+  in the following download:
+
+  http://dev.mysql.com/get/Downloads/Connector-C/mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32.zip/from/pick
+
+  And put lib\\libmysql.dll file in your Ruby bin directory, for example C:\\Ruby\\bin
+
+======================================================================================================
+
+      POST_INSTALL_MESSAGE
     end
   end
 

data/tasks/vendor_mysql.rake

@@ -4,9 +4,8 @@ require 'rake/extensioncompiler'
 # download mysql library and headers
 directory "vendor"
 
-file "vendor/mysql-noinstall-#{MYSQL_VERSION}-win32.zip" => ['vendor'] do |t|
-  base_version = MYSQL_VERSION.gsub(/\.[0-9]+$/, '')
-  url = "http://dev.mysql.com/get/Downloads/MySQL-#{base_version}/#{File.basename(t.name)}/from/#{MYSQL_MIRROR}/"
+file "vendor/mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32.zip" => ["vendor"] do |t|
+  url = "http://dev.mysql.com/get/Downloads/Connector-C/mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32.zip/from/#{CONNECTOR_MIRROR}/"
   when_writing "downloading #{t.name}" do
     cd File.dirname(t.name) do
       sh "wget -c #{url} || curl -C - -O #{url}"
@@ -14,11 +13,11 @@ file "vendor/mysql-noinstall-#{MYSQL_VERSION}-win32.zip" => ['vendor'] do |t|
   end
 end
 
-file "vendor/mysql-#{MYSQL_VERSION}-win32/include/mysql.h" => ["vendor/mysql-noinstall-#{MYSQL_VERSION}-win32.zip"] do |t|
+file "vendor/mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32/include/mysql.h" => ["vendor/mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32.zip"] do |t|
   full_file = File.expand_path(t.prerequisites.last)
   when_writing "creating #{t.name}" do
     cd "vendor" do
-      sh "unzip #{full_file} mysql-#{MYSQL_VERSION}-win32/bin/** mysql-#{MYSQL_VERSION}-win32/include/** mysql-#{MYSQL_VERSION}-win32/lib/**"
+      sh "unzip #{full_file} mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32/bin/** mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32/include/** mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32/lib/**"
     end
     # update file timestamp to avoid Rake perform this extraction again.
     touch t.name
@@ -26,10 +25,10 @@ file "vendor/mysql-#{MYSQL_VERSION}-win32/include/mysql.h" => ["vendor/mysql-noi
 end
 
 # clobber expanded packages
-CLOBBER.include("vendor/mysql-#{MYSQL_VERSION}-win32")
+CLOBBER.include("vendor/mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32")
 
 # vendor:mysql
-task 'vendor:mysql' => ["vendor/mysql-#{MYSQL_VERSION}-win32/include/mysql.h"]
+task 'vendor:mysql' => ["vendor/mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32/include/mysql.h"]
 
 # hook into cross compilation vendored mysql dependency
 if RUBY_PLATFORM =~ /mingw|mswin/ then

metadata

@@ -1,47 +1,138 @@
---- !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.15
+  prerelease: 
 platform: x86-mswin32-60
-authors: 
+authors:
 - Brian Lopez
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-19 00:00:00 -07:00
-default_executable: 
-dependencies: []
-
+date: 2011-11-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: eventmachine
+  requirement: &70324214809220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70324214809220
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: &70324214807620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.7
+  type: :development
+  prerelease: false
+  version_requirements: *70324214807620
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70324214806020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: *70324214806020
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70324214805220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70324214805220
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70324214804240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70324214804240
+- !ruby/object:Gem::Dependency
+  name: mysql
+  requirement: &70324214803680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70324214803680
+- !ruby/object:Gem::Dependency
+  name: do_mysql
+  requirement: &70324214803140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70324214803140
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: &70324214802580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70324214802580
+- !ruby/object:Gem::Dependency
+  name: faker
+  requirement: &70324214801940 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70324214801940
 description: 
 email: seniorlopez@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.rdoc
-files: 
+extra_rdoc_files: []
+files:
 - .gitignore
 - .rspec
+- .rvmrc
 - CHANGELOG.md
+- Gemfile
 - MIT-LICENSE
-- README.rdoc
+- README.md
 - Rakefile
-- VERSION
 - 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
@@ -51,6 +142,7 @@ files:
 - ext/mysql2/mysql2_ext.h
 - ext/mysql2/result.c
 - ext/mysql2/result.h
+- ext/mysql2/wait_for_single_fd.h
 - lib/active_record/connection_adapters/em_mysql2_adapter.rb
 - lib/active_record/connection_adapters/mysql2_adapter.rb
 - lib/active_record/fiber_patches.rb
@@ -58,9 +150,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,52 +164,54 @@ files:
 - spec/spec_helper.rb
 - tasks/benchmarks.rake
 - tasks/compile.rake
-- tasks/jeweler.rake
 - tasks/rspec.rake
 - tasks/vendor_mysql.rake
 - lib/mysql2/1.8/mysql2.so
 - lib/mysql2/1.9/mysql2.so
 - lib/mysql2/mysql2.rb
-has_rdoc: true
 homepage: http://github.com/brianmario/mysql2
 licenses: []
-
-post_install_message: 
-rdoc_options: 
+post_install_message: ! "\n======================================================================================================\n\n
+  \ You've installed the binary version of mysql2.\n  It was built using MySQL Connector/C
+  version 6.0.2.\n  It's recommended to use the exact same version to avoid potential
+  issues.\n\n  At the time of building this gem, the necessary DLL files where available\n
+  \ in the following download:\n\n  http://dev.mysql.com/get/Downloads/Connector-C/mysql-connector-c-noinstall-6.0.2-win32.zip/from/pick\n\n
+  \ And put lib\\libmysql.dll file in your Ruby bin directory, for example C:\\Ruby\\bin\n\n======================================================================================================\n\n"
+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: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3932854765410334453
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -3932854765410334453
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 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