From a09c9f061734436bb59ff3571284800319ae009f Mon Sep 17 00:00:00 2001 From: Vipul A M Date: Sat, 4 Jan 2014 15:20:23 +0530 Subject: Removed deprecated `Arel::Sql::Engine` and make use of `FakeRecord::Base` inplace directly for test helper. --- lib/arel.rb | 1 - lib/arel/sql/engine.rb | 10 ---------- 2 files changed, 11 deletions(-) delete mode 100644 lib/arel/sql/engine.rb (limited to 'lib') diff --git a/lib/arel.rb b/lib/arel.rb index fd0a81a5a0..b1faf8ef71 100644 --- a/lib/arel.rb +++ b/lib/arel.rb @@ -27,7 +27,6 @@ require 'arel/nodes' #### these are deprecated require 'arel/deprecated' -require 'arel/sql/engine' require 'arel/sql_literal' #### diff --git a/lib/arel/sql/engine.rb b/lib/arel/sql/engine.rb deleted file mode 100644 index 8917f5f294..0000000000 --- a/lib/arel/sql/engine.rb +++ /dev/null @@ -1,10 +0,0 @@ -module Arel - module Sql - class Engine - def self.new thing - #warn "#{caller.first} -- Engine will be removed" - thing - end - end - end -end -- cgit v1.2.3 From d956772b3c61d97940ebcccd7c83e2397ca0c36c Mon Sep 17 00:00:00 2001 From: Vipul A M Date: Tue, 7 Jan 2014 17:57:39 +0530 Subject: Remove deprecated `SelectManager#to_a` --- lib/arel/select_manager.rb | 6 ------ 1 file changed, 6 deletions(-) (limited to 'lib') diff --git a/lib/arel/select_manager.rb b/lib/arel/select_manager.rb index 5fbe642df0..010845cf56 100644 --- a/lib/arel/select_manager.rb +++ b/lib/arel/select_manager.rb @@ -255,12 +255,6 @@ module Arel end end - def to_a # :nodoc: - warn "to_a is deprecated. Please remove it from #{caller[0]}" - # FIXME: I think `select` should be made public... - @engine.connection.send(:select, to_sql, 'AREL').map { |x| Row.new(x) } - end - private def collapse exprs, existing = nil exprs = exprs.unshift(existing.expr) if existing -- cgit v1.2.3 From 36d3452f0471b9e2c151abf43e0392cb54f1f422 Mon Sep 17 00:00:00 2001 From: Vipul A M Date: Tue, 7 Jan 2014 18:53:34 +0530 Subject: Remove deprecated `SelectManager#joins` --- lib/arel/select_manager.rb | 8 -------- 1 file changed, 8 deletions(-) (limited to 'lib') diff --git a/lib/arel/select_manager.rb b/lib/arel/select_manager.rb index 010845cf56..f251d0d09e 100644 --- a/lib/arel/select_manager.rb +++ b/lib/arel/select_manager.rb @@ -235,14 +235,6 @@ module Arel @ctx.source end - def joins manager - if $VERBOSE - warn "joins is deprecated and will be removed in 4.0.0" - warn "please remove your call to joins from #{caller.first}" - end - manager.join_sql - end - class Row < Struct.new(:data) # :nodoc: def id data['id'] -- cgit v1.2.3 From f4ab6a39be5c4743ed1dc5605c65688a67dfa42b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 5 Feb 2014 18:26:22 -0200 Subject: Remove deprecated constant aliases --- lib/arel.rb | 1 - lib/arel/deprecated.rb | 4 ---- 2 files changed, 5 deletions(-) delete mode 100644 lib/arel/deprecated.rb (limited to 'lib') diff --git a/lib/arel.rb b/lib/arel.rb index b1faf8ef71..38cb47de5a 100644 --- a/lib/arel.rb +++ b/lib/arel.rb @@ -26,7 +26,6 @@ require 'arel/nodes' #### these are deprecated -require 'arel/deprecated' require 'arel/sql_literal' #### diff --git a/lib/arel/deprecated.rb b/lib/arel/deprecated.rb deleted file mode 100644 index 31db11bd2c..0000000000 --- a/lib/arel/deprecated.rb +++ /dev/null @@ -1,4 +0,0 @@ -module Arel - InnerJoin = Nodes::InnerJoin - OuterJoin = Nodes::OuterJoin -end -- cgit v1.2.3 From a7d06943dd54b2d16d63b2b9a67bb97820c7c8d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Wed, 5 Feb 2014 18:40:52 -0200 Subject: Remove deprecated Arel::SqlLiteral --- lib/arel.rb | 5 ----- lib/arel/insert_manager.rb | 2 +- lib/arel/select_manager.rb | 2 +- lib/arel/sql_literal.rb | 4 ---- lib/arel/visitors/depth_first.rb | 1 - lib/arel/visitors/dot.rb | 1 - lib/arel/visitors/to_sql.rb | 1 - 7 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 lib/arel/sql_literal.rb (limited to 'lib') diff --git a/lib/arel.rb b/lib/arel.rb index 38cb47de5a..a2a358892f 100644 --- a/lib/arel.rb +++ b/lib/arel.rb @@ -24,11 +24,6 @@ require 'arel/update_manager' require 'arel/delete_manager' require 'arel/nodes' - -#### these are deprecated -require 'arel/sql_literal' -#### - module Arel VERSION = '5.0.0' diff --git a/lib/arel/insert_manager.rb b/lib/arel/insert_manager.rb index d6a11b7be0..b5d2aeb3a4 100644 --- a/lib/arel/insert_manager.rb +++ b/lib/arel/insert_manager.rb @@ -17,7 +17,7 @@ module Arel return if fields.empty? if String === fields - @ast.values = SqlLiteral.new(fields) + @ast.values = Nodes::SqlLiteral.new(fields) else @ast.relation ||= fields.first.first.relation diff --git a/lib/arel/select_manager.rb b/lib/arel/select_manager.rb index f251d0d09e..e3d8792aca 100644 --- a/lib/arel/select_manager.rb +++ b/lib/arel/select_manager.rb @@ -130,7 +130,7 @@ module Arel # FIXME: converting these to SQLLiterals is probably not good, but # rails tests require it. @ctx.projections.concat projections.map { |x| - STRING_OR_SYMBOL_CLASS.include?(x.class) ? SqlLiteral.new(x.to_s) : x + STRING_OR_SYMBOL_CLASS.include?(x.class) ? Nodes::SqlLiteral.new(x.to_s) : x } self end diff --git a/lib/arel/sql_literal.rb b/lib/arel/sql_literal.rb deleted file mode 100644 index 5cb4973117..0000000000 --- a/lib/arel/sql_literal.rb +++ /dev/null @@ -1,4 +0,0 @@ -module Arel - class SqlLiteral < Nodes::SqlLiteral - end -end diff --git a/lib/arel/visitors/depth_first.rb b/lib/arel/visitors/depth_first.rb index 67cdecfa36..18bd81fb9c 100644 --- a/lib/arel/visitors/depth_first.rb +++ b/lib/arel/visitors/depth_first.rb @@ -112,7 +112,6 @@ module Arel alias :visit_Arel_Nodes_SqlLiteral :terminal alias :visit_Arel_Nodes_BindParam :terminal alias :visit_Arel_Nodes_Window :terminal - alias :visit_Arel_SqlLiteral :terminal alias :visit_BigDecimal :terminal alias :visit_Bignum :terminal alias :visit_Class :terminal diff --git a/lib/arel/visitors/dot.rb b/lib/arel/visitors/dot.rb index 82b8c771e4..cb4c2d494c 100644 --- a/lib/arel/visitors/dot.rb +++ b/lib/arel/visitors/dot.rb @@ -193,7 +193,6 @@ module Arel alias :visit_NilClass :visit_String alias :visit_TrueClass :visit_String alias :visit_FalseClass :visit_String - alias :visit_Arel_SqlLiteral :visit_String alias :visit_Arel_Nodes_BindParam :visit_String alias :visit_Fixnum :visit_String alias :visit_BigDecimal :visit_String diff --git a/lib/arel/visitors/to_sql.rb b/lib/arel/visitors/to_sql.rb index 554f98da14..bd0cd8f03c 100644 --- a/lib/arel/visitors/to_sql.rb +++ b/lib/arel/visitors/to_sql.rb @@ -550,7 +550,6 @@ module Arel alias :visit_Arel_Nodes_BindParam :literal alias :visit_Arel_Nodes_SqlLiteral :literal - alias :visit_Arel_SqlLiteral :literal # This is deprecated alias :visit_Bignum :literal alias :visit_Fixnum :literal -- cgit v1.2.3 From 7bf868e320efb0b53b0ce51afb925174e5db2377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Mon, 10 Feb 2014 18:58:54 -0200 Subject: Remove deprecated Arel::Expression --- lib/arel.rb | 4 ---- lib/arel/expression.rb | 5 ----- lib/arel/nodes/extract.rb | 2 -- lib/arel/nodes/function.rb | 1 - lib/arel/nodes/window.rb | 1 - 5 files changed, 13 deletions(-) delete mode 100644 lib/arel/expression.rb (limited to 'lib') 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 -- cgit v1.2.3