aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2013-04-28 21:12:14 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2013-04-28 21:12:14 -0700
commita91bde349f736477e3ed44845655e377edaf44bb (patch)
treec2265f68bdba40c7a2370fc07b55ff74b2bf9131 /activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
parent85a56ff01de71d4978e809d86920513a95ddf3a0 (diff)
parent60bb1333c6f11dd89b8422908f974b5a6839f4e7 (diff)
downloadrails-a91bde349f736477e3ed44845655e377edaf44bb.tar.gz
rails-a91bde349f736477e3ed44845655e377edaf44bb.tar.bz2
rails-a91bde349f736477e3ed44845655e377edaf44bb.zip
Merge pull request #10372 from jeremy/statement-invalid-wraps-underlying-exception
StatementInvalid takes WrappedDatabaseException's place
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index 94d9efe521..76c501dec5 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -287,7 +287,7 @@ module ActiveRecord
end
rescue ActiveRecord::StatementInvalid => exception
if exception.message.split(":").first =~ /Packets out of order/
- raise ActiveRecord::StatementInvalid, "'Packets out of order' error was received from the database. Please update your mysql bindings (gem install mysql) and read http://dev.mysql.com/doc/mysql/en/password-hashing.html for more information. If you're on Windows, use the Instant Rails installer to get the updated mysql bindings."
+ raise ActiveRecord::StatementInvalid.new("'Packets out of order' error was received from the database. Please update your mysql bindings (gem install mysql) and read http://dev.mysql.com/doc/mysql/en/password-hashing.html for more information. If you're on Windows, use the Instant Rails installer to get the updated mysql bindings.", exception.original_exception)
else
raise
end