diff options
Diffstat (limited to 'lib/arel/nodes')
| -rw-r--r-- | lib/arel/nodes/function.rb | 4 | ||||
| -rw-r--r-- | lib/arel/nodes/infix_operation.rb | 1 | ||||
| -rw-r--r-- | lib/arel/nodes/sql_literal.rb | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/lib/arel/nodes/function.rb b/lib/arel/nodes/function.rb index b58eba7f38..3263ff9cd4 100644 --- a/lib/arel/nodes/function.rb +++ b/lib/arel/nodes/function.rb @@ -6,12 +6,12 @@ module Arel def initialize expr, aliaz = nil @expressions = expr - @alias = aliaz + @alias = aliaz && SqlLiteral.new(aliaz.to_s) @distinct = false end def as aliaz - self.alias = SqlLiteral.new(aliaz) + self.alias = SqlLiteral.new(aliaz.to_s) self end end diff --git a/lib/arel/nodes/infix_operation.rb b/lib/arel/nodes/infix_operation.rb index 6847650fe4..75879ce43f 100644 --- a/lib/arel/nodes/infix_operation.rb +++ b/lib/arel/nodes/infix_operation.rb @@ -4,6 +4,7 @@ module Arel class InfixOperation < Binary include Arel::Expressions include Arel::Predications + include Arel::AliasPredication include Arel::Math attr_reader :operator diff --git a/lib/arel/nodes/sql_literal.rb b/lib/arel/nodes/sql_literal.rb index ad0bb00484..2e934b2a1b 100644 --- a/lib/arel/nodes/sql_literal.rb +++ b/lib/arel/nodes/sql_literal.rb @@ -3,6 +3,7 @@ module Arel class SqlLiteral < String include Arel::Expressions include Arel::Predications + include Arel::AliasPredication include Arel::OrderPredications end end |