diff options
| -rw-r--r-- | lib/arel.rb | 3 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/arel.rb b/lib/arel.rb index 14511d5b38..ef2308ca53 100644 --- a/lib/arel.rb +++ b/lib/arel.rb @@ -1,6 +1,7 @@ require 'active_support/inflector' -require 'active_support/core_ext/module/delegation' require 'active_support/core_ext/class/attribute_accessors' +require 'active_support/core_ext/module/delegation' +require 'active_support/core_ext/object/blank' module Arel require 'arel/algebra' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 1c45f34dfe..b210af5ab4 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -53,7 +53,7 @@ Spec::Runner.configure do |config| config.include Check config.before do - Arel::Table.engine = Arel::Sql::Engine.new(ActiveRecord::Base) + Arel::Table.engine = Arel::Sql::Engine.new(ActiveRecord::Base) if defined?(ActiveRecord::Base) end end |