diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-27 13:54:21 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-27 13:54:21 -0700 |
| commit | 6e8d1587091e00a84ea24ab92d9e836c3c38bcb8 (patch) | |
| tree | e1cc2a19420d89c70e8c1c09c2947b367efe45f2 | |
| parent | 9978fc40a8a5a262670279129a335845ad647f48 (diff) | |
| download | rails-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.
| -rw-r--r-- | lib/arel.rb | 2 | ||||
| -rw-r--r-- | lib/arel/relation.rb | 6 | ||||
| -rw-r--r-- | lib/arel/tree_manager.rb | 2 |
3 files changed, 10 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' #### diff --git a/lib/arel/relation.rb b/lib/arel/relation.rb new file mode 100644 index 0000000000..87786d7701 --- /dev/null +++ b/lib/arel/relation.rb @@ -0,0 +1,6 @@ +module Arel + ### + # This is deprecated. Fix rails, then remove this. + module Relation + end +end diff --git a/lib/arel/tree_manager.rb b/lib/arel/tree_manager.rb index 21a52d8a60..99a7164e2e 100644 --- a/lib/arel/tree_manager.rb +++ b/lib/arel/tree_manager.rb @@ -1,5 +1,7 @@ module Arel class TreeManager + # FIXME: Remove this. + include Arel::Relation include Arel::FactoryMethods attr_reader :ast, :engine |