Allow ATTACH and DETACH inside of a transaction.

FossilOrigin-Name: 95e8f31658254dd2df3eeaae337aff0fe2125d170ae966c74f4fc70400e099b1

2 files changed, 10 insertions, 10 deletions

diff --git a/test/attach2.test b/test/attach2.test
index f87056854..741f95937 100644
--- a/test/attach2.test
+++ b/test/attach2.test
@@ -374,8 +374,9 @@ do_test attach2-6.1 {
 do_test attach2-6.2 {
   catchsql {
     ATTACH 'test3.db' as aux2;
+    DETACH aux2;
   }
-} {1 {cannot ATTACH database within transaction}}
+} {0 {}}
 
 # EVIDENCE-OF: R-59740-55581 This statement will fail if SQLite is in
 # the middle of a transaction.
@@ -384,13 +385,7 @@ do_test attach2-6.3 {
   catchsql {
     DETACH aux;
   }
-} {1 {cannot DETACH database within transaction}}
-do_test attach2-6.4 {
-  execsql {
-    COMMIT;
-    DETACH aux;
-  }
-} {}
+} {0 {}}
 
 db close
 
diff --git a/test/savepoint.test b/test/savepoint.test
index 8055e61d9..eed8a9e70 100644
--- a/test/savepoint.test
+++ b/test/savepoint.test
@@ -616,12 +616,16 @@ ifcapable auth {
 # First make sure it is not possible to attach or detach a database while
 # a savepoint is open (it is not possible if any transaction is open).
 #
+# UPDATE 2017-07-26:  It is not possible to ATTACH and DETACH within a
+# a transaction.
+#
 do_test savepoint-10.1.1 {
   catchsql {
     SAVEPOINT one;
     ATTACH 'test2.db' AS aux;
+    DETACH aux;
   }
-} {1 {cannot ATTACH database within transaction}}
+} {0 {}}
 do_test savepoint-10.1.2 {
   execsql {
     RELEASE one;
@@ -630,8 +634,9 @@ do_test savepoint-10.1.2 {
   catchsql {
     SAVEPOINT one;
     DETACH aux;
+    ATTACH 'test2.db' AS aux;
   }
-} {1 {cannot DETACH database within transaction}}
+} {0 {}}
 do_test savepoint-10.1.3 {
   execsql {
     RELEASE one;