diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2006-07-05 02:54:19 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-07-05 02:54:19 +0000 |
commit | 784165e03b8d297916edd23060a0f6b5c79b7ba1 (patch) | |
tree | 5b6766f5db1390bd2441f0f5d1cecfa897e47d35 /activerecord/test | |
parent | e8504877c0659f437cf294c6bca3471e025226d2 (diff) | |
download | rails-784165e03b8d297916edd23060a0f6b5c79b7ba1.tar.gz rails-784165e03b8d297916edd23060a0f6b5c79b7ba1.tar.bz2 rails-784165e03b8d297916edd23060a0f6b5c79b7ba1.zip |
Fixed a few Oracle issues: Allows Oracle's odd date handling to still work consistently within #to_xml, Passes test that hardcode insert statement by dropping the :id column, Updated RUNNING_UNIT_TESTS with Oracle instructions, Corrects method signature for #exec #5294 [schoenm@earthlink.net]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4552 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
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')" |