diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-09-01 15:00:31 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-09-01 15:08:19 -0700 |
commit | 6f3c6992c529a09c8f8bfdb1f714bb8ff1e23300 (patch) | |
tree | e7439b62a6c946b8bb0d05e93ba47dc9c3836a6e /activerecord/lib | |
parent | 8b9ddbd8f912d4aac475bcbcbd3e3d39b9b73bf9 (diff) | |
download | rails-6f3c6992c529a09c8f8bfdb1f714bb8ff1e23300.tar.gz rails-6f3c6992c529a09c8f8bfdb1f714bb8ff1e23300.tar.bz2 rails-6f3c6992c529a09c8f8bfdb1f714bb8ff1e23300.zip |
* Psych errors with poor yaml formatting are proxied. Fixes #2645, #2731
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 1 | ||||
-rw-r--r-- | activerecord/lib/active_record/fixtures/file.rb | 12 |
2 files changed, 11 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb index 7d793e3cb8..a90c675bf6 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb @@ -1,5 +1,4 @@ require 'active_record/connection_adapters/abstract_adapter' -require 'active_support/core_ext/kernel/requires' require 'active_support/core_ext/string/encoding' module ActiveRecord diff --git a/activerecord/lib/active_record/fixtures/file.rb b/activerecord/lib/active_record/fixtures/file.rb index 04f494db2c..6bad36abb9 100644 --- a/activerecord/lib/active_record/fixtures/file.rb +++ b/activerecord/lib/active_record/fixtures/file.rb @@ -29,11 +29,21 @@ module ActiveRecord rows.each(&block) end + RESCUE_ERRORS = [ ArgumentError ] # :nodoc: + private + if defined?(Psych) && defined?(Psych::SyntaxError) + RESCUE_ERRORS << Psych::SyntaxError + end + def rows return @rows if @rows - data = YAML.load(render(IO.read(@file))) + begin + data = YAML.load(render(IO.read(@file))) + rescue *RESCUE_ERRORS => error + raise Fixture::FormatError, "a YAML error occurred parsing #{@file}. Please note that YAML must be consistently indented using spaces. Tabs are not allowed. Please have a look at http://www.yaml.org/faq.html\nThe exact error was:\n #{error.class}: #{error}", error.backtrace + end @rows = data ? validate(data).to_a : [] end |