downcase table names in aliased_table_name_for and references_eager_loaded_tables? methods (as Oracle quoted table names are in uppercase)

1 files changed, 4 insertions, 2 deletions

diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 4e62187449..b6b4085ec0 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -356,13 +356,15 @@ module ActiveRecord
     end
 
     def references_eager_loaded_tables?
-      joined_tables = (tables_in_string(arel.joins(arel)) + [table.name, table.table_alias]).compact.uniq
+      # always convert table names to downcase as in Oracle quoted table names are in uppercase
+      joined_tables = (tables_in_string(arel.joins(arel)) + [table.name, table.table_alias]).compact.map(&:downcase).uniq
       (tables_in_string(to_sql) - joined_tables).any?
     end
 
     def tables_in_string(string)
       return [] if string.blank?
-      string.scan(/([a-zA-Z_][\.\w]+).?\./).flatten.uniq
+      # always convert table names to downcase as in Oracle quoted table names are in uppercase
+      string.scan(/([a-zA-Z_][\.\w]+).?\./).flatten.map(&:downcase).uniq
     end
 
   end