aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2015-02-12 14:44:47 +0100
committerYves Senn <yves.senn@gmail.com>2015-02-12 14:45:34 +0100
commit9e9a3c53142d711910816d6bf0402847ffb4a34f (patch)
tree4e0c09d8cacdefc895651aa74da02632c4217535
parentefeaa01e74dd4514568774ce82c4a94271d55cbf (diff)
downloadrails-9e9a3c53142d711910816d6bf0402847ffb4a34f.tar.gz
rails-9e9a3c53142d711910816d6bf0402847ffb4a34f.tar.bz2
rails-9e9a3c53142d711910816d6bf0402847ffb4a34f.zip
get rid of transaction warning when running PG tests.
This finally removes the warning "WARNING: there is no transaction in progress" when running Active Record tests using PostgreSQL.
-rw-r--r--activerecord/test/cases/helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
index 0a577fa2f5..f1f927852c 100644
--- a/activerecord/test/cases/helper.rb
+++ b/activerecord/test/cases/helper.rb
@@ -124,7 +124,7 @@ def enable_extension!(extension, connection)
return connection.reconnect! if connection.extension_enabled?(extension)
connection.enable_extension extension
- connection.commit_db_transaction
+ connection.commit_db_transaction if connection.transaction_open?
connection.reconnect!
end