Skip to content
This repository
Browse code

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

This reverts commit 6e8d158.
  • Loading branch information...
commit d43ae586aab7092c6bf742609ff1dc3ebf6aff6a 1 parent 6e8d158
Aaron Patterson authored
2  lib/arel.rb
@@ -12,8 +12,6 @@
12 12
 require 'arel/compatibility/wheres'
13 13
 
14 14
 #### these are deprecated
15  
-# The Arel::Relation constant is referenced in Rails
16  
-require 'arel/relation'
17 15
 require 'arel/expression'
18 16
 ####
19 17
 
6  lib/arel/relation.rb
... ...
@@ -1,6 +0,0 @@
1  
-module Arel
2  
-  ###
3  
-  # This is deprecated.  Fix rails, then remove this.
4  
-  module Relation
5  
-  end
6  
-end
2  lib/arel/tree_manager.rb
... ...
@@ -1,7 +1,5 @@
1 1
 module Arel
2 2
   class TreeManager
3  
-    # FIXME: Remove this.
4  
-    include Arel::Relation
5 3
     include Arel::FactoryMethods
6 4
 
7 5
     attr_reader :ast, :engine

0 notes on commit d43ae58

Please sign in to comment.
Something went wrong with that request. Please try again.