mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Revert "Merge pull request #113 from xuanxu/remove_relation"
This reverts commit9978fc40a8
, reversing changes made tob454667574
.
This commit is contained in:
parent
9978fc40a8
commit
6e8d158709
3 changed files with 10 additions and 0 deletions
|
@ -12,6 +12,8 @@ require 'arel/attributes'
|
|||
require 'arel/compatibility/wheres'
|
||||
|
||||
#### these are deprecated
|
||||
# The Arel::Relation constant is referenced in Rails
|
||||
require 'arel/relation'
|
||||
require 'arel/expression'
|
||||
####
|
||||
|
||||
|
|
6
lib/arel/relation.rb
Normal file
6
lib/arel/relation.rb
Normal file
|
@ -0,0 +1,6 @@
|
|||
module Arel
|
||||
###
|
||||
# This is deprecated. Fix rails, then remove this.
|
||||
module Relation
|
||||
end
|
||||
end
|
|
@ -1,5 +1,7 @@
|
|||
module Arel
|
||||
class TreeManager
|
||||
# FIXME: Remove this.
|
||||
include Arel::Relation
|
||||
include Arel::FactoryMethods
|
||||
|
||||
attr_reader :ast, :engine
|
||||
|
|
Loading…
Reference in a new issue