diff options
| author | José Valim <jose.valim@gmail.com> | 2009-06-26 11:58:02 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-06-26 11:58:02 +0200 |
| commit | 915f108d6a47b9c29e11ebe0b140ef017eb015b0 (patch) | |
| tree | ae0c42330a9fbdc8395f8a5bae4605ef455c18c1 /activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | |
| parent | aee63a12f2cfd110725c74686ae1eed58e18fda7 (diff) | |
| parent | b5dfdc714fab7d2836e0a979ca88b4a17db9ec06 (diff) | |
| download | rails-915f108d6a47b9c29e11ebe0b140ef017eb015b0.tar.gz rails-915f108d6a47b9c29e11ebe0b140ef017eb015b0.tar.bz2 rails-915f108d6a47b9c29e11ebe0b140ef017eb015b0.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql_adapter.rb')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index d5536e4d67..83cb9cff15 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -563,6 +563,19 @@ module ActiveRecord where_sql end + protected + + def translate_exception(exception, message) + case exception.errno + when 1062 + RecordNotUnique.new(message, exception) + when 1452 + InvalidForeignKey.new(message, exception) + else + super + end + end + private def connect encoding = @config[:encoding] |