aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
diff options
context:
space:
mode:
authorJoseph Palermo <pair+jpalermo@pivotallabs.com>2011-10-09 04:38:36 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2011-10-09 13:14:07 -0700
commitc90e5ce779dbf9bd0ee53b68aee9fde2997be123 (patch)
tree669dc5ffd58bce787a1aeb89c38d53b13a9bea28 /activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
parent8f8fd4f3aacf252aa0330798590988cc5fe39ba7 (diff)
downloadrails-c90e5ce779dbf9bd0ee53b68aee9fde2997be123.tar.gz
rails-c90e5ce779dbf9bd0ee53b68aee9fde2997be123.tar.bz2
rails-c90e5ce779dbf9bd0ee53b68aee9fde2997be123.zip
Only use LOWER for mysql case insensitive uniqueness check when column has a case sensitive collation.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
index 8b574518e5..971f3c35f3 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
@@ -47,8 +47,8 @@ module ActiveRecord
end
end
- def new_column(field, default, type, null) # :nodoc:
- Column.new(field, default, type, null)
+ def new_column(field, default, type, null, collation) # :nodoc:
+ Column.new(field, default, type, null, collation)
end
def error_number(exception)