Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-23 06:59:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

core: send db name with migration events

Browse Source
This commit is contained in:
Abdullah Atta
2024-11-19 17:01:24 +05:00
parent d3e2fcc3ac
commit 175c6cdba0
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/core/src/api/index.ts
View File

@@ -253,7 +253,8 @@ class Database {
await initializeDatabase( await initializeDatabase(
this.sql().withTables(), this.sql().withTables(),
new NNMigrationProvider() new NNMigrationProvider(),
"notesnook"
); );
await this.onInit(this.sql() as unknown as Kysely<RawDatabaseSchema>); await this.onInit(this.sql() as unknown as Kysely<RawDatabaseSchema>);
await this.initCollections(); await this.initCollections();

11
packages/core/src/database/index.ts
View File

@@ -302,7 +302,8 @@ async function setupDatabase<Schema>(
export async function initializeDatabase<Schema>( export async function initializeDatabase<Schema>(
db: Kysely<Schema>, db: Kysely<Schema>,
migrationProvider: MigrationProvider migrationProvider: MigrationProvider,
name: string
) { ) {
try { try {
const migrator = new Migrator({ const migrator = new Migrator({
@@ -314,9 +315,9 @@ export async function initializeDatabase<Schema>(
.then((m) => m.some((m) => !m.executedAt)); .then((m) => m.some((m) => !m.executedAt));
if (!needsMigration) return db; if (!needsMigration) return db;
EV.publish(EVENTS.migrationStarted); EV.publish(EVENTS.migrationStarted, name);
const { error, results } = await migrator.migrateToLatest(); const { error, results } = await migrator.migrateToLatest();
EV.publish(EVENTS.migrationFinished); EV.publish(EVENTS.migrationFinished, name);
if (error) if (error)
throw error instanceof Error ? error : new Error(JSON.stringify(error)); throw error instanceof Error ? error : new Error(JSON.stringify(error));
@@ -364,7 +365,7 @@ export async function createDatabase<Schema>(
dialect: options.dialect(name, async () => { dialect: options.dialect(name, async () => {
await db.connection().execute(async (db) => { await db.connection().execute(async (db) => {
await setupDatabase(db, options); await setupDatabase(db, options);
await initializeDatabase(db, options.migrationProvider); await initializeDatabase(db, options.migrationProvider, name);
if (options.onInit) await options.onInit(db); if (options.onInit) await options.onInit(db);
}); });
}), }),
@@ -373,7 +374,7 @@ export async function createDatabase<Schema>(
if (!options.skipInitialization) if (!options.skipInitialization)
await db.connection().execute(async (db) => { await db.connection().execute(async (db) => {
await setupDatabase(db, options); await setupDatabase(db, options);
await initializeDatabase(db, options.migrationProvider); await initializeDatabase(db, options.migrationProvider, name);
if (options.onInit) await options.onInit(db); if (options.onInit) await options.onInit(db);
}); });