aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafael.franca@plataformatec.com.br>2014-02-10 18:58:54 -0200
committerRafael Mendonça França <rafael.franca@plataformatec.com.br>2014-02-10 19:44:00 -0200
commit7bf868e320efb0b53b0ce51afb925174e5db2377 (patch)
treec44ee94b2761008c817dcb04055a9f6dda0be4c0 /lib
parenta7d06943dd54b2d16d63b2b9a67bb97820c7c8d3 (diff)
downloadrails-7bf868e320efb0b53b0ce51afb925174e5db2377.tar.gz
rails-7bf868e320efb0b53b0ce51afb925174e5db2377.tar.bz2
rails-7bf868e320efb0b53b0ce51afb925174e5db2377.zip
Remove deprecated Arel::Expression
Diffstat (limited to 'lib')
-rw-r--r--lib/arel.rb4
-rw-r--r--lib/arel/expression.rb5
-rw-r--r--lib/arel/nodes/extract.rb2
-rw-r--r--lib/arel/nodes/function.rb1
-rw-r--r--lib/arel/nodes/window.rb1
5 files changed, 0 insertions, 13 deletions
diff --git a/lib/arel.rb b/lib/arel.rb
index a2a358892f..70b46fc486 100644
--- a/lib/arel.rb
+++ b/lib/arel.rb
@@ -11,10 +11,6 @@ require 'arel/table'
require 'arel/attributes'
require 'arel/compatibility/wheres'
-#### these are deprecated
-require 'arel/expression'
-####
-
require 'arel/visitors'
require 'arel/tree_manager'
diff --git a/lib/arel/expression.rb b/lib/arel/expression.rb
deleted file mode 100644
index 3884d6ede6..0000000000
--- a/lib/arel/expression.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module Arel
- module Expression
- include Arel::OrderPredications
- end
-end
diff --git a/lib/arel/nodes/extract.rb b/lib/arel/nodes/extract.rb
index 92fbde62e1..64f5c3ff0f 100644
--- a/lib/arel/nodes/extract.rb
+++ b/lib/arel/nodes/extract.rb
@@ -1,8 +1,6 @@
module Arel
module Nodes
-
class Extract < Arel::Nodes::Unary
- include Arel::Expression
include Arel::Predications
attr_accessor :field
diff --git a/lib/arel/nodes/function.rb b/lib/arel/nodes/function.rb
index dcafbbf1f4..733a00df46 100644
--- a/lib/arel/nodes/function.rb
+++ b/lib/arel/nodes/function.rb
@@ -1,7 +1,6 @@
module Arel
module Nodes
class Function < Arel::Nodes::Node
- include Arel::Expression
include Arel::Predications
include Arel::WindowPredications
attr_accessor :expressions, :alias, :distinct
diff --git a/lib/arel/nodes/window.rb b/lib/arel/nodes/window.rb
index 3c05f47f14..60259e8c05 100644
--- a/lib/arel/nodes/window.rb
+++ b/lib/arel/nodes/window.rb
@@ -1,7 +1,6 @@
module Arel
module Nodes
class Window < Arel::Nodes::Node
- include Arel::Expression
attr_accessor :orders, :framing
def initialize