Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
@tenderlove tenderlove authored
Showing with 10 additions and 0 deletions.
  1. +2 −0  lib/arel.rb
  2. +6 −0 lib/arel/relation.rb
  3. +2 −0  lib/arel/tree_manager.rb
View
2  lib/arel.rb
@@ -12,6 +12,8 @@
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
@@ -0,0 +1,6 @@
+module Arel
+ ###
+ # This is deprecated. Fix rails, then remove this.
+ module Relation
+ end
+end
View
2  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
Please sign in to comment.
Something went wrong with that request. Please try again.