diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2017-07-25 07:52:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-25 07:52:14 -0400 |
| commit | 902aa87f582843cfacb4eadcb844ab144aaeedd0 (patch) | |
| tree | ad57b1b909ef0c41b069f36211ab7a024ca31992 /activerecord | |
| parent | ec21b97214e1ca415030be1a0d0d6f4ff33b283c (diff) | |
| parent | 601cb79582739229fe94c067194d60de3e25ac26 (diff) | |
| download | rails-902aa87f582843cfacb4eadcb844ab144aaeedd0.tar.gz rails-902aa87f582843cfacb4eadcb844ab144aaeedd0.tar.bz2 rails-902aa87f582843cfacb4eadcb844ab144aaeedd0.zip | |
Merge pull request #29928 from koic/fix_test_add_column_with_timestamp_type_oracle
Fix `test_add_column_with_timestamp_type` when using Oracle
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/test/cases/migration/change_schema_test.rb | 2 |
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 |