1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Remove warnings and unused code

This commit is contained in:
Rafael Mendonça França 2012-06-11 21:54:12 -03:00
parent 65d584c35b
commit e6ea3fec30
2 changed files with 2 additions and 7 deletions

View file

@ -225,7 +225,7 @@ module ActiveRecord
threads = expected.map do |i|
t = Thread.new {
begin
conn = @pool.checkout # never checked back in
@pool.checkout # never checked back in
mutex.synchronize { order << i }
rescue => e
mutex.synchronize { errors << e }
@ -262,7 +262,7 @@ module ActiveRecord
make_thread = proc do |i|
t = Thread.new {
begin
conn = @pool.checkout # never checked back in
@pool.checkout # never checked back in
mutex.synchronize { successes << i }
rescue => e
mutex.synchronize { errors << e }

View file

@ -151,11 +151,6 @@ class QueryCacheTest < ActiveRecord::TestCase
end
def test_cache_does_not_wrap_string_results_in_arrays
if current_adapter?(:SQLite3Adapter)
require 'sqlite3/version'
sqlite3_version = RUBY_PLATFORM =~ /java/ ? Jdbc::SQLite3::VERSION : SQLite3::VERSION
end
Task.cache do
# Oracle adapter returns count() as Fixnum or Float
if current_adapter?(:OracleAdapter)