fix: updated to fix issue with close/open database when deleting

biozal · biozal · commit 1e731a93d1e0 · 2024-07-16T22:30:54.000-05:00
diff --git a/ios/CblReactnative.swift b/ios/CblReactnative.swift
@@ -45,6 +45,8 @@ class CblReactnative: NSObject {
                 let hashConfig = AnyHashable(config)
                 try DatabaseManager.shared.open(databaseName, databaseConfig: hashConfig as? [AnyHashable : Any])
                 resolve(nil)
+            } catch let error as NSError {
+                reject("DATABASE_ERROR", error.localizedDescription, nil)
             } catch {
                 reject("DATABASE_ERROR", error.localizedDescription, nil)
             }
@@ -68,6 +70,8 @@ class CblReactnative: NSObject {
                 }
                 try DatabaseManager.shared.close(databaseName)
                 resolve(nil)
+            } catch let error as NSError {
+                reject("DATABASE_ERROR", error.localizedDescription, nil)
             } catch {
                 reject("DATABASE_ERROR", error.localizedDescription, nil)
             }
@@ -91,7 +95,10 @@ class CblReactnative: NSObject {
                 }
                 try DatabaseManager.shared.delete(databaseName)
                 resolve(nil)
-            } catch {
+            } catch let error as NSError {
+                reject("DATABASE_ERROR", error.localizedDescription, nil)
+            }
+            catch {
                 reject("DATABASE_ERROR", error.localizedDescription, nil)
             }
         }
diff --git a/src/cblite-js b/src/cblite-js
@@ -1 +1 @@
-Subproject commit ce1e91bf82e749e07f1581b86c0fb27ab2922964
+Subproject commit 522e0b065a7a7d12b0807c8acab4bb4e7dc2a010
diff --git a/yarn.lock b/yarn.lock
@@ -2574,7 +2574,7 @@ camelcase@^7.0.1:
 caniuse-lite@^1.0.30001640:
   version "1.0.30001640"
 
-"cbl-reactnative-example@file:/Users/labeaaa/Developer/couchbase/cbl-reactnative/example":
+"cbl-reactnative-example@file:/Users/aaron.labeau/Developer/Couchbase/cbl-reactnative/example":
   version "0.0.1"
   resolved "file:example"
   dependencies:

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,8 @@ class CblReactnative: NSObject {`
`45`	`45`	`let hashConfig = AnyHashable(config)`
`46`	`46`	`try DatabaseManager.shared.open(databaseName, databaseConfig: hashConfig as? [AnyHashable : Any])`
`47`	`47`	`resolve(nil)`
	`48`	`+ } catch let error as NSError {`
	`49`	`+ reject("DATABASE_ERROR", error.localizedDescription, nil)`
`48`	`50`	`} catch {`
`49`	`51`	`reject("DATABASE_ERROR", error.localizedDescription, nil)`
`50`	`52`	`}`
`@@ -68,6 +70,8 @@ class CblReactnative: NSObject {`
`68`	`70`	`}`
`69`	`71`	`try DatabaseManager.shared.close(databaseName)`
`70`	`72`	`resolve(nil)`
	`73`	`+ } catch let error as NSError {`
	`74`	`+ reject("DATABASE_ERROR", error.localizedDescription, nil)`
`71`	`75`	`} catch {`
`72`	`76`	`reject("DATABASE_ERROR", error.localizedDescription, nil)`
`73`	`77`	`}`
`@@ -91,7 +95,10 @@ class CblReactnative: NSObject {`
`91`	`95`	`}`
`92`	`96`	`try DatabaseManager.shared.delete(databaseName)`
`93`	`97`	`resolve(nil)`
`94`		`- } catch {`
	`98`	`+ } catch let error as NSError {`
	`99`	`+ reject("DATABASE_ERROR", error.localizedDescription, nil)`
	`100`	`+ }`
	`101`	`+ catch {`
`95`	`102`	`reject("DATABASE_ERROR", error.localizedDescription, nil)`
`96`	`103`	`}`
`97`	`104`	`}`