diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-10-18 23:52:07 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-10-18 23:52:07 +0000 |
| commit | 328ef3feaad4c110a7277e3432e9203c7fbbb9e2 (patch) | |
| tree | 30337b862f5752c5a2f76c123abf28d94140bc4c /activerecord/lib/active_record/associations/has_one_association.rb | |
| parent | 311342d8e231f8429e270dce2b1bf4abeb7b4293 (diff) | |
| download | rails-328ef3feaad4c110a7277e3432e9203c7fbbb9e2.tar.gz rails-328ef3feaad4c110a7277e3432e9203c7fbbb9e2.tar.bz2 rails-328ef3feaad4c110a7277e3432e9203c7fbbb9e2.zip | |
Parenthesize :conditions
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2681 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/associations/has_one_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_one_association.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/associations/has_one_association.rb b/activerecord/lib/active_record/associations/has_one_association.rb index 1ff67ff70a..18f84ee98f 100644 --- a/activerecord/lib/active_record/associations/has_one_association.rb +++ b/activerecord/lib/active_record/associations/has_one_association.rb @@ -66,6 +66,8 @@ module ActiveRecord def construct_sql @finder_sql = "#{@association_class.table_name}.#{@association_class_primary_key_name} = #{@owner.quoted_id}#{@options[:conditions] ? " AND " + @options[:conditions] : ""}" + @finder_sql << " AND (#{sanitize_sql(@options[:conditions])})" if @options[:conditions] + @finder_sql end end end |