Skip to content

Commit

Permalink
more mysql2 support
Browse files Browse the repository at this point in the history
  • Loading branch information
osheroff committed Mar 14, 2012
1 parent 04218a3 commit 3ee2559
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 8 deletions.
13 changes: 8 additions & 5 deletions Appraisals
@@ -1,11 +1,14 @@
appraise "rails2" do
appraise "rails2, mysql" do
gem "activerecord", "2.3.14"
gem "mysql"
end

appraise "rails3.1" do
gem "activerecord", "3.1.3"
appraise "rails2, mysql2" do
gem "activerecord", "2.3.14"
gem "mysql2", :git => "git://github.com/osheroff/mysql2.git", :ref => "a1ab7ba"
end

appraise "rails3.2" do
gem "activerecord", "~>3.2.0"
appraise "rails3.2, mysql2" do
gem "activerecord", "~> 3.2.0.rc2"
gem "mysql2", :git => "git://github.com/brianmario/mysql2.git", :ref => "d81ba9"
end
2 changes: 1 addition & 1 deletion Rakefile
@@ -1,7 +1,7 @@
require 'rubygems'
require 'appraisal'
require 'bundler/setup'

require 'appraisal'
require 'rake/testtask'
Rake::TestTask.new(:test) do |test|
test.libs << 'lib' << 'test'
Expand Down
5 changes: 4 additions & 1 deletion lib/active_record_host_pool/connection_adapter_mixin.rb
@@ -1,5 +1,8 @@
require 'active_record/connection_adapters/mysql_adapter'
require 'active_record/connection_adapters/mysql2_adapter' rescue nil
begin
require 'active_record/connection_adapters/mysql2_adapter'
rescue LoadError
end

module ActiveRecordHostPool
module DatabaseSwitch
Expand Down
12 changes: 11 additions & 1 deletion test/helper.rb
Expand Up @@ -16,7 +16,17 @@
RAILS_ENV = "test"

ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/test.log")
ActiveRecord::Base.configurations = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))

config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))

if ENV["BUNDLE_GEMFILE"] =~ /mysql2/
config.each do |k, v|
v['adapter'] = 'mysql2'
end
end

ActiveRecord::Base.configurations = config


require 'active_support/test_case'

Expand Down

0 comments on commit 3ee2559

Please sign in to comment.