Skip to content

Commit 6a688ea

Browse files
author
Wojtach
committed
fix: fixed two db instances issue
1 parent 65f9c9d commit 6a688ea

File tree

7 files changed

+17
-11
lines changed

7 files changed

+17
-11
lines changed

android/src/main/java/com/cblreactnative/CblReactnativeModule.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -745,13 +745,15 @@ class CblReactnativeModule(reactContext: ReactApplicationContext) :
745745
}
746746
try {
747747
val databaseConfig = DataAdapter.toDatabaseConfigJson(directory, encryptionKey)
748-
DatabaseManager.openDatabase(
748+
val databaseUniqueName = DatabaseManager.openDatabase(
749749
name,
750750
databaseConfig,
751751
context
752752
)
753753
context.runOnUiQueueThread {
754-
promise.resolve(null)
754+
val result = Arguments.createMap()
755+
result.putString("databaseUniqueName", databaseUniqueName)
756+
promise.resolve(result)
755757
}
756758
} catch (e: Throwable) {
757759
context.runOnUiQueueThread {

ios/CblReactnative.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -803,8 +803,10 @@ class CblReactnative: RCTEventEmitter {
803803
let hashConfig = AnyHashable(config)
804804
backgroundQueue.async {
805805
do {
806-
try DatabaseManager.shared.open(databaseName, databaseConfig: hashConfig as? [AnyHashable : Any])
807-
resolve(nil)
806+
let databaseUniqueName = try DatabaseManager.shared.open(databaseName, databaseConfig: hashConfig as? [AnyHashable : Any])
807+
808+
let resultDict: [String: Any] = ["databaseUniqueName": databaseUniqueName]
809+
resolve(resultDict)
808810
} catch let error as NSError {
809811
reject("DATABASE_ERROR", error.localizedDescription, nil)
810812
} catch {

ios/cbl-js-swift

src/CblReactNativeEngine.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,9 @@ export class CblReactNativeEngine implements ICoreEngine {
711711
});
712712
}
713713

714-
database_Open(args: DatabaseOpenArgs): Promise<void> {
714+
database_Open(
715+
args: DatabaseOpenArgs
716+
): Promise<{ databaseUniqueName: string }> {
715717
this.debugLog(
716718
`::DEBUG:: database_Open: ${args.name} ${args.config.directory} ${args.config.encryptionKey}`
717719
);
@@ -721,9 +723,9 @@ export class CblReactNativeEngine implements ICoreEngine {
721723
args.config.directory,
722724
args.config.encryptionKey
723725
).then(
724-
() => {
726+
(databaseUniqueName) => {
725727
this.debugLog(`::DEBUG:: database_Open completed`);
726-
resolve();
728+
resolve(databaseUniqueName);
727729
},
728730
// eslint-disable-next-line @typescript-eslint/no-explicit-any
729731
(error: any) => {

0 commit comments

Comments
 (0)