diff options
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/column_alias_test.rb | 6 | ||||
| -rw-r--r-- | activerecord/test/cases/migration/columns_test.rb | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/activerecord/test/cases/column_alias_test.rb b/activerecord/test/cases/column_alias_test.rb index ae64c99f33..9893ba9580 100644 --- a/activerecord/test/cases/column_alias_test.rb +++ b/activerecord/test/cases/column_alias_test.rb @@ -6,9 +6,9 @@ class TestColumnAlias < ActiveRecord::TestCase QUERY = if "Oracle" == ActiveRecord::Base.connection.adapter_name "SELECT id AS pk FROM topics WHERE ROWNUM < 2" - else - "SELECT id AS pk FROM topics" - end + else + "SELECT id AS pk FROM topics" + end def test_column_alias records = Topic.connection.select_all(QUERY) diff --git a/activerecord/test/cases/migration/columns_test.rb b/activerecord/test/cases/migration/columns_test.rb index baf0a0eb9f..70d40ed87a 100644 --- a/activerecord/test/cases/migration/columns_test.rb +++ b/activerecord/test/cases/migration/columns_test.rb @@ -75,9 +75,10 @@ module ActiveRecord def test_rename_nonexistent_column exception = if current_adapter?(:PostgreSQLAdapter, :OracleAdapter) ActiveRecord::StatementInvalid - else - ActiveRecord::ActiveRecordError - end + else + ActiveRecord::ActiveRecordError + end + assert_raise(exception) do rename_column "test_models", "nonexistent", "should_fail" end |
