aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-03-11 00:48:27 +0900
committerGitHub <noreply@github.com>2019-03-11 00:48:27 +0900
commitb75d6ea5d35d61c60f2675ed956c51e71d2b07ad (patch)
treeb3617c7b218c8b52c85fc5378c13c6b73b064d8e /activerecord/lib
parentc87f6841b77e5827ca7bd03a629e2d615fae0d06 (diff)
parent3e6d3e430e53c550e3c282af6f23b803e1652b15 (diff)
downloadrails-b75d6ea5d35d61c60f2675ed956c51e71d2b07ad.tar.gz
rails-b75d6ea5d35d61c60f2675ed956c51e71d2b07ad.tar.bz2
rails-b75d6ea5d35d61c60f2675ed956c51e71d2b07ad.zip
Merge pull request #35449 from pjrebsch/quoting-empty-range
Quote empty ranges like other empty enumerables
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/sanitization.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/sanitization.rb b/activerecord/lib/active_record/sanitization.rb
index e6197752bc..750766714d 100644
--- a/activerecord/lib/active_record/sanitization.rb
+++ b/activerecord/lib/active_record/sanitization.rb
@@ -165,10 +165,11 @@ module ActiveRecord
def quote_bound_value(value, c = connection)
if value.respond_to?(:map) && !value.acts_like?(:string)
- if value.respond_to?(:empty?) && value.empty?
+ quoted = value.map { |v| c.quote(v) }
+ if quoted.empty?
c.quote(nil)
else
- value.map { |v| c.quote(v) }.join(",")
+ quoted.join(",")
end
else
c.quote(value)