@@ -1,3 +1,5 @@ +# coding: utf-8 + require 'rake' require 'rake/testtask' require 'test/helper' Rakefile @@ -11,7 +11,7 @@ end begin require_library_or_gem('fastthread') -rescue => LoadError +rescue LoadError $stderr.puts "'gem install fastthread' for better performance" end lib/active_record/connection_adapters/mysqlplus_adapter.rb @@ -121,7 +121,7 @@ module ActiveRecord records end - def preload_deferred_includes( include_associations, options ) + def preload_deferred_includes( include_associations, options ) #:nodoc: options[:defer] ? (Array(include_associations) << :defer) : include_associations end lib/active_record/connection_adapters/mysqlplus_adapter/deferrable/macro.rb @@ -15,7 +15,7 @@ module ActiveRecord # back in on completion. # def defer!( deferrable ) - @result = Thread.new( deferrable ) do |deferrable| + @result = ::Thread.new( deferrable ) do |deferrable| begin deferrable.call rescue => exception @@ -38,7 +38,7 @@ module ActiveRecord # Re-raise any Exceptions from the background Thread. # def validate! - raise @_result if @_result.is_a?( Exception ) + raise @_result if @_result.is_a?( ::Exception ) end end lib/active_record/connection_adapters/mysqlplus_adapter/deferrable/result.rb @@ -1,11 +1,12 @@ require "#{File.dirname(__FILE__)}/../helper" + Mysqlplus::Test.prepare! -class MacroTest < ActiveRecord::TestCase +class MacroTest < ActiveSupport::TestCase def teardown ActiveRecord::Base.clear_all_connections! - ActiveRecord::Base.establish_connection(Mysqlplus::Test::CONNECTION) + ActiveRecord::Base.establish_connection( Mysqlplus::Test::CONNECTION_SPEC ) super end test/deferrable/macro_test.rb @@ -1,4 +1,5 @@ require 'rubygems' +require 'mocha' require 'active_support' require 'active_support/test_case' require 'activerecord' @@ -8,11 +9,11 @@ ActiveRecord.load_all! module Mysqlplus class Test - CONNECTION = { :adapter => 'mysqlplus', - :username => 'root', - :database => 'mysql', - :pool => 5, - :warmup => true } + CONNECTION_SPEC = { :adapter => 'mysqlplus', + :username => 'root', + :database => 'mysql', + :pool => 5, + :warmup => true } MODELS_DIR = "#{File.dirname(__FILE__)}/models".freeze @@ -46,7 +47,7 @@ module Mysqlplus private def connect! - ::ActiveRecord::Base.establish_connection( CONNECTION ) + ::ActiveRecord::Base.establish_connection( CONNECTION_SPEC ) end def require_models test/helper.rb b5049416ce43935d6f36df4706a61a355ccd3a0b Lourens Naude lourens@methodmissing.com http://github.com/methodmissing/mysqlplus_adapter/commit/aedbc171fd5f5bc04b51cbe54274fd0f3633e61f aedbc171fd5f5bc04b51cbe54274fd0f3633e61f 2009-02-08T17:42:23-08:00 2009-02-08T17:42:23-08:00 Ruby 1.9.1 compat 85930b6dd246ebe641ecb7352837398caa2c7f4a Lourens Naude lourens@methodmissing.com