chore: adding extra migration to sqlite and improving error message (#…

…3240)
waku-org · Jan 16, 2025 · bfd60ce · bfd60ce
1 parent 9c0ad85
commit bfd60ce
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/migrations/message_store/00010_dropStoredAt.up.sql b/migrations/message_store/00010_dropStoredAt.up.sql
@@ -0,0 +1,3 @@
+ALTER TABLE message DROP COLUMN timestamp;
+
+ALTER TABLE message RENAME COLUMN storedAt TO timestamp;
diff --git a/tests/waku_archive/archive_utils.nim b/tests/waku_archive/archive_utils.nim
@@ -9,6 +9,7 @@ import
     waku_archive,
     waku_archive/common,
     waku_archive/driver/sqlite_driver,
+    waku_archive/driver/sqlite_driver/migrations,
     common/databases/db_sqlite,
   ],
   ../testlib/[wakucore]
@@ -18,7 +19,8 @@ proc newSqliteDatabase*(path: Option[string] = string.none()): SqliteDatabase =
 
 proc newSqliteArchiveDriver*(): ArchiveDriver =
   let database = newSqliteDatabase()
-  SqliteDriver.new(database).tryGet()
+  migrate(database).tryGet()
+  return SqliteDriver.new(database).tryGet()
 
 proc newWakuArchive*(driver: ArchiveDriver): WakuArchive =
   WakuArchive.new(driver).get()

diff --git a/tests/waku_archive_legacy/archive_utils.nim b/tests/waku_archive_legacy/archive_utils.nim
@@ -9,6 +9,7 @@ import
     waku_archive_legacy,
     waku_archive_legacy/common,
     waku_archive_legacy/driver/sqlite_driver,
+    waku_archive_legacy/driver/sqlite_driver/migrations,
     common/databases/db_sqlite,
   ],
   ../testlib/[wakucore]
@@ -18,7 +19,8 @@ proc newSqliteDatabase*(path: Option[string] = string.none()): SqliteDatabase =
 
 proc newSqliteArchiveDriver*(): ArchiveDriver =
   let database = newSqliteDatabase()
-  SqliteDriver.new(database).tryGet()
+  migrate(database).tryGet()
+  return SqliteDriver.new(database).tryGet()
 
 proc newWakuArchive*(driver: ArchiveDriver): WakuArchive =
   WakuArchive.new(driver).get()

diff --git a/waku/common/databases/db_sqlite.nim b/waku/common/databases/db_sqlite.nim
@@ -160,7 +160,7 @@ proc exec*[P](s: SqliteStmt[P, void], params: P): DatabaseResult[void] =
 
   let res =
     if (let v = sqlite3_step(s); v != SQLITE_DONE):
-      err($sqlite3_errstr(v))
+      err($sqlite3_errstr(v) & " " & $sqlite3_errmsg(sqlite3_db_handle(s)))
     else:
       ok()
 

diff --git a/waku/waku_archive/driver/sqlite_driver/migrations.nim b/waku/waku_archive/driver/sqlite_driver/migrations.nim
@@ -7,7 +7,7 @@ import ../../../common/databases/db_sqlite, ../../../common/databases/common
 logScope:
   topics = "waku archive migration"
 
-const SchemaVersion* = 9 # increase this when there is an update in the database schema
+const SchemaVersion* = 10 # increase this when there is an update in the database schema
 
 template projectRoot(): string =
   currentSourcePath.rsplit(DirSep, 1)[0] / ".." / ".." / ".." / ".."
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		ALTER TABLE message DROP COLUMN timestamp;

		ALTER TABLE message RENAME COLUMN storedAt TO timestamp;