aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/fixtures/file.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/fixtures/file.rb b/activerecord/lib/active_record/fixtures/file.rb
index da07cf5da1..04f494db2c 100644
--- a/activerecord/lib/active_record/fixtures/file.rb
+++ b/activerecord/lib/active_record/fixtures/file.rb
@@ -43,7 +43,10 @@ module ActiveRecord
# Validate our unmarshalled data.
def validate(data)
- raise Fixture::FormatError, 'fixture is not a hash' unless Hash === data
+ unless Hash === data || YAML::Omap === data
+ raise Fixture::FormatError, 'fixture is not a hash'
+ end
+
raise Fixture::FormatError unless data.all? { |name, row| Hash === row }
data
end