Only use LOWER for mysql case insensitive uniqueness check when column has a case sensitive collation.

4 files changed, 96 insertions, 1 deletions

diff --git a/activerecord/test/cases/adapters/mysql/case_sensitivity_test.rb b/activerecord/test/cases/adapters/mysql/case_sensitivity_test.rb
new file mode 100644
index 0000000000..5ffd886dab
--- /dev/null
+++ b/activerecord/test/cases/adapters/mysql/case_sensitivity_test.rb
@@ -0,0 +1,35 @@
+require "cases/helper"
+require 'models/person'
+
+class MysqlCaseSensitivityTest < ActiveRecord::TestCase
+  class CollationTest < ActiveRecord::Base
+    validates_uniqueness_of :string_cs_column, :case_sensitive => false
+    validates_uniqueness_of :string_ci_column, :case_sensitive => false
+  end
+
+  def test_columns_include_collation_different_from_table
+    assert_equal 'utf8_bin', CollationTest.columns_hash['string_cs_column'].collation
+    assert_equal 'utf8_general_ci', CollationTest.columns_hash['string_ci_column'].collation
+  end
+
+  def test_case_sensitive
+    assert !CollationTest.columns_hash['string_ci_column'].case_sensitive?
+    assert CollationTest.columns_hash['string_cs_column'].case_sensitive?
+  end
+
+  def test_case_insensitive_comparison_for_ci_column
+    CollationTest.create!(:string_ci_column => 'A')
+    invalid = CollationTest.new(:string_ci_column => 'a')
+    queries = assert_sql { invalid.save }
+    ci_uniqueness_query = queries.detect { |q| q.match /string_ci_column/ }
+    assert_no_match(/lower/i, ci_uniqueness_query)
+  end
+
+  def test_case_insensitive_comparison_for_cs_column
+    CollationTest.create!(:string_cs_column => 'A')
+    invalid = CollationTest.new(:string_cs_column => 'a')
+    queries = assert_sql { invalid.save }
+    cs_uniqueness_query = queries.detect { |q| q.match /string_cs_column/ }
+    assert_match(/lower/i, cs_uniqueness_query)
+  end
+end
diff --git a/activerecord/test/cases/adapters/mysql2/case_sensitivity_test.rb b/activerecord/test/cases/adapters/mysql2/case_sensitivity_test.rb
new file mode 100644
index 0000000000..0d5ba3079e
--- /dev/null
+++ b/activerecord/test/cases/adapters/mysql2/case_sensitivity_test.rb
@@ -0,0 +1,38 @@
+require "cases/helper"
+require 'models/person'
+
+class Mysql2CaseSensitivityTest < ActiveRecord::TestCase
+
+  class CollationTest < ActiveRecord::Base
+    validates_uniqueness_of :string_cs_column, :case_sensitive => false
+    validates_uniqueness_of :string_ci_column, :case_sensitive => false
+  end
+
+  def test_columns_include_collation_different_from_table
+    assert_equal 'utf8_bin', CollationTest.columns_hash['string_cs_column'].collation
+    assert_equal 'utf8_general_ci', CollationTest.columns_hash['string_ci_column'].collation
+  end
+
+  def test_case_sensitive
+    assert !CollationTest.columns_hash['string_ci_column'].case_sensitive?
+    assert CollationTest.columns_hash['string_cs_column'].case_sensitive?
+  end
+
+  def test_case_insensitive_comparison_for_ci_column
+    CollationTest.create!(:string_ci_column => 'A')
+    invalid = CollationTest.new(:string_ci_column => 'a')
+    queries = assert_sql { invalid.save }
+    ci_uniqueness_query = queries.detect { |q| q.match /string_ci_column/ }
+    assert_no_match(/lower/i, ci_uniqueness_query)
+  end
+
+  def test_case_insensitive_comparison_for_cs_column
+    CollationTest.create!(:string_cs_column => 'A')
+    invalid = CollationTest.new(:string_cs_column => 'a')
+    queries = assert_sql { invalid.save }
+    cs_uniqueness_query = queries.detect { |q| q.match /string_cs_column/ }
+    assert_match(/lower/i, cs_uniqueness_query)
+  end
+
+
+end
\ No newline at end of file
diff --git a/activerecord/test/schema/mysql2_specific_schema.rb b/activerecord/test/schema/mysql2_specific_schema.rb
index c78d99f4af..ab2c7ccc10 100644
--- a/activerecord/test/schema/mysql2_specific_schema.rb
+++ b/activerecord/test/schema/mysql2_specific_schema.rb
@@ -21,4 +21,15 @@ BEGIN
 END
 SQL
 
-end
+  ActiveRecord::Base.connection.execute <<-SQL
+DROP TABLE IF EXISTS collation_tests;
+SQL
+
+  ActiveRecord::Base.connection.execute <<-SQL
+CREATE TABLE collation_tests (
+  string_cs_column VARCHAR(1) COLLATE utf8_bin,
+  string_ci_column VARCHAR(1) COLLATE utf8_general_ci
+) CHARACTER SET utf8 COLLATE utf8_general_ci
+SQL
+
+end
\ No newline at end of file
diff --git a/activerecord/test/schema/mysql_specific_schema.rb b/activerecord/test/schema/mysql_specific_schema.rb
index 30e1c5a167..a0adfe3752 100644
--- a/activerecord/test/schema/mysql_specific_schema.rb
+++ b/activerecord/test/schema/mysql_specific_schema.rb
@@ -32,4 +32,15 @@ BEGIN
 END
 SQL
 
+  ActiveRecord::Base.connection.execute <<-SQL
+DROP TABLE IF EXISTS collation_tests;
+SQL
+
+  ActiveRecord::Base.connection.execute <<-SQL
+CREATE TABLE collation_tests (
+  string_cs_column VARCHAR(1) COLLATE utf8_bin,
+  string_ci_column VARCHAR(1) COLLATE utf8_general_ci
+) CHARACTER SET utf8 COLLATE utf8_general_ci
+SQL
+
 end