diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-27 14:12:22 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-03-27 14:12:22 -0700 |
| commit | d43ae586aab7092c6bf742609ff1dc3ebf6aff6a (patch) | |
| tree | d61506d0161a75f5da24ba7d68d96e36e11095a1 /lib | |
| parent | 6e8d1587091e00a84ea24ab92d9e836c3c38bcb8 (diff) | |
| download | rails-d43ae586aab7092c6bf742609ff1dc3ebf6aff6a.tar.gz rails-d43ae586aab7092c6bf742609ff1dc3ebf6aff6a.tar.bz2 rails-d43ae586aab7092c6bf742609ff1dc3ebf6aff6a.zip | |
Revert "Revert "Merge pull request #113 from xuanxu/remove_relation""
This reverts commit 6e8d1587091e00a84ea24ab92d9e836c3c38bcb8.
Diffstat (limited to 'lib')
| -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, 0 insertions, 10 deletions
diff --git a/lib/arel.rb b/lib/arel.rb index b27da2fb05..6d7aec64b1 100644 --- a/lib/arel.rb +++ b/lib/arel.rb @@ -12,8 +12,6 @@ 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 deleted file mode 100644 index 87786d7701..0000000000 --- a/lib/arel/relation.rb +++ /dev/null @@ -1,6 +0,0 @@ -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 99a7164e2e..21a52d8a60 100644 --- a/lib/arel/tree_manager.rb +++ b/lib/arel/tree_manager.rb @@ -1,7 +1,5 @@ module Arel class TreeManager - # FIXME: Remove this. - include Arel::Relation include Arel::FactoryMethods attr_reader :ast, :engine |