Permalink
Browse files

Merge pull request #10372 from jeremy/statement-invalid-wraps-underly…

…ing-exception

StatementInvalid takes WrappedDatabaseException's place
  • Loading branch information...
2 parents 85a56ff + 60bb133 commit a91bde349f736477e3ed44845655e377edaf44bb @jeremy jeremy committed Apr 29, 2013
@@ -433,7 +433,7 @@ def log(sql, name = "SQL", binds = [])
def translate_exception(exception, message)
# override in derived class
- ActiveRecord::StatementInvalid.new(message)
+ ActiveRecord::StatementInvalid.new(message, exception)
end
end
end
@@ -287,7 +287,7 @@ def execute(sql, name = nil)
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
@@ -57,24 +57,25 @@ class RecordNotSaved < ActiveRecordError
class RecordNotDestroyed < ActiveRecordError
end
- # Raised when SQL statement cannot be executed by the database (for example, it's often the case for
- # MySQL when Ruby driver used is too old).
+ # Superclass for all database execution errors.
+ #
+ # Wraps the underlying database error as +original_exception+.
class StatementInvalid < ActiveRecordError
+ attr_reader :original_exception
+
+ def initialize(message, original_exception = nil)
+ super(message)
+ @original_exception = original_exception
+ end
end
# Raised when SQL statement is invalid and the application gets a blank result.
class ThrowResult < ActiveRecordError
end
- # Parent class for all specific exceptions which wrap database driver exceptions
- # provides access to the original exception also.
+ # Defunct wrapper class kept for compatibility.
+ # +StatementInvalid+ wraps the original exception now.
class WrappedDatabaseException < StatementInvalid
- attr_reader :original_exception
-
- def initialize(message, original_exception)
- super(message)
- @original_exception = original_exception
- end
end
# Raised when a record cannot be inserted because it would violate a uniqueness constraint.

0 comments on commit a91bde3

Please sign in to comment.