Browse files

Revert "Revert "Merge pull request #113 from xuanxu/remove_relation""

This reverts commit 6e8d158.
  • Loading branch information...
1 parent 6e8d158 commit d43ae586aab7092c6bf742609ff1dc3ebf6aff6a @tenderlove tenderlove committed Mar 27, 2012
Showing with 0 additions and 10 deletions.
  1. +0 −2 lib/arel.rb
  2. +0 −6 lib/arel/relation.rb
  3. +0 −2 lib/arel/tree_manager.rb
View
2 lib/arel.rb
@@ -12,8 +12,6 @@
require 'arel/compatibility/wheres'
#### these are deprecated
-# The Arel::Relation constant is referenced in Rails
-require 'arel/relation'
require 'arel/expression'
####
View
6 lib/arel/relation.rb
@@ -1,6 +0,0 @@
-module Arel
- ###
- # This is deprecated. Fix rails, then remove this.
- module Relation
- end
-end
View
2 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

0 comments on commit d43ae58

Please sign in to comment.