aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaimonds Simanovskis <raimonds.simanovskis@gmail.com>2010-08-23 03:09:21 +0800
committerAaron Patterson <aaron.patterson@gmail.com>2010-08-22 16:35:48 -0700
commitf82b1e756a736e4a7f3903deede8b83682158518 (patch)
tree46fe3a5e12e0b80d5f7cd86a7afd83c61d8da544
parent04ee54f3fc1799bb70125592bf91ffde3e93ee15 (diff)
downloadrails-f82b1e756a736e4a7f3903deede8b83682158518.tar.gz
rails-f82b1e756a736e4a7f3903deede8b83682158518.tar.bz2
rails-f82b1e756a736e4a7f3903deede8b83682158518.zip
updated test_should_record_timestamp_for_join_table for Oracle
-rw-r--r--activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
index ed7d9a782c..c726fedd13 100644
--- a/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
+++ b/activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
@@ -109,7 +109,7 @@ class HasAndBelongsToManyAssociationsTest < ActiveRecord::TestCase
record = con.select_rows(sql).last
assert_not_nil record[2]
assert_not_nil record[3]
- if current_adapter?(:Mysql2Adapter)
+ if current_adapter?(:Mysql2Adapter, :OracleAdapter)
assert_match %r{\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}}, record[2].to_s(:db)
assert_match %r{\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}}, record[3].to_s(:db)
else