diff options
| author | Rick Olson <technoweenie@gmail.com> | 2006-03-06 16:00:46 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2006-03-06 16:00:46 +0000 |
| commit | 7c4b7affdbd648261f039343c348220287847446 (patch) | |
| tree | 100661301d22d53f2b9e95f195a9dd7207cc9cf7 /activerecord | |
| parent | c58dff1c9cbdd45df8685e230d1dc91cf1deb6cf (diff) | |
| download | rails-7c4b7affdbd648261f039343c348220287847446.tar.gz rails-7c4b7affdbd648261f039343c348220287847446.tar.bz2 rails-7c4b7affdbd648261f039343c348220287847446.zip | |
Fix quoting of inheritance column for STI eager loading #4098 [Jonathan Viney <jonathan@bluewire.net.nz>]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3790 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record/associations.rb | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG index ea920c7721..8672aeec83 100644 --- a/activerecord/CHANGELOG +++ b/activerecord/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fix quoting of inheritance column for STI eager loading #4098 [Jonathan Viney <jonathan@bluewire.net.nz>] + * Added smarter table aliasing for eager associations for multiple self joins #3580 [Rick Olson] * The first time a table is referenced in a join, no alias is used. diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 9e71c627c5..b8f92c2102 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -1226,7 +1226,7 @@ module ActiveRecord " LEFT OUTER JOIN %s AS %s ON (%s.%s = %s.%s AND %s.%s = %s) " % [through_reflection.klass.table_name, aliased_through_table, aliased_through_table, polymorphic_foreign_key, parent.aliased_table_name, parent.primary_key, - aliased_through_table, polymorphic_foreign_type, reflection.klass.quote(parent.active_record.base_class.name)] + + aliased_through_table, polymorphic_foreign_type, klass.quote(parent.active_record.base_class.name)] + " LEFT OUTER JOIN %s AS %s ON %s.%s = %s.%s " % [table_name, aliased_table_name, aliased_table_name, primary_key, aliased_through_table, options[:foreign_key] || reflection.klass.to_s.classify.foreign_key ] @@ -1235,7 +1235,7 @@ module ActiveRecord aliased_through_table, through_reflection.options[:foreign_key] || through_reflection.active_record.to_s.classify.foreign_key, parent.aliased_table_name, parent.primary_key] + " LEFT OUTER JOIN %s AS %s ON %s.%s = %s.%s " % [table_name, aliased_table_name, - aliased_table_name, primary_key, aliased_through_table, options[:foreign_key] || reflection.klass.to_s.classify.foreign_key + aliased_table_name, primary_key, aliased_through_table, options[:foreign_key] || klass.to_s.classify.foreign_key ] end @@ -1244,7 +1244,7 @@ module ActiveRecord aliased_table_name, "#{reflection.options[:as]}_id", parent.aliased_table_name, parent.primary_key, aliased_table_name, "#{reflection.options[:as]}_type", - reflection.klass.quote(parent.active_record.base_class.name) + klass.quote(parent.active_record.base_class.name) ] else " LEFT OUTER JOIN %s AS %s ON %s.%s = %s.%s " % [table_name, aliased_table_name, @@ -1255,15 +1255,15 @@ module ActiveRecord when :belongs_to " LEFT OUTER JOIN %s AS %s ON %s.%s = %s.%s " % [table_name, aliased_table_name, aliased_table_name, reflection.klass.primary_key, - parent.aliased_table_name, options[:foreign_key] || reflection.klass.to_s.classify.foreign_key + parent.aliased_table_name, options[:foreign_key] || klass.to_s.classify.foreign_key ] else "" end - join << %(AND %s."%s" = %s ) % [ + join << %(AND %s.%s = %s ) % [ aliased_table_name, - reflection.active_record.inheritance_column, - reflection.klass.quote(klass.name)] unless join.blank? || reflection.klass.descends_from_active_record? + reflection.active_record.connection.quote_column_name(reflection.active_record.inheritance_column), + klass.quote(klass.name)] unless join.blank? || klass.descends_from_active_record? join end end |