aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJuanjo Bazán <jjbazan@gmail.com>2012-03-27 12:52:43 +0200
committerJuanjo Bazán <jjbazan@gmail.com>2012-03-27 12:52:43 +0200
commit00c5435311c621453ce231b74e99c1e9539e47a7 (patch)
treed61506d0161a75f5da24ba7d68d96e36e11095a1 /lib
parentb45466757424b98e1fe9699042d23550fd5b8751 (diff)
downloadrails-00c5435311c621453ce231b74e99c1e9539e47a7.tar.gz
rails-00c5435311c621453ce231b74e99c1e9539e47a7.tar.bz2
rails-00c5435311c621453ce231b74e99c1e9539e47a7.zip
Remove deprecated Relation module
Diffstat (limited to 'lib')
-rw-r--r--lib/arel.rb2
-rw-r--r--lib/arel/relation.rb6
-rw-r--r--lib/arel/tree_manager.rb2
3 files changed, 0 insertions, 10 deletions
diff --git a/lib/arel.rb b/lib/arel.rb
index b27da2fb05..6d7aec64b1 100644
--- a/lib/arel.rb
+++ b/lib/arel.rb
@@ -12,8 +12,6 @@ require 'arel/attributes'
require 'arel/compatibility/wheres'
#### these are deprecated
-# The Arel::Relation constant is referenced in Rails
-require 'arel/relation'
require 'arel/expression'
####
diff --git a/lib/arel/relation.rb b/lib/arel/relation.rb
deleted file mode 100644
index 87786d7701..0000000000
--- a/lib/arel/relation.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-module Arel
- ###
- # This is deprecated. Fix rails, then remove this.
- module Relation
- end
-end
diff --git a/lib/arel/tree_manager.rb b/lib/arel/tree_manager.rb
index 99a7164e2e..21a52d8a60 100644
--- a/lib/arel/tree_manager.rb
+++ b/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