diff options
author | Rick Olson <technoweenie@gmail.com> | 2006-10-11 14:02:24 +0000 |
---|---|---|
committer | Rick Olson <technoweenie@gmail.com> | 2006-10-11 14:02:24 +0000 |
commit | 787049467341a75de469b58bcfe84f0959a2c3af (patch) | |
tree | 01f177b9d0f9a2cb37cb07e008aa2a56861d6ee3 /activerecord/lib | |
parent | 214d236e7d9967a887fecee6e24d4c96c4a344dc (diff) | |
download | rails-787049467341a75de469b58bcfe84f0959a2c3af.tar.gz rails-787049467341a75de469b58bcfe84f0959a2c3af.tar.bz2 rails-787049467341a75de469b58bcfe84f0959a2c3af.zip |
Restore eager condition interpolation, document it's differences [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5284 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib')
-rwxr-xr-x | activerecord/lib/active_record/associations.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb index 6f70830295..e075ecaf3c 100755 --- a/activerecord/lib/active_record/associations.rb +++ b/activerecord/lib/active_record/associations.rb @@ -358,8 +358,8 @@ module ActiveRecord # as there is currently not any way to disambiguate them. Eager loading will not pull additional attributes on join tables, so "rich # associations" with has_and_belongs_to_many are not a good fit for eager loading. # - # When eager loaded, conditions are not interpolated. This is because the interpolation of lazy loaded conditions happens within the context - # of the object; when eager loading the object does not exist yet. + # When eager loaded, conditions are interpolated in the context of the model class, not the model instance. Conditions are lazily interpolated + # before the actual model exists. # # == Table Aliasing # @@ -1560,7 +1560,7 @@ module ActiveRecord aliased_table_name, reflection.active_record.connection.quote_column_name(reflection.active_record.inheritance_column), klass.quote_value(klass.name.demodulize)] unless klass.descends_from_active_record? - join << "AND #{sanitize_sql(reflection.options[:conditions])} " if reflection.options[:conditions] + join << "AND #{interpolate_sql(sanitize_sql(reflection.options[:conditions]))} " if reflection.options[:conditions] join end @@ -1576,6 +1576,10 @@ module ActiveRecord def table_name_and_alias table_alias_for table_name, @aliased_table_name end + + def interpolate_sql(sql) + instance_eval("%@#{sql.gsub('@', '\@')}@") + end end end end |