Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Ticket #6461: 0001-Fix-table-aliasing-for-quoted-tables-in-JoinAssociat.patch

File 0001-Fix-table-aliasing-for-quoted-tables-in-JoinAssociat.patch, 1.4 kB (added by shoe, 8 months ago)

  • a/activerecord/lib/active_record/associations.rb

    old new  
    16991699              @aliased_prefix     = "t#{ join_dependency.joins.size }" 
    17001700              @aliased_table_name = table_name #.tr('.', '_') # start with the table name, sub out any .'s 
    17011701              @parent_table_name  = parent.active_record.table_name 
     1702              quoted_alias = active_record.connection.quote_table_name(aliased_table_name) 
    17021703 
    1703               if !parent.table_joins.blank? && parent.table_joins.to_s.downcase =~ %r{join(\s+\w+)?\s+"?#{aliased_table_name.downcase}"?\s+on} 
     1704              if !parent.table_joins.blank? && 
     1705                  parent.table_joins.to_s =~ %r{join(\s+\w+)?\s+(#{aliased_table_name}|#{quoted_alias})\s+on}i 
    17041706                join_dependency.table_aliases[aliased_table_name] += 1 
    17051707              end 
    17061708