14516: when calculating the next available username, make sure to take merged
authorWard Vandewege <wvandewege@veritasgenetics.com>
Tue, 20 Nov 2018 18:45:14 +0000 (13:45 -0500)
committerWard Vandewege <wvandewege@veritasgenetics.com>
Tue, 20 Nov 2018 18:45:14 +0000 (13:45 -0500)
accounts into consideration - they have usernames too, and we have a unique
index on username in the users table.

refs #14516

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege@veritasgenetics.com>

services/api/app/models/user.rb

index cc3a22cbf0d75f93563bfb375d1306141e958a26..e621505418a585f55d7cc49160ff561b9f1ed0d4 100644 (file)
@@ -392,7 +392,7 @@ class User < ArvadosModel
     end
     0.upto(6).each do |suffix_len|
       pattern = "%s%s" % [quoted_name, "_" * suffix_len]
-      self.class.
+      self.class.unscoped.
           where("username like '#{pattern}'").
           select(:username).
           order('username asc').