Remove deprecated Arel::Expression

7 files changed, 0 insertions, 31 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
diff --git a/test/nodes/test_count.rb b/test/nodes/test_count.rb
index 88d2a694c8..a9a329420e 100644
--- a/test/nodes/test_count.rb
+++ b/test/nodes/test_count.rb
@@ -1,12 +1,6 @@
 require 'helper'
 
 describe Arel::Nodes::Count do
-  describe 'backwards compatibility' do
-    it 'must be an expression' do
-      Arel::Nodes::Count.new('foo').must_be_kind_of Arel::Expression
-    end
-  end
-
   describe "as" do
     it 'should alias the count' do
       table = Arel::Table.new :users
diff --git a/test/test_select_manager.rb b/test/test_select_manager.rb
index c1575a7929..cf8903a05b 100644
--- a/test/test_select_manager.rb
+++ b/test/test_select_manager.rb
@@ -449,18 +449,6 @@ module Arel
           SELECT * FROM "users" ORDER BY "users"."id" DESC
         }
       end
-
-      it 'has order attributes for expressions' do
-        table   = Table.new :users
-        manager = Arel::SelectManager.new Table.engine
-        manager.project Nodes::SqlLiteral.new '*'
-        manager.from table
-        manager.order table[:id].count.desc
-        manager.to_sql.must_be_like %{
-          SELECT * FROM "users" ORDER BY COUNT("users"."id") DESC
-        }
-      end
-
     end
 
     describe 'on' do