From: Tom Hughes <tom@compton.nu>
Date: Mon, 12 Dec 2011 19:11:06 +0000 (+0000)
Subject: Require user names and emails to be case insensitively unique
X-Git-Tag: live~6544
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/af2b13c2c1c220326241784b1d237d85ff388426?hp=ebf597971f447344e08d85925118ed89418b8d19

Require user names and emails to be case insensitively unique

Any existing clashes are allowed to remain for now, byt any new
accounts, or changes to names on existing accounts, must be unique
without regard to case.
---

diff --git a/app/models/user.rb b/app/models/user.rb
index d3a05d4bb..56c8890b5 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -24,8 +24,8 @@ class User < ActiveRecord::Base
   validates_presence_of :email, :display_name
   validates_confirmation_of :email#, :message => ' addresses must match'
   validates_confirmation_of :pass_crypt#, :message => ' must match the confirmation password'
-  validates_uniqueness_of :display_name, :allow_nil => true
-  validates_uniqueness_of :email
+  validates_uniqueness_of :display_name, :allow_nil => true, :case_sensitive => false, :if => Proc.new { |u| u.display_name_changed? }
+  validates_uniqueness_of :email, :case_sensitive => false, :if => Proc.new { |u| u.email_changed? }
   validates_uniqueness_of :openid_url, :allow_nil => true
   validates_length_of :pass_crypt, :within => 8..255
   validates_length_of :display_name, :within => 3..255, :allow_nil => true
diff --git a/db/migrate/20111212183945_add_lowercase_user_indexes.rb b/db/migrate/20111212183945_add_lowercase_user_indexes.rb
new file mode 100644
index 000000000..27355b1d1
--- /dev/null
+++ b/db/migrate/20111212183945_add_lowercase_user_indexes.rb
@@ -0,0 +1,13 @@
+require 'lib/migrate'
+
+class AddLowercaseUserIndexes < ActiveRecord::Migration
+  def up
+    add_index :users, :display_name, :lowercase => true, :name => "users_display_name_lower_idx"
+    add_index :users, :email, :lowercase => true, :name => "users_email_lower_idx"
+  end
+
+  def down
+    remove_index :users, :name => "users_email_lower_idx"
+    remove_index :users, :name => "users_display_name_lower_idx"
+  end
+end
diff --git a/lib/migrate.rb b/lib/migrate.rb
index 81cdd4d05..b3cffd870 100644
--- a/lib/migrate.rb
+++ b/lib/migrate.rb
@@ -198,7 +198,13 @@ module ActiveRecord
         else
           index_type = options
         end
-        quoted_column_names = column_names.map { |e| quote_column_name(e) }.join(", ")
+
+        quoted_column_names = column_names.map { |e| quote_column_name(e) }
+        if Hash === options and options[:lowercase]
+          quoted_column_names = quoted_column_names.map { |e| "LOWER(#{e})" }
+        end
+        quoted_column_names = quoted_column_names.join(", ")
+
         execute "CREATE #{index_type} INDEX #{quote_column_name(index_name)} ON #{quote_table_name(table_name)} USING #{index_method} (#{quoted_column_names})"
       end
     end