From b0fdd290f4b186e6da9c550336ee610970f2e8a3 Mon Sep 17 00:00:00 2001
From: Raimonds Simanovskis <raimonds.simanovskis@gmail.com>
Date: Sun, 16 May 2010 23:40:22 +0300
Subject: fix test_belongs_to_with_primary_key_joins_on_correct_column test on
 Oracle

---
 activerecord/test/cases/associations/belongs_to_associations_test.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'activerecord')

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)
-- 
cgit v1.2.3