Merge pull request #636 from robertmryan/master

Refine close logic

Tests/FMDatabaseQueueTests.m

@@ -354,4 +354,19 @@ - (void)testSavePoint
     
 }
 
+- (void)testClose
+{
+    [self.queue inDatabase:^(FMDatabase *adb) {
+        XCTAssertTrue([adb executeUpdate:@"CREATE TABLE close_test (a INTEGER)"]);
+        XCTAssertTrue([adb executeUpdate:@"INSERT INTO close_test VALUES (1)"]);
+        
+        [adb close];
+    }];
+    
+    [self.queue inDatabase:^(FMDatabase *adb) {
+        FMResultSet *ars = [adb executeQuery:@"select * from close_test"];
+        XCTAssertNotNil(ars);
+    }];
+}
+
 @end

src/fmdb/FMDatabase.m

@@ -261,6 +261,8 @@ - (BOOL)close {
     while (retry);
     
     _db = nil;
+    _isOpen = false;
+    
     return YES;
 }
 

src/fmdb/FMDatabaseQueue.m

@@ -156,8 +156,10 @@ - (void)interrupt {
 }
 
 - (FMDatabase*)database {
-    if (!_db) {
-       _db = FMDBReturnRetained([[[self class] databaseClass] databaseWithPath:_path]);
+    if (![_db isOpen]) {
+        if (!_db) {
+           _db = FMDBReturnRetained([[[self class] databaseClass] databaseWithPath:_path]);
+        }
         
 #if SQLITE_VERSION_NUMBER >= 3005000
         BOOL success = [_db openWithFlags:_openFlags vfs:_vfsName];