aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases/migration
diff options
context:
space:
mode:
authorYasuo Honda <yasuo.honda@gmail.com>2016-07-20 12:07:20 +0000
committerYasuo Honda <yasuo.honda@gmail.com>2016-07-20 13:10:55 +0000
commitcc4abed844e74bb3d91267a7d01e7d902dc79779 (patch)
treeb78222ed4794735e64b4190b8143eece6a24ce90 /activerecord/test/cases/migration
parentd8bc0964d29837407efe425d7a65ab9a27d96e82 (diff)
downloadrails-cc4abed844e74bb3d91267a7d01e7d902dc79779.tar.gz
rails-cc4abed844e74bb3d91267a7d01e7d902dc79779.tar.bz2
rails-cc4abed844e74bb3d91267a7d01e7d902dc79779.zip
Oracle TIMESTAMP sql type is associated with Rails `DateTime` type now
- Refer https://github.com/rsim/oracle-enhanced/pull/845 Remove `set_date_columns` which has been deprecated in Oracle enhanced adapter - Refer https://github.com/rsim/oracle-enhanced/pull/869
Diffstat (limited to 'activerecord/test/cases/migration')
-rw-r--r--activerecord/test/cases/migration/column_attributes_test.rb9
1 files changed, 1 insertions, 8 deletions
diff --git a/activerecord/test/cases/migration/column_attributes_test.rb b/activerecord/test/cases/migration/column_attributes_test.rb
index 29546525f3..2f71ba870d 100644
--- a/activerecord/test/cases/migration/column_attributes_test.rb
+++ b/activerecord/test/cases/migration/column_attributes_test.rb
@@ -156,14 +156,7 @@ module ActiveRecord
assert_equal String, bob.bio.class
assert_kind_of Integer, bob.age
assert_equal Time, bob.birthday.class
-
- if current_adapter?(:OracleAdapter)
- # Oracle doesn't differentiate between date/time
- assert_equal Time, bob.favorite_day.class
- else
- assert_equal Date, bob.favorite_day.class
- end
-
+ assert_equal Date, bob.favorite_day.class
assert_instance_of TrueClass, bob.male?
assert_kind_of BigDecimal, bob.wealth
end