diff options
author | Marcin Raczkowski <marcin.raczkowski@gmail.com> | 2010-08-28 18:57:50 +0200 |
---|---|---|
committer | Emilio Tagua <miloops@gmail.com> | 2010-11-19 19:03:57 -0300 |
commit | ce66bfdc54e3c1a4a726ebbdd3207f327d4297cf (patch) | |
tree | 04d8632ef9be5fbefcebbb3cd045a834f6b0e8f4 /activerecord/test | |
parent | ce3ea558ab509624a1c8d8499408f52ebb4bbe2b (diff) | |
download | rails-ce66bfdc54e3c1a4a726ebbdd3207f327d4297cf.tar.gz rails-ce66bfdc54e3c1a4a726ebbdd3207f327d4297cf.tar.bz2 rails-ce66bfdc54e3c1a4a726ebbdd3207f327d4297cf.zip |
IdentityMap - misc fixes
- Added IdentityMap to be included into AR::Base
- Fixed bug with Mysql namespace missing when running tests only for sqlite
- Added sqlite as default connection
Diffstat (limited to 'activerecord/test')
-rw-r--r-- | activerecord/test/cases/adapters/mysql/connection_test.rb | 2 | ||||
-rw-r--r-- | activerecord/test/cases/helper.rb | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/activerecord/test/cases/adapters/mysql/connection_test.rb b/activerecord/test/cases/adapters/mysql/connection_test.rb index 62ffde558f..eb3f8143e7 100644 --- a/activerecord/test/cases/adapters/mysql/connection_test.rb +++ b/activerecord/test/cases/adapters/mysql/connection_test.rb @@ -102,7 +102,7 @@ class MysqlConnectionTest < ActiveRecord::TestCase end # Test that MySQL allows multiple results for stored procedures - if Mysql.const_defined?(:CLIENT_MULTI_RESULTS) + if defined?(Mysql) && Mysql.const_defined?(:CLIENT_MULTI_RESULTS) def test_multi_results rows = ActiveRecord::Base.connection.select_rows('CALL ten();') assert_equal 10, rows[0][0].to_i, "ten() did not return 10 as expected: #{rows.inspect}" diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb index 52f26b71f5..d80e2734ce 100644 --- a/activerecord/test/cases/helper.rb +++ b/activerecord/test/cases/helper.rb @@ -11,7 +11,14 @@ require 'mocha' require 'active_record' require 'active_support/dependencies' -require 'connection' +begin + require 'connection' +rescue LoadError + # If we cannot load connection we assume that driver was not loaded for this test case, so we load sqlite3 as default one. + # This allows for running separate test cases by simply running test file. + connection_type = defined?(JRUBY_VERSION) ? 'jdbc' : 'native' + require "test/connections/#{connection_type}_sqlite3/connection" +end begin require 'ruby-debug' |