Skip to content
Browse files

load and prefer psych as the YAML parser when it is available

  • Loading branch information...
1 parent 3d6e223 commit 59f3218463228ca2301857cd7bf4f82f308924a6 @tenderlove tenderlove committed Jan 21, 2011
View
5 activerecord/lib/active_record/base.rb
@@ -1,3 +1,8 @@
+begin
+ require 'psych'
+rescue LoadError
+end
+
require 'yaml'
require 'set'
require 'active_support/benchmarkable'
View
6 activerecord/lib/active_record/fixtures.rb
@@ -1,4 +1,10 @@
require 'erb'
+
+begin
+ require 'psych'
+rescue LoadError
+end
+
require 'yaml'
require 'csv'
require 'zlib'
View
6 railties/lib/rails/commands/dbconsole.rb
@@ -1,4 +1,10 @@
require 'erb'
+
+begin
+ require 'psych'
+rescue LoadError
+end
+
require 'yaml'
require 'optparse'
require 'rbconfig'

1 comment on commit 59f3218

@yaroslav

How about #168 as well?..

Please sign in to comment.
Something went wrong with that request. Please try again.