aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-08-14 17:39:03 -0400
committerGitHub <noreply@github.com>2017-08-14 17:39:03 -0400
commit509dfdca98cf82244c33deae66baf7175279400c (patch)
treebc738981e0a7687fde4f8a3b4bc2216ca0eae255 /activerecord/lib
parent0864735d81f211a26864b113321e648b01726619 (diff)
parent883b2a8ceef5dc23cfb6ea60a616c93c3dbc0fd1 (diff)
downloadrails-509dfdca98cf82244c33deae66baf7175279400c.tar.gz
rails-509dfdca98cf82244c33deae66baf7175279400c.tar.bz2
rails-509dfdca98cf82244c33deae66baf7175279400c.zip
Merge pull request #30214 from kirs/uniqueness-scope-validator
Check :scope input in Uniqueness validator
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/validations/uniqueness.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/validations/uniqueness.rb b/activerecord/lib/active_record/validations/uniqueness.rb
index 2677fade18..baeb653c61 100644
--- a/activerecord/lib/active_record/validations/uniqueness.rb
+++ b/activerecord/lib/active_record/validations/uniqueness.rb
@@ -8,6 +8,10 @@ module ActiveRecord
raise ArgumentError, "#{options[:conditions]} was passed as :conditions but is not callable. " \
"Pass a callable instead: `conditions: -> { where(approved: true) }`"
end
+ unless Array(options[:scope]).all? { |scope| scope.respond_to?(:to_sym) }
+ raise ArgumentError, "#{options[:scope]} is not supported format for :scope option. " \
+ "Pass a symbol or an array of symbols instead: `scope: :user_id`"
+ end
super({ case_sensitive: true }.merge!(options))
@klass = options[:class]
end