aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2015-06-05 19:49:44 +0000
committerVijay Dev <vijaydev.cse@gmail.com>2015-06-05 19:49:44 +0000
commit423f14183f31565cc68d0674733b7b9edf3814a6 (patch)
treefd9e4297b44e647a3bc8cc14cb2e16f6c2004946 /activerecord/lib
parent367395550627328fadf1e8143f65c4266984df2c (diff)
parentde74fe74a815a6fbf1384adbd3ac8b815b48868e (diff)
downloadrails-423f14183f31565cc68d0674733b7b9edf3814a6.tar.gz
rails-423f14183f31565cc68d0674733b7b9edf3814a6.tar.bz2
rails-423f14183f31565cc68d0674733b7b9edf3814a6.zip
Merge branch 'master' of github.com:rails/docrails
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/transactions.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/transactions.rb b/activerecord/lib/active_record/transactions.rb
index 311dacb449..6f2def0df1 100644
--- a/activerecord/lib/active_record/transactions.rb
+++ b/activerecord/lib/active_record/transactions.rb
@@ -196,9 +196,9 @@ module ActiveRecord
# automatically released. The following example demonstrates the problem:
#
# Model.connection.transaction do # BEGIN
- # Model.connection.transaction(requires_new: true) do # CREATE SAVEPOINT active_record_1
+ # Model.connection.transaction(requires_new: true) do # CREATE SAVEPOINT active_record_1
# Model.connection.create_table(...) # active_record_1 now automatically released
- # end # RELEASE savepoint active_record_1
+ # end # RELEASE SAVEPOINT active_record_1
# # ^^^^ BOOM! database error!
# end
#