aboutsummaryrefslogtreecommitdiffstats
path: root/lib/arel.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-03-27 13:54:21 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-03-27 13:54:21 -0700
commit6e8d1587091e00a84ea24ab92d9e836c3c38bcb8 (patch)
treee1cc2a19420d89c70e8c1c09c2947b367efe45f2 /lib/arel.rb
parent9978fc40a8a5a262670279129a335845ad647f48 (diff)
downloadrails-6e8d1587091e00a84ea24ab92d9e836c3c38bcb8.tar.gz
rails-6e8d1587091e00a84ea24ab92d9e836c3c38bcb8.tar.bz2
rails-6e8d1587091e00a84ea24ab92d9e836c3c38bcb8.zip
Revert "Merge pull request #113 from xuanxu/remove_relation"
This reverts commit 9978fc40a8a5a262670279129a335845ad647f48, reversing changes made to b45466757424b98e1fe9699042d23550fd5b8751.
Diffstat (limited to 'lib/arel.rb')
-rw-r--r--lib/arel.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/arel.rb b/lib/arel.rb
index 6d7aec64b1..b27da2fb05 100644
--- a/lib/arel.rb
+++ b/lib/arel.rb
@@ -12,6 +12,8 @@ require 'arel/attributes'
require 'arel/compatibility/wheres'
#### these are deprecated
+# The Arel::Relation constant is referenced in Rails
+require 'arel/relation'
require 'arel/expression'
####