aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorKoichi ITO <koic.ito@gmail.com>2017-07-25 13:04:28 +0900
committerKoichi ITO <koic.ito@gmail.com>2017-07-25 13:04:28 +0900
commit601cb79582739229fe94c067194d60de3e25ac26 (patch)
treeb57e02f0be779cef6bf5629a7478a749ae02c9b6 /activerecord
parent65f861ee1e8cdeec1533c565f949d05cf8195965 (diff)
downloadrails-601cb79582739229fe94c067194d60de3e25ac26.tar.gz
rails-601cb79582739229fe94c067194d60de3e25ac26.tar.bz2
rails-601cb79582739229fe94c067194d60de3e25ac26.zip
Fix `test_add_column_with_timestamp_type` when using Oracle
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/migration/change_schema_test.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/test/cases/migration/change_schema_test.rb b/activerecord/test/cases/migration/change_schema_test.rb
index 04e2d3a052..7b0644e9c0 100644
--- a/activerecord/test/cases/migration/change_schema_test.rb
+++ b/activerecord/test/cases/migration/change_schema_test.rb
@@ -273,6 +273,8 @@ module ActiveRecord
assert_equal "timestamp without time zone", klass.columns_hash["foo"].sql_type
elsif current_adapter?(:Mysql2Adapter)
assert_equal "timestamp", klass.columns_hash["foo"].sql_type
+ elsif current_adapter?(:OracleAdapter)
+ assert_equal "TIMESTAMP(6)", klass.columns_hash["foo"].sql_type
else
assert_equal klass.connection.type_to_sql("datetime"), klass.columns_hash["foo"].sql_type
end