logos-messaging/logos-messaging-nim
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-messaging-nim.git synced 2026-01-02 05:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
gabrielmer 2025-01-16 16:10:28 +01:00 committed by GitHub
parent 192db550c9
commit 4d9e11f16b
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
migrations/message_store/00010_dropStoredAt.up.sql Normal file
View File

@ -0,0 +1,3 @@
ALTER TABLE message DROP COLUMN timestamp;
ALTER TABLE message RENAME COLUMN storedAt TO timestamp;

4
tests/waku_archive/archive_utils.nim
View File

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

4
tests/waku_archive_legacy/archive_utils.nim
View File

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

2
waku/common/databases/db_sqlite.nim
View File

@ -160,7 +160,7 @@ proc exec*[P](s: SqliteStmt[P, void], params: P): DatabaseResult[void] =
let res = let res =
if (let v = sqlite3_step(s); v != SQLITE_DONE): if (let v = sqlite3_step(s); v != SQLITE_DONE):
err($sqlite3_errstr(v)) err($sqlite3_errstr(v) & " " & $sqlite3_errmsg(sqlite3_db_handle(s)))
else: else:
ok() ok()

2
waku/waku_archive/driver/sqlite_driver/migrations.nim
View File

@ -7,7 +7,7 @@ import ../../../common/databases/db_sqlite, ../../../common/databases/common
logScope: logScope:
topics = "waku archive migration" 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 = template projectRoot(): string =
currentSourcePath.rsplit(DirSep, 1)[0] / ".." / ".." / ".." / ".." currentSourcePath.rsplit(DirSep, 1)[0] / ".." / ".." / ".." / ".."