aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-09-02 02:51:01 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-09-02 02:51:01 +0000
commit667d8ea2ea6d3a24009c531fefd6b4a78572ded2 (patch)
tree5cc3c3f00219db43ddd9ea4267a64ffa649a6932 /activerecord/test
parentbdf91d67484bd836dc34d54b5565ea05dbb37f20 (diff)
downloadrails-667d8ea2ea6d3a24009c531fefd6b4a78572ded2.tar.gz
rails-667d8ea2ea6d3a24009c531fefd6b4a78572ded2.tar.bz2
rails-667d8ea2ea6d3a24009c531fefd6b4a78572ded2.zip
Commit stray fixture.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4897 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test')
-rwxr-xr-xactiverecord/test/fixtures/company.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/test/fixtures/company.rb b/activerecord/test/fixtures/company.rb
index a55632360f..37e4ebda56 100755
--- a/activerecord/test/fixtures/company.rb
+++ b/activerecord/test/fixtures/company.rb
@@ -22,6 +22,7 @@ class Firm < Company
has_many :exclusively_dependent_clients_of_firm, :foreign_key => "client_of", :class_name => "Client", :order => "id", :dependent => :delete_all
has_many :limited_clients, :class_name => "Client", :order => "id", :limit => 1
has_many :clients_like_ms, :conditions => "name = 'Microsoft'", :class_name => "Client", :order => "id"
+ has_many :clients_like_ms_with_hash_conditions, :conditions => { :name => 'Microsoft' }, :class_name => "Client", :order => "id"
has_many :clients_using_sql, :class_name => "Client", :finder_sql => 'SELECT * FROM companies WHERE client_of = #{id}'
has_many :clients_using_counter_sql, :class_name => "Client",
:finder_sql => 'SELECT * FROM companies WHERE client_of = #{id}',
@@ -102,4 +103,4 @@ class Account < ActiveRecord::Base
def validate
errors.add_on_empty "credit_limit"
end
-end \ No newline at end of file
+end