diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-07 10:48:43 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-07 10:48:43 +0000 |
| commit | c4782f7393029eeacc599a7921939744d1fe22cd (patch) | |
| tree | 54218c45c6b055f2deafa6372fdc2fe87de5515a /activerecord/test/inheritance_test.rb | |
| parent | 044f960fd35a93159d1e0278124109dd74107670 (diff) | |
| download | rails-c4782f7393029eeacc599a7921939744d1fe22cd.tar.gz rails-c4782f7393029eeacc599a7921939744d1fe22cd.tar.bz2 rails-c4782f7393029eeacc599a7921939744d1fe22cd.zip | |
More succinct current_adapter? Enable locking duel for Oracle.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4576 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test/inheritance_test.rb')
| -rwxr-xr-x | activerecord/test/inheritance_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/inheritance_test.rb b/activerecord/test/inheritance_test.rb index 211f739752..db10e1f048 100755 --- a/activerecord/test/inheritance_test.rb +++ b/activerecord/test/inheritance_test.rb @@ -8,13 +8,13 @@ class InheritanceTest < Test::Unit::TestCase def test_a_bad_type_column #SQLServer need to turn Identity Insert On before manually inserting into the Identity column - if current_adapter?(:SQLServerAdapter) || current_adapter?(:SybaseAdapter) + if current_adapter?(:SQLServerAdapter, :SybaseAdapter) Company.connection.execute "SET IDENTITY_INSERT companies ON" end Company.connection.insert "INSERT INTO companies (id, #{QUOTED_TYPE}, name) VALUES(100, 'bad_class!', 'Not happening')" #We then need to turn it back Off before continuing. - if current_adapter?(:SQLServerAdapter) || current_adapter?(:SybaseAdapter) + if current_adapter?(:SQLServerAdapter, :SybaseAdapter) Company.connection.execute "SET IDENTITY_INSERT companies OFF" end assert_raises(ActiveRecord::SubclassNotFound) { Company.find(100) } |