diff options
Diffstat (limited to 'activerecord/lib/active_record/associations.rb')
-rwxr-xr-x | activerecord/lib/active_record/associations.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index d82d58b94c..05d8bd9ad0 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -793,11 +793,21 @@ module ActiveRecord sql << reflections.collect { |reflection| association_join(reflection) }.to_s sql << "#{options[:joins]} " if options[:joins] add_conditions!(sql, options[:conditions]) + add_sti_conditions!(sql, reflections) sql << "ORDER BY #{options[:order]} " if options[:order] return sanitize_sql(sql) end + def add_sti_conditions!(sql, reflections) + sti_sql = "" + reflections.each do |reflection| + sti_sql << " AND #{reflection.klass.send(:type_condition)}" unless reflection.klass.descends_from_active_record? + end + sti_sql.sub!(/AND/, "WHERE") unless sql =~ /where/i + sql << sti_sql + end + def column_aliases(schema_abbreviations) schema_abbreviations.collect { |cn, tc| "#{tc.join(".")} AS #{cn}" }.join(", ") end |