aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/adapters/mysql/connection_test.rb
diff options
context:
space:
mode:
authorMarcin Raczkowski <marcin.raczkowski@gmail.com>2010-08-28 18:57:50 +0200
committerEmilio Tagua <miloops@gmail.com>2010-11-19 19:03:57 -0300
commitce66bfdc54e3c1a4a726ebbdd3207f327d4297cf (patch)
tree04d8632ef9be5fbefcebbb3cd045a834f6b0e8f4 /activerecord/test/cases/adapters/mysql/connection_test.rb
parentce3ea558ab509624a1c8d8499408f52ebb4bbe2b (diff)
downloadrails-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/cases/adapters/mysql/connection_test.rb')
-rw-r--r--activerecord/test/cases/adapters/mysql/connection_test.rb2
1 files changed, 1 insertions, 1 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}"