Fix issue #193: inSavepoint: should release savepoints that are rolled back.

3 files changed, 6 insertions, 9 deletions

diff --git a/src/FMDatabase.m b/src/FMDatabase.m
index af5301d..66f940f 100644
--- a/src/FMDatabase.m
+++ b/src/FMDatabase.m
@@ -1139,11 +1139,10 @@
     block(&shouldRollback);
     
     if (shouldRollback) {
+        // We need to rollback and release this savepoint to remove it
         [self rollbackToSavePointWithName:name error:&err];
     }
-    else {
-        [self releaseSavePointWithName:name error:&err];
-    }
+    [self releaseSavePointWithName:name error:&err];
     
     return err;
 }
diff --git a/src/FMDatabasePool.m b/src/FMDatabasePool.m
index cc3cb9d..52e1951 100644
--- a/src/FMDatabasePool.m
+++ b/src/FMDatabasePool.m
@@ -229,11 +229,10 @@
     block(db, &shouldRollback);
     
     if (shouldRollback) {
+        // We need to rollback and release this savepoint to remove it
         [db rollbackToSavePointWithName:name error:&err];
     }
-    else {
-        [db releaseSavePointWithName:name error:&err];
-    }
+    [db releaseSavePointWithName:name error:&err];
     
     [self pushDatabaseBackInPool:db];
     
diff --git a/src/FMDatabaseQueue.m b/src/FMDatabaseQueue.m
index 4edd878..af6739a 100644
--- a/src/FMDatabaseQueue.m
+++ b/src/FMDatabaseQueue.m
@@ -160,11 +160,10 @@
             block([self database], &shouldRollback);
             
             if (shouldRollback) {
+                // We need to rollback and release this savepoint to remove it
                 [[self database] rollbackToSavePointWithName:name error:&err];
             }
-            else {
-                [[self database] releaseSavePointWithName:name error:&err];
-            }
+            [[self database] releaseSavePointWithName:name error:&err];
             
         }
     });