mysql2 0.2.24 → 0.3.0

data/spec/spec_helper.rb

@@ -3,35 +3,15 @@
 require 'rspec'
 require 'mysql2'
 require 'timeout'
-require 'yaml'
-DatabaseCredentials = YAML.load_file('spec/configuration.yml')
 
 RSpec.configure do |config|
-  def with_internal_encoding(encoding)
-    old_enc = Encoding.default_internal
-    Encoding.default_internal = encoding
-
-    yield
-  ensure
-    Encoding.default_internal = old_enc
-  end
-
-  config.before :each do
-    @client = Mysql2::Client.new DatabaseCredentials['root']
-  end
-
-  config.after :each do
-    @client.close
-  end
-
   config.before(:all) do
-    client = Mysql2::Client.new DatabaseCredentials['root']
+    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,
         null_test VARCHAR(10),
         bit_test BIT(64),
-        single_bit_test BIT(1),
         tiny_int_test TINYINT,
         bool_cast_test TINYINT(1),
         small_int_test SMALLINT,
@@ -65,10 +45,9 @@ RSpec.configure do |config|
         PRIMARY KEY (id)
       )
     ]
-    client.query "DELETE FROM mysql2_test;"
     client.query %[
       INSERT INTO mysql2_test (
-        null_test, bit_test, single_bit_test, tiny_int_test, bool_cast_test, small_int_test, medium_int_test, int_test, big_int_test,
+        null_test, bit_test, tiny_int_test, bool_cast_test, small_int_test, medium_int_test, int_test, big_int_test,
         float_test, float_zero_test, double_test, decimal_test, decimal_zero_test, date_test, date_time_test, timestamp_test, time_test,
         year_test, char_test, varchar_test, binary_test, varbinary_test, tiny_blob_test,
         tiny_text_test, blob_test, text_test, medium_blob_test, medium_text_test,
@@ -76,7 +55,7 @@ RSpec.configure do |config|
       )
 
       VALUES (
-        NULL, b'101', b'1', 1, 1, 10, 10, 10, 10,
+        NULL, b'101', 1, 1, 10, 10, 10, 10,
         10.3, 0, 10.3, 10.3, 0, '2010-4-4', '2010-4-4 11:44:00', '2010-4-4 11:44:00', '11:44:00',
         2009, "test", "test", "test", "test", "test",
         "test", "test", "test", "test", "test",

data/tasks/benchmarks.rake

@@ -0,0 +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
+  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

@@ -0,0 +1,71 @@
+require "rake/extensiontask"
+
+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__)))
+end
+
+Rake::ExtensionTask.new("mysql2", gemspec) do |ext|
+  # reference where the vendored MySQL got extracted
+  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=#{connector_lib}/include",
+    "--with-mysql-lib=#{connector_lib}/lib"
+  ]
+
+  # automatically add build options to avoid need of manual input
+  if RUBY_PLATFORM =~ /mswin|mingw/ then
+    ext.config_options = windows_options
+  else
+    ext.cross_compile = true
+    ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60']
+    ext.cross_config_options = windows_options
+
+    # 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
+
+  ext.lib_dir = File.join 'lib', 'mysql2'
+
+  # clean compiled extension
+  CLEAN.include "#{ext.lib_dir}/*.#{RbConfig::CONFIG['DLEXT']}"
+end
+Rake::Task[:spec].prerequisites << :compile
+
+file 'lib/mysql2/mysql2.rb' do |t|
+  name = gemspec.name
+  File.open(t.name, 'wb') do |f|
+    f.write <<-eoruby
+RUBY_VERSION =~ /(\\d+.\\d+)/
+require "#{name}/\#{$1}/#{name}"
+    eoruby
+  end
+end
+
+if Rake::Task.task_defined?(:cross)
+  Rake::Task[:cross].prerequisites << "lib/mysql2/mysql2.rb"
+end

data/tasks/rspec.rake

@@ -0,0 +1,16 @@
+begin
+  require 'rspec'
+  require 'rspec/core/rake_task'
+
+  desc "Run all examples with RCov"
+  RSpec::Core::RakeTask.new('spec:rcov') do |t|
+    t.rcov = true
+  end
+  RSpec::Core::RakeTask.new('spec') do |t|
+    t.verbose = true
+  end
+
+  task :default => :spec
+rescue LoadError
+  puts "rspec, or one of its dependencies, is not available. Install it with: sudo gem install rspec"
+end

data/tasks/vendor_mysql.rake

@@ -0,0 +1,40 @@
+require 'rake/clean'
+require 'rake/extensioncompiler'
+
+# download mysql library and headers
+directory "vendor"
+
+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}"
+    end
+  end
+end
+
+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-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
+  end
+end
+
+# clobber expanded packages
+CLOBBER.include("vendor/mysql-connector-c-noinstall-#{CONNECTOR_VERSION}-win32")
+
+# vendor:mysql
+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
+  Rake::Task['compile'].prerequisites.unshift 'vendor:mysql'
+else
+  if Rake::Task.tasks.map {|t| t.name }.include? 'cross'
+    Rake::Task['cross'].prerequisites.unshift 'vendor:mysql'
+  end
+end

metadata

@@ -1,148 +1,235 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mysql2
-version: !ruby/object:Gem::Version
-  version: 0.2.24
+version: !ruby/object:Gem::Version 
+  hash: 19
+  prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
-authors:
+authors: 
 - Brian Lopez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-04-27 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  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
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.1
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 7
+        - 7
+        version: 0.7.7
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.3
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: activerecord
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.3
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.8.0
+  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: mysql
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.8.0
+  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: do_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: sequel
+  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: faker
+  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
 description: 
 email: seniorlopez@gmail.com
 executables: []
-extensions:
+
+extensions: 
 - ext/mysql2/extconf.rb
-extra_rdoc_files: []
-files:
+extra_rdoc_files: 
+- README.rdoc
+files: 
+- .gitignore
+- .rspec
+- .rvmrc
+- CHANGELOG.md
+- Gemfile
 - MIT-LICENSE
-- README.md
+- README.rdoc
+- 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/wait_for_single_fd.h
-- lib/active_record/connection_adapters/mysql2_adapter.rb
-- lib/arel/engines/sql/compilers/mysql2_compiler.rb
+- lib/active_record/connection_adapters/em_mysql2_adapter.rb
+- lib/active_record/fiber_patches.rb
 - lib/mysql2.rb
 - lib/mysql2/client.rb
-- lib/mysql2/console.rb
 - lib/mysql2/em.rb
+- lib/mysql2/em_fiber.rb
 - lib/mysql2/error.rb
 - lib/mysql2/result.rb
 - lib/mysql2/version.rb
-- support/mysql_enc_to_ruby.rb
-- support/ruby_enc_to_mysql.rb
-- examples/eventmachine.rb
-- examples/threaded.rb
-- spec/configuration.yml.example
+- mysql2.gemspec
+- spec/em/em_fiber_spec.rb
 - 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/rcov.opts
 - spec/spec_helper.rb
-- spec/test_data
+- tasks/benchmarks.rake
+- tasks/compile.rake
+- tasks/rspec.rake
+- tasks/vendor_mysql.rake
+has_rdoc: true
 homepage: http://github.com/brianmario/mysql2
-licenses:
-- MIT
-metadata: {}
+licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --charset=UTF-8
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+- ext
+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 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 1.6.2
 signing_key: 
-specification_version: 4
+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/configuration.yml.example
+- spec/em/em_fiber_spec.rb
 - 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/rcov.opts
 - spec/spec_helper.rb
-- spec/test_data