Skip to content
This repository
Browse code

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

This reverts commit 9978fc4, reversing
changes made to b454667.
  • Loading branch information...
commit 6e8d1587091e00a84ea24ab92d9e836c3c38bcb8 1 parent 9978fc4
Aaron Patterson authored March 27, 2012
2  lib/arel.rb
@@ -12,6 +12,8 @@
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'
15 17
 require 'arel/expression'
16 18
 ####
17 19
 
6  lib/arel/relation.rb
... ...
@@ -0,0 +1,6 @@
  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,5 +1,7 @@
1 1
 module Arel
2 2
   class TreeManager
  3
+    # FIXME: Remove this.
  4
+    include Arel::Relation
3 5
     include Arel::FactoryMethods
4 6
 
5 7
     attr_reader :ast, :engine

0 notes on commit 6e8d158

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