diff options
| author | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-02-05 18:40:52 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafael.franca@plataformatec.com.br> | 2014-02-10 19:44:00 -0200 |
| commit | a7d06943dd54b2d16d63b2b9a67bb97820c7c8d3 (patch) | |
| tree | 333441e0f6cfe242922baa3f3bc03de5593fa52e /lib/arel | |
| parent | f4ab6a39be5c4743ed1dc5605c65688a67dfa42b (diff) | |
| download | rails-a7d06943dd54b2d16d63b2b9a67bb97820c7c8d3.tar.gz rails-a7d06943dd54b2d16d63b2b9a67bb97820c7c8d3.tar.bz2 rails-a7d06943dd54b2d16d63b2b9a67bb97820c7c8d3.zip | |
Remove deprecated Arel::SqlLiteral
Diffstat (limited to 'lib/arel')
| -rw-r--r-- | lib/arel/insert_manager.rb | 2 | ||||
| -rw-r--r-- | lib/arel/select_manager.rb | 2 | ||||
| -rw-r--r-- | lib/arel/sql_literal.rb | 4 | ||||
| -rw-r--r-- | lib/arel/visitors/depth_first.rb | 1 | ||||
| -rw-r--r-- | lib/arel/visitors/dot.rb | 1 | ||||
| -rw-r--r-- | lib/arel/visitors/to_sql.rb | 1 |
6 files changed, 2 insertions, 9 deletions
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 |