Merge branch '2'

README.md

@@ -1,6 +1,7 @@
 # PostgreSQL Module Module
 
 [![Build Status](https://travis-ci.org/silverstripe/silverstripe-postgresql.png?branch=master)](https://travis-ci.org/silverstripe/silverstripe-postgresql)
+[![SilverStripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)
 
 ## Maintainer Contact
 

code/PostgreSQLDatabase.php

@@ -547,16 +547,31 @@ class PostgreSQLDatabase extends Database
 
     public function transactionRollback($savepoint = false)
     {
+        // Named savepoint
         if ($savepoint) {
             $this->query('ROLLBACK TO ' . $savepoint);
-        } else {
-            --$this->transactionNesting;
-            if ($this->transactionNesting > 0) {
-                $this->transactionRollback('NESTEDTRANSACTION' . $this->transactionNesting);
-            } else {
-                $this->query('ROLLBACK');
-            }
+            return true;
         }
+
+        // Abort if unable to unnest, otherwise jump up a level
+        if (!$this->transactionNesting) {
+            return false;
+        }
+        --$this->transactionNesting;
+
+        // Rollback nested
+        if ($this->transactionNesting > 0) {
+            return $this->transactionRollback('NESTEDTRANSACTION' . $this->transactionNesting);
+        }
+
+        // Rollback top level
+        $this->query('ROLLBACK');
+        return true;
+    }
+
+    public function transactionDepth()
+    {
+        return $this->transactionNesting;
     }
 
     public function transactionEnd($chain = false)