aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-08-03 07:01:01 -0300
committerGitHub <noreply@github.com>2016-08-03 07:01:01 -0300
commit8ada07b2b8d63c3379facb5d81485b5fdeafaceb (patch)
tree003d7b7fa7d168a783a2598325189b2ac105ff6e /activerecord
parentba03e6adf30f24e60e5045808f1b56267d6e5d4d (diff)
parentf78eda63ed212300ebb7ea299dc0a9219db0adc6 (diff)
downloadrails-8ada07b2b8d63c3379facb5d81485b5fdeafaceb.tar.gz
rails-8ada07b2b8d63c3379facb5d81485b5fdeafaceb.tar.bz2
rails-8ada07b2b8d63c3379facb5d81485b5fdeafaceb.zip
Merge pull request #26026 from kamipo/tx_serialization_error_should_inherit_statement_invalid
`TransactionSerializationError` should inherit `StatementInvalid` for backward compatibility
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/errors.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/errors.rb b/activerecord/lib/active_record/errors.rb
index 38e4fbec8b..26146dbce7 100644
--- a/activerecord/lib/active_record/errors.rb
+++ b/activerecord/lib/active_record/errors.rb
@@ -292,7 +292,7 @@ module ActiveRecord
#
# * http://www.postgresql.org/docs/current/static/transaction-iso.html
# * https://dev.mysql.com/doc/refman/5.7/en/error-messages-server.html#error_er_lock_deadlock
- class TransactionSerializationError < ActiveRecordError
+ class TransactionSerializationError < StatementInvalid
end
# IrreversibleOrderError is raised when a relation's order is too complex for