mysql2 0.3.8 → 0.4.10

data/benchmark/query_with_mysql_casting.rb

@@ -1,80 +0,0 @@
-# encoding: UTF-8
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
-require 'rubygems'
-require 'benchmark'
-require 'mysql'
-require 'mysql2'
-require 'do_mysql'
-
-number_of = 100
-database = 'test'
-sql = "SELECT * FROM mysql2_test LIMIT 100"
-
-class Mysql
-  include Enumerable
-end
-
-def mysql_cast(type, value)
-  case type
-    when Mysql::Field::TYPE_NULL
-      nil
-    when Mysql::Field::TYPE_TINY, Mysql::Field::TYPE_SHORT, Mysql::Field::TYPE_LONG,
-         Mysql::Field::TYPE_INT24, Mysql::Field::TYPE_LONGLONG, Mysql::Field::TYPE_YEAR
-      value.to_i
-    when Mysql::Field::TYPE_DECIMAL, Mysql::Field::TYPE_NEWDECIMAL
-      BigDecimal.new(value)
-    when Mysql::Field::TYPE_DOUBLE, Mysql::Field::TYPE_FLOAT
-      value.to_f
-    when Mysql::Field::TYPE_DATE
-      Date.parse(value)
-    when Mysql::Field::TYPE_TIME, Mysql::Field::TYPE_DATETIME, Mysql::Field::TYPE_TIMESTAMP
-      Time.parse(value)
-    when Mysql::Field::TYPE_BLOB, Mysql::Field::TYPE_BIT, Mysql::Field::TYPE_STRING,
-         Mysql::Field::TYPE_VAR_STRING, Mysql::Field::TYPE_CHAR, Mysql::Field::TYPE_SET
-         Mysql::Field::TYPE_ENUM
-      value
-    else
-      value
-  end
-end
-
-Benchmark.bmbm do |x|
-  mysql2 = Mysql2::Client.new(:host => "localhost", :username => "root")
-  mysql2.query "USE #{database}"
-  x.report "Mysql2" do
-    number_of.times do
-      mysql2_result = mysql2.query sql, :symbolize_keys => true
-      mysql2_result.each do |res|
-        # puts res.inspect
-      end
-    end
-  end
-
-  mysql = Mysql.new("localhost", "root")
-  mysql.query "USE #{database}"
-  x.report "Mysql" do
-    number_of.times do
-      mysql_result = mysql.query sql
-      fields = mysql_result.fetch_fields
-      mysql_result.each do |row|
-        row_hash = {}
-        row.each_with_index do |f, j|
-          row_hash[fields[j].name.to_sym] = mysql_cast(fields[j].type, row[j])
-        end
-        # puts row_hash.inspect
-      end
-    end
-  end
-
-  do_mysql = DataObjects::Connection.new("mysql://localhost/#{database}")
-  command = do_mysql.create_command sql
-  x.report "do_mysql" do
-    number_of.times do
-      do_result = command.execute_reader
-      do_result.each do |res|
-        # puts res.inspect
-      end
-    end
-  end
-end

data/benchmark/query_without_mysql_casting.rb

@@ -1,56 +0,0 @@
-# encoding: UTF-8
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
-require 'rubygems'
-require 'benchmark'
-require 'mysql'
-require 'mysql2'
-require 'do_mysql'
-
-number_of = 100
-database = 'test'
-sql = "SELECT * FROM mysql2_test LIMIT 100"
-
-Benchmark.bmbm do |x|
-  mysql2 = Mysql2::Client.new(:host => "localhost", :username => "root")
-  mysql2.query "USE #{database}"
-  x.report "Mysql2 (cast: true)" do
-    number_of.times do
-      mysql2_result = mysql2.query sql, :symbolize_keys => true, :cast => true
-      mysql2_result.each do |res|
-        # puts res.inspect
-      end
-    end
-  end
-
-  x.report "Mysql2 (cast: false)" do
-    number_of.times do
-      mysql2_result = mysql2.query sql, :symbolize_keys => true, :cast => false
-      mysql2_result.each do |res|
-        # puts res.inspect
-      end
-    end
-  end
-
-  mysql = Mysql.new("localhost", "root")
-  mysql.query "USE #{database}"
-  x.report "Mysql" do
-    number_of.times do
-      mysql_result = mysql.query sql
-      mysql_result.each_hash do |res|
-        # puts res.inspect
-      end
-    end
-  end
-
-  do_mysql = DataObjects::Connection.new("mysql://localhost/#{database}")
-  command = DataObjects::Mysql::Command.new do_mysql, sql
-  x.report "do_mysql" do
-    number_of.times do
-      do_result = command.execute_reader
-      do_result.each do |res|
-        # puts res.inspect
-      end
-    end
-  end
-end

data/benchmark/sequel.rb

@@ -1,37 +0,0 @@
-# encoding: UTF-8
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
-require 'rubygems'
-require 'benchmark'
-require 'mysql2'
-require 'sequel'
-require 'sequel/adapters/do'
-
-number_of = 10
-mysql2_opts = "mysql2://localhost/test"
-mysql_opts = "mysql://localhost/test"
-do_mysql_opts = "do:mysql://localhost/test"
-
-class Mysql2Model < Sequel::Model(Sequel.connect(mysql2_opts)[:mysql2_test]); end
-class MysqlModel < Sequel::Model(Sequel.connect(mysql_opts)[:mysql2_test]); end
-class DOMysqlModel < Sequel::Model(Sequel.connect(do_mysql_opts)[:mysql2_test]); end
-
-Benchmark.bmbm do |x|
-  x.report "Mysql2" do
-    number_of.times do
-      Mysql2Model.limit(1000).all
-    end
-  end
-
-  x.report "do:mysql" do
-    number_of.times do
-      DOMysqlModel.limit(1000).all
-    end
-  end
-
-  x.report "Mysql" do
-    number_of.times do
-      MysqlModel.limit(1000).all
-    end
-  end
-end

data/benchmark/setup_db.rb

@@ -1,119 +0,0 @@
-# encoding: UTF-8
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
-# This script is for generating psudo-random data into a single table consisting of nearly every
-# data type MySQL 5.1 supports.
-#
-# It's meant to be used with the query.rb benchmark script (or others in the future)
-
-require 'mysql2'
-require 'rubygems'
-require 'faker'
-
-num = ENV['NUM'] && ENV['NUM'].to_i || 10_000
-
-create_table_sql = %[
-  CREATE TABLE IF NOT EXISTS mysql2_test (
-    null_test VARCHAR(10),
-    bit_test BIT,
-    tiny_int_test TINYINT,
-    small_int_test SMALLINT,
-    medium_int_test MEDIUMINT,
-    int_test INT,
-    big_int_test BIGINT,
-    float_test FLOAT(10,3),
-    float_zero_test FLOAT(10,3),
-    double_test DOUBLE(10,3),
-    decimal_test DECIMAL(10,3),
-    decimal_zero_test DECIMAL(10,3),
-    date_test DATE,
-    date_time_test DATETIME,
-    timestamp_test TIMESTAMP,
-    time_test TIME,
-    year_test YEAR(4),
-    char_test CHAR(10),
-    varchar_test VARCHAR(10),
-    binary_test BINARY(10),
-    varbinary_test VARBINARY(10),
-    tiny_blob_test TINYBLOB,
-    tiny_text_test TINYTEXT,
-    blob_test BLOB,
-    text_test TEXT,
-    medium_blob_test MEDIUMBLOB,
-    medium_text_test MEDIUMTEXT,
-    long_blob_test LONGBLOB,
-    long_text_test LONGTEXT,
-    enum_test ENUM('val1', 'val2'),
-    set_test SET('val1', 'val2')
-  ) DEFAULT CHARSET=utf8
-]
-
-# connect to localhost by default, pass options as needed
-@client = Mysql2::Client.new :host => "localhost", :username => "root", :database => "test"
-
-@client.query create_table_sql
-
-def insert_record(args)
-  insert_sql = "
-    INSERT INTO mysql2_test (
-      null_test, bit_test, tiny_int_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,
-      long_blob_test, long_text_test, enum_test, set_test
-    )
-
-    VALUES (
-      NULL, #{args[:bit_test]}, #{args[:tiny_int_test]}, #{args[:small_int_test]}, #{args[:medium_int_test]}, #{args[:int_test]}, #{args[:big_int_test]},
-      #{args[:float_test]}, #{args[:float_zero_test]}, #{args[:double_test]}, #{args[:decimal_test]}, #{args[:decimal_zero_test]}, '#{args[:date_test]}', '#{args[:date_time_test]}', '#{args[:timestamp_test]}', '#{args[:time_test]}',
-      #{args[:year_test]}, '#{args[:char_test]}', '#{args[:varchar_test]}', '#{args[:binary_test]}', '#{args[:varbinary_test]}', '#{args[:tiny_blob_test]}',
-      '#{args[:tiny_text_test]}', '#{args[:blob_test]}', '#{args[:text_test]}', '#{args[:medium_blob_test]}', '#{args[:medium_text_test]}',
-      '#{args[:long_blob_test]}', '#{args[:long_text_test]}', '#{args[:enum_test]}', '#{args[:set_test]}'
-    )
-  "
-  @client.query insert_sql
-end
-
-puts "Creating #{num} records"
-num.times do |n|
-  five_words = Faker::Lorem.words(rand(5))
-  twenty5_paragraphs = Faker::Lorem.paragraphs(rand(25))
-  insert_record(
-    :bit_test => 1,
-    :tiny_int_test => rand(128),
-    :small_int_test => rand(32767),
-    :medium_int_test => rand(8388607),
-    :int_test => rand(2147483647),
-    :big_int_test => rand(9223372036854775807),
-    :float_test => rand(32767)/1.87,
-    :float_zero_test => 0.0,
-    :double_test => rand(8388607)/1.87,
-    :decimal_test => rand(8388607)/1.87,
-    :decimal_zero_test => 0,
-    :date_test => '2010-4-4',
-    :date_time_test => '2010-4-4 11:44:00',
-    :timestamp_test => '2010-4-4 11:44:00',
-    :time_test => '11:44:00',
-    :year_test => Time.now.year,
-    :char_test => five_words,
-    :varchar_test => five_words,
-    :binary_test => five_words,
-    :varbinary_test => five_words,
-    :tiny_blob_test => five_words,
-    :tiny_text_test => Faker::Lorem.paragraph(rand(5)),
-    :blob_test => twenty5_paragraphs,
-    :text_test => twenty5_paragraphs,
-    :medium_blob_test => twenty5_paragraphs,
-    :medium_text_test => twenty5_paragraphs,
-    :long_blob_test => twenty5_paragraphs,
-    :long_text_test => twenty5_paragraphs,
-    :enum_test => ['val1', 'val2'].rand,
-    :set_test => ['val1', 'val2', 'val1,val2'].rand
-  )
-  if n % 100 == 0
-    $stdout.putc '.'
-    $stdout.flush
-  end
-end
-puts
-puts "Done"

data/benchmark/threaded.rb

@@ -1,44 +0,0 @@
-# encoding: UTF-8
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
-require 'rubygems'
-require 'benchmark'
-require 'active_record'
-
-mysql2_opts = {
-  :adapter => 'mysql2',
-  :database => 'test',
-  :pool => 25
-}
-ActiveRecord::Base.establish_connection(mysql2_opts)
-x = Benchmark.realtime do
-  threads = []
-  25.times do
-    threads << Thread.new { ActiveRecord::Base.connection.execute("select sleep(1)") }
-  end
-  threads.each {|t| t.join }
-end
-puts x
-
-mysql2_opts = {
-  :adapter => 'mysql',
-  :database => 'test',
-  :pool => 25
-}
-ActiveRecord::Base.establish_connection(mysql2_opts)
-x = Benchmark.realtime do
-  threads = []
-  25.times do
-    threads << Thread.new { ActiveRecord::Base.connection.execute("select sleep(1)") }
-  end
-  threads.each {|t| t.join }
-end
-puts x
-
-# these results are similar on 1.8.7, 1.9.2 and rbx-head
-#
-# $ bundle exec ruby benchmarks/threaded.rb
-# 1.0774750709533691
-#
-# and using the mysql gem
-# 25.099437952041626

data/mysql2.gemspec

@@ -1,29 +0,0 @@
-require File.expand_path('../lib/mysql2/version', __FILE__)
-
-Gem::Specification.new do |s|
-  s.name = %q{mysql2}
-  s.version = Mysql2::VERSION
-  s.authors = ["Brian Lopez"]
-  s.date = Time.now.utc.strftime("%Y-%m-%d")
-  s.email = %q{seniorlopez@gmail.com}
-  s.extensions = ["ext/mysql2/extconf.rb"]
-  s.files = `git ls-files`.split("\n")
-  s.homepage = %q{http://github.com/brianmario/mysql2}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
-  s.summary = %q{A simple, fast Mysql library for Ruby, binding to libmysql}
-  s.test_files = `git ls-files spec examples`.split("\n")
-
-  # tests
-  s.add_development_dependency 'eventmachine'
-  s.add_development_dependency 'rake-compiler', "~> 0.7.7"
-  s.add_development_dependency 'rake', '0.8.7' # NB: 0.8.7 required by rake-compiler 0.7.9
-  s.add_development_dependency 'rspec'
-  # benchmarks
-  s.add_development_dependency 'activerecord'
-  s.add_development_dependency 'mysql'
-  s.add_development_dependency 'do_mysql'
-  s.add_development_dependency 'sequel'
-  s.add_development_dependency 'faker'
-end

data/tasks/benchmarks.rake

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

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

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

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