From 4330cae62610022a7d875d4c077a722a3f2c5808 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 24 May 2024 20:16:51 -0500 Subject: [PATCH] Fix Conf.db in migrations --- src/db/migrations/002_events_fts.ts | 2 +- src/db/migrations/019_ndatabase_schema.ts | 4 ++-- src/db/migrations/020_pgfts.ts | 4 ++-- src/db/migrations/021_pgfts_index.ts | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/db/migrations/002_events_fts.ts b/src/db/migrations/002_events_fts.ts index ffaf5fb..56abab5 100644 --- a/src/db/migrations/002_events_fts.ts +++ b/src/db/migrations/002_events_fts.ts @@ -3,7 +3,7 @@ import { Kysely, sql } from 'kysely'; import { Conf } from '@/config.ts'; export async function up(db: Kysely): Promise { - if (Conf.databaseUrl.protocol === 'sqlite:') { + if (Conf.db.dialect === 'sqlite') { await sql`CREATE VIRTUAL TABLE events_fts USING fts5(id, content)`.execute(db); } } diff --git a/src/db/migrations/019_ndatabase_schema.ts b/src/db/migrations/019_ndatabase_schema.ts index 94378f0..31b86cd 100644 --- a/src/db/migrations/019_ndatabase_schema.ts +++ b/src/db/migrations/019_ndatabase_schema.ts @@ -7,7 +7,7 @@ export async function up(db: Kysely): Promise { await db.schema.alterTable('tags').renameTo('nostr_tags').execute(); await db.schema.alterTable('nostr_tags').renameColumn('tag', 'name').execute(); - if (Conf.databaseUrl.protocol === 'sqlite:') { + if (Conf.db.dialect === 'sqlite') { await db.schema.dropTable('events_fts').execute(); await sql`CREATE VIRTUAL TABLE nostr_fts5 USING fts5(event_id, content)`.execute(db); } @@ -18,7 +18,7 @@ export async function down(db: Kysely): Promise { await db.schema.alterTable('nostr_tags').renameTo('tags').execute(); await db.schema.alterTable('tags').renameColumn('name', 'tag').execute(); - if (Conf.databaseUrl.protocol === 'sqlite:') { + if (Conf.db.dialect === 'sqlite') { await db.schema.dropTable('nostr_fts5').execute(); await sql`CREATE VIRTUAL TABLE events_fts USING fts5(id, content)`.execute(db); } diff --git a/src/db/migrations/020_pgfts.ts b/src/db/migrations/020_pgfts.ts index 8b3cfa0..835de11 100644 --- a/src/db/migrations/020_pgfts.ts +++ b/src/db/migrations/020_pgfts.ts @@ -3,7 +3,7 @@ import { Kysely, sql } from 'kysely'; import { Conf } from '@/config.ts'; export async function up(db: Kysely): Promise { - if (['postgres:', 'postgresql:'].includes(Conf.databaseUrl.protocol!)) { + if (Conf.db.dialect === 'postgres') { await db.schema.createTable('nostr_pgfts') .ifNotExists() .addColumn('event_id', 'text', (c) => c.primaryKey().references('nostr_events.id').onDelete('cascade')) @@ -13,7 +13,7 @@ export async function up(db: Kysely): Promise { } export async function down(db: Kysely): Promise { - if (['postgres:', 'postgresql:'].includes(Conf.databaseUrl.protocol!)) { + if (Conf.db.dialect === 'postgres') { await db.schema.dropTable('nostr_pgfts').ifExists().execute(); } } diff --git a/src/db/migrations/021_pgfts_index.ts b/src/db/migrations/021_pgfts_index.ts index d18d110..4b83499 100644 --- a/src/db/migrations/021_pgfts_index.ts +++ b/src/db/migrations/021_pgfts_index.ts @@ -3,7 +3,7 @@ import { Kysely } from 'kysely'; import { Conf } from '@/config.ts'; export async function up(db: Kysely): Promise { - if (['postgres:', 'postgresql:'].includes(Conf.databaseUrl.protocol!)) { + if (Conf.db.dialect === 'postgres') { await db.schema .createIndex('nostr_pgfts_gin_search_vec') .ifNotExists() @@ -15,7 +15,7 @@ export async function up(db: Kysely): Promise { } export async function down(db: Kysely): Promise { - if (['postgres:', 'postgresql:'].includes(Conf.databaseUrl.protocol!)) { + if (Conf.db.dialect === 'postgres') { await db.schema.dropIndex('nostr_pgfts_gin_search_vec').ifExists().execute(); } }