diff options
| author | Vipul A M <vipulnsward@gmail.com> | 2014-01-07 19:00:55 +0530 |
|---|---|---|
| committer | Vipul A M <vipulnsward@gmail.com> | 2014-01-07 19:00:55 +0530 |
| commit | b72e076dde06c7e9d357d4b2baf87c44f8cace79 (patch) | |
| tree | 60a577780eeb2f9f4cdcbc851cbc4eacbd3a3f09 /lib/arel | |
| parent | da32cd1503756eac67ec244b4dcf16c40888134c (diff) | |
| download | rails-b72e076dde06c7e9d357d4b2baf87c44f8cace79.tar.gz rails-b72e076dde06c7e9d357d4b2baf87c44f8cace79.tar.bz2 rails-b72e076dde06c7e9d357d4b2baf87c44f8cace79.zip | |
Extract comparison array to a constant for the time being until removing the check completely.
Diffstat (limited to 'lib/arel')
| -rw-r--r-- | lib/arel/select_manager.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/arel/select_manager.rb b/lib/arel/select_manager.rb index 60df12c700..5fbe642df0 100644 --- a/lib/arel/select_manager.rb +++ b/lib/arel/select_manager.rb @@ -2,6 +2,8 @@ module Arel class SelectManager < Arel::TreeManager include Arel::Crud + STRING_OR_SYMBOL_CLASS = [Symbol, String] + def initialize engine, table = nil super(engine) @ast = Nodes::SelectStatement.new @@ -128,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| - [Symbol, String].include?(x.class) ? SqlLiteral.new(x.to_s) : x + STRING_OR_SYMBOL_CLASS.include?(x.class) ? SqlLiteral.new(x.to_s) : x } self end @@ -152,7 +154,7 @@ module Arel def order *expr # FIXME: We SHOULD NOT be converting these to SqlLiteral automatically @ast.orders.concat expr.map { |x| - String === x || Symbol === x ? Nodes::SqlLiteral.new(x.to_s) : x + STRING_OR_SYMBOL_CLASS.include?(x.class) ? Nodes::SqlLiteral.new(x.to_s) : x } self end |