fix libsql_close

OP-Engineering · Dec 20, 2024 · 6a8022d · 6a8022d
1 parent b50ab45
commit 6a8022d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/cpp/DBHostObject.cpp b/cpp/DBHostObject.cpp
@@ -808,11 +808,7 @@ void DBHostObject::invalidate() {
   invalidated = true;
   _thread_pool->restartPool();
 #ifdef OP_SQLITE_USE_LIBSQL
-  if (db.db != nullptr and db.c != nullptr) {
     opsqlite_libsql_close(db);
-    db.db = nullptr;
-    db.c = nullptr;
-  }
 #else
   if (db != nullptr) {
     opsqlite_close(db);

diff --git a/cpp/libsql/bridge.cpp b/cpp/libsql/bridge.cpp
@@ -124,12 +124,14 @@ DB opsqlite_libsql_open_remote(std::string const &url,
   return {.db = db, .c = c};
 }
 
-void opsqlite_libsql_close(DB const &db) {
+void opsqlite_libsql_close(DB &db) {
   if (db.c != nullptr) {
     libsql_disconnect(db.c);
+    db.c = nullptr;
   }
   if (db.db != nullptr) {
     libsql_close(db.db);
+    db.db = nullptr;
   }
 }
 
@@ -161,7 +163,7 @@ void opsqlite_libsql_sync(DB const &db) {
 
 }
 
-void opsqlite_libsql_remove(DB const &db, std::string const &name,
+void opsqlite_libsql_remove(DB &db, std::string const &name,
                                     std::string const &path) {
   opsqlite_libsql_close(db);
 

diff --git a/cpp/libsql/bridge.h b/cpp/libsql/bridge.h
@@ -45,9 +45,9 @@ DB opsqlite_libsql_open_sync(std::string const &name,
                                        std::string const &auth_token,
                                        int sync_interval);
 
-void opsqlite_libsql_close(DB const &db);
+void opsqlite_libsql_close(DB &db);
 
-void opsqlite_libsql_remove(DB const &db, std::string const &name,
+void opsqlite_libsql_remove(DB &db, std::string const &name,
                                     std::string const &path);
 
 void opsqlite_libsql_attach(DB const &db,