aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorRick Olson <technoweenie@gmail.com>2006-03-18 18:01:50 +0000
committerRick Olson <technoweenie@gmail.com>2006-03-18 18:01:50 +0000
commit50103b86e6f5e6aa82448d6bfdafeac34e0c8caa (patch)
tree31b7562585673b164a95dfbd1762adcc942ef2bd /activerecord/test
parentb2122159b1eed173b37d0a240cb9d933f7564d24 (diff)
downloadrails-50103b86e6f5e6aa82448d6bfdafeac34e0c8caa.tar.gz
rails-50103b86e6f5e6aa82448d6bfdafeac34e0c8caa.tar.bz2
rails-50103b86e6f5e6aa82448d6bfdafeac34e0c8caa.zip
fixed has_many :conditions sanitizing (closes #4278) [hakuja@hakuja.net]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3935 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test')
-rwxr-xr-xactiverecord/test/fixtures/company.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/fixtures/company.rb b/activerecord/test/fixtures/company.rb
index 5d53898802..8de66d9526 100755
--- a/activerecord/test/fixtures/company.rb
+++ b/activerecord/test/fixtures/company.rb
@@ -42,7 +42,7 @@ class Client < Company
belongs_to :firm, :foreign_key => "client_of"
belongs_to :firm_with_basic_id, :class_name => "Firm", :foreign_key => "firm_id"
belongs_to :firm_with_other_name, :class_name => "Firm", :foreign_key => "client_of"
- belongs_to :firm_with_condition, :class_name => "Firm", :foreign_key => "client_of", :conditions => "1 = 1"
+ belongs_to :firm_with_condition, :class_name => "Firm", :foreign_key => "client_of", :conditions => ["1 = ?", 1]
# Record destruction so we can test whether firm.clients.clear has
# is calling client.destroy, deleting from the database, or setting