diff options
author | Jon Moss <maclover7@users.noreply.github.com> | 2016-06-27 10:24:34 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-06-27 10:24:34 -0400 |
commit | bec81dca8cdd4d0aff8565ac928f08ff44e97c30 (patch) | |
tree | 833732710e83a3617d7e49b7d620034b45096118 /activerecord | |
parent | e78e0e2a42c77ee82611d01b712505577c8dc38e (diff) | |
parent | d6f0a1a603b2186ba16fac3748e0b90f47f4eac4 (diff) | |
download | rails-bec81dca8cdd4d0aff8565ac928f08ff44e97c30.tar.gz rails-bec81dca8cdd4d0aff8565ac928f08ff44e97c30.tar.bz2 rails-bec81dca8cdd4d0aff8565ac928f08ff44e97c30.zip |
Merge pull request #25536 from alexcameron89/update-transactions
[ci skip] Clarify DDL term in ActiveRecord::Transactions
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/transactions.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb index 77c2845d88..0ee1ebcfbe 100644 --- a/activerecord/lib/active_record/transactions.rb +++ b/activerecord/lib/active_record/transactions.rb @@ -189,8 +189,8 @@ module ActiveRecord # # === Caveats # - # If you're on MySQL, then do not use DDL operations in nested transactions - # blocks that are emulated with savepoints. That is, do not execute statements + # If you're on MySQL, then do not use Data Definition Language(DDL) operations in nested + # transactions blocks that are emulated with savepoints. That is, do not execute statements # like 'CREATE TABLE' inside such blocks. This is because MySQL automatically # releases all savepoints upon executing a DDL operation. When +transaction+ # is finished and tries to release the savepoint it created earlier, a @@ -480,11 +480,11 @@ module ActiveRecord # Updates the attributes on this particular Active Record object so that # if it's associated with a transaction, then the state of the Active Record - # object will be updated to reflect the current state of the transaction + # object will be updated to reflect the current state of the transaction. # # The +@transaction_state+ variable stores the states of the associated # transaction. This relies on the fact that a transaction can only be in - # one rollback or commit (otherwise a list of states would be required) + # one rollback or commit (otherwise a list of states would be required). # Each Active Record object inside of a transaction carries that transaction's # TransactionState. # |