diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-06-08 00:10:11 -0400 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-06-08 00:10:11 -0400 |
| commit | e404490f9bae102f8c7126917d59568e6d1fef79 (patch) | |
| tree | 34a4fd7517026ab23498e7d2301f27ebd75cdee2 /activerecord/test/cases/associations/belongs_to_associations_test.rb | |
| parent | 80a044edb663e6bc619b0755e30f9db10e37e9e8 (diff) | |
| parent | 8d576b51a12fdb19e3993f3678ec64b2ea60fada (diff) | |
| download | rails-e404490f9bae102f8c7126917d59568e6d1fef79.tar.gz rails-e404490f9bae102f8c7126917d59568e6d1fef79.tar.bz2 rails-e404490f9bae102f8c7126917d59568e6d1fef79.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activerecord/test/cases/associations/belongs_to_associations_test.rb')
| -rw-r--r-- | activerecord/test/cases/associations/belongs_to_associations_test.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb index 9258c987ef..fb1e6e7e70 100644 --- a/activerecord/test/cases/associations/belongs_to_associations_test.rb +++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb @@ -37,6 +37,10 @@ class BelongsToAssociationsTest < ActiveRecord::TestCase if current_adapter?(:MysqlAdapter) assert_no_match(/`firm_with_primary_keys_companies`\.`id`/, sql) assert_match(/`firm_with_primary_keys_companies`\.`name`/, sql) + elsif current_adapter?(:OracleAdapter) + # on Oracle aliases are truncated to 30 characters and are quoted in uppercase + assert_no_match(/"firm_with_primary_keys_compani"\."id"/i, sql) + assert_match(/"firm_with_primary_keys_compani"\."name"/i, sql) else assert_no_match(/"firm_with_primary_keys_companies"\."id"/, sql) assert_match(/"firm_with_primary_keys_companies"\."name"/, sql) |