diff options
| author | wycats <wycats@gmail.com> | 2010-06-07 23:03:59 -0400 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-06-07 23:03:59 -0400 |
| commit | b97a3f33a36f936531e608343797b99268f8bd92 (patch) | |
| tree | 94abb825948b826fefdfd8952c25a9f3f3690772 /activerecord/lib/active_record/associations.rb | |
| parent | 0042f4166f783085eb909d69d542b5323d8af5d6 (diff) | |
| parent | acef8feafa8a44271eb28685e180f8c28b7e4a0f (diff) | |
| download | rails-b97a3f33a36f936531e608343797b99268f8bd92.tar.gz rails-b97a3f33a36f936531e608343797b99268f8bd92.tar.bz2 rails-b97a3f33a36f936531e608343797b99268f8bd92.zip | |
Merge remote branch 'rsim/oracle_enhanced_rails3'
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 284ae6695b..95d76ae456 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1756,7 +1756,8 @@ module ActiveRecord end def count_aliases_from_table_joins(name) - quoted_name = join_base.active_record.connection.quote_table_name(name.downcase) + # quoted_name should be downcased as some database adapters (Oracle) return quoted name in uppercase + quoted_name = join_base.active_record.connection.quote_table_name(name.downcase).downcase join_sql = join_base.table_joins.to_s.downcase join_sql.blank? ? 0 : # Table names |