diff options
Diffstat (limited to 'activerecord/test')
| -rwxr-xr-x | activerecord/test/base_test.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/migration_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/base_test.rb b/activerecord/test/base_test.rb index 15605d779a..9299fd998a 100755 --- a/activerecord/test/base_test.rb +++ b/activerecord/test/base_test.rb @@ -1239,7 +1239,7 @@ class BasicsTest < Test::Unit::TestCase assert xml.include?(%(<content>Have a nice day</content>)) assert xml.include?(%(<author-email-address>david@loudthinking.com</author-email-address>)) assert xml.match(%(<parent-id type="integer"></parent-id>)) - if current_adapter?(:SybaseAdapter) or current_adapter?(:SQLServerAdapter) + if current_adapter?(:SybaseAdapter) or current_adapter?(:SQLServerAdapter) or current_adapter?(:OracleAdapter) assert xml.include?(%(<last-read type="datetime">#{last_read_in_current_timezone}</last-read>)) else assert xml.include?(%(<last-read type="date">2004-04-15</last-read>)) diff --git a/activerecord/test/migration_test.rb b/activerecord/test/migration_test.rb index 88a94d8710..2e6868b7e2 100644 --- a/activerecord/test/migration_test.rb +++ b/activerecord/test/migration_test.rb @@ -170,7 +170,7 @@ if ActiveRecord::Base.connection.supports_migrations? end def test_add_column_not_null_with_default - Person.connection.create_table :testings do |t| + Person.connection.create_table :testings, :id => false do |t| t.column :foo, :string end Person.connection.execute "insert into testings (foo) values ('hello')" |