aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/fixtures.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-03-17 19:36:44 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-03-17 19:36:44 +0000
commit060b9b16aa4104858c13e4fd467b05c8e4fda127 (patch)
treee03e995f2b19d61f2d883bea9951fbd609c129c5 /activerecord/lib/active_record/fixtures.rb
parent78a732bf3ffaab0788c2962d03a059b3a8324a5f (diff)
downloadrails-060b9b16aa4104858c13e4fd467b05c8e4fda127.tar.gz
rails-060b9b16aa4104858c13e4fd467b05c8e4fda127.tar.bz2
rails-060b9b16aa4104858c13e4fd467b05c8e4fda127.zip
Added the possibility of specifying fixtures in multiple calls #816 [kim@tinker.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@915 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/fixtures.rb')
-rwxr-xr-xactiverecord/lib/active_record/fixtures.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb
index e1bfea2d07..6d3170f7bc 100755
--- a/activerecord/lib/active_record/fixtures.rb
+++ b/activerecord/lib/active_record/fixtures.rb
@@ -367,7 +367,7 @@ module Test #:nodoc:
self.use_instantiated_fixtures = true
def self.fixtures(*table_names)
- self.fixture_table_names = table_names.flatten
+ self.fixture_table_names |= table_names.flatten
require_fixture_classes
end