autodispose db

codex-storage · Jan 13, 2024 · 8a95ed9 · 8a95ed9
1 parent 8700c25
commit 8a95ed9
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/datastore/sql/sqlitedsdb.nim b/datastore/sql/sqlitedsdb.nim
@@ -280,6 +280,15 @@ proc getDBFilePath*(path: string): ?!string =
     return failure(exc.msg)
 
 proc close*(self: var SQLiteDsDb) =
+
+  var
+    env: AutoDisposed[SQLite]
+
+  defer:
+    disposeIfUnreleased(env)
+
+  env.val = self.env
+
   if not RawStmtPtr(self.containsStmt).isNil:
     self.containsStmt.dispose
 
@@ -316,10 +325,6 @@ proc close*(self: var SQLiteDsDb) =
   if not RawStmtPtr(self.getChangesStmt).isNil:
     self.getChangesStmt.dispose
 
-  if not self.env.isNil:
-    self.env.dispose
-    self.env = nil
-
 proc open*(
   T: type SQLiteDsDb,
   path = Memory,