aboutsummaryrefslogtreecommitdiffstats
path: root/lib/arel/nodes
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2017-10-06 14:02:58 -0400
committerGitHub <noreply@github.com>2017-10-06 14:02:58 -0400
commit5cc7e774bb4d2190236cdbf46d66c89507ac6933 (patch)
tree7832ebfa6bfd2b46ae076ece193a726833d8cb00 /lib/arel/nodes
parent1ede2ad3c7ae41ed1e06a92358b37c880dea9837 (diff)
parentb416fca38780fb3305d836944ff8880f7097b4b3 (diff)
downloadrails-5cc7e774bb4d2190236cdbf46d66c89507ac6933.tar.gz
rails-5cc7e774bb4d2190236cdbf46d66c89507ac6933.tar.bz2
rails-5cc7e774bb4d2190236cdbf46d66c89507ac6933.zip
Merge pull request #500 from jcoleman/fix_incorrect_typecasting_of_raw_sql_strings
Type-castable attributes should not try to cast SqlLiteral nodes
Diffstat (limited to 'lib/arel/nodes')
-rw-r--r--lib/arel/nodes/casted.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/arel/nodes/casted.rb b/lib/arel/nodes/casted.rb
index 290e4dd38c..1d7385d01b 100644
--- a/lib/arel/nodes/casted.rb
+++ b/lib/arel/nodes/casted.rb
@@ -30,7 +30,7 @@ module Arel
def self.build_quoted other, attribute = nil
case other
- when Arel::Nodes::Node, Arel::Attributes::Attribute, Arel::Table, Arel::Nodes::BindParam, Arel::SelectManager, Arel::Nodes::Quoted
+ when Arel::Nodes::Node, Arel::Attributes::Attribute, Arel::Table, Arel::Nodes::BindParam, Arel::SelectManager, Arel::Nodes::Quoted, Arel::Nodes::SqlLiteral
other
else
case attribute