fix: correct import ordering and update tests for drizzle-orm migration

This commit is contained in:
MythEclipse
2026-05-14 15:47:03 +07:00
parent 50d4517079
commit b600dad011
10 changed files with 87 additions and 140 deletions
+7 -4
View File
@@ -1,6 +1,6 @@
import { drizzle as drizzlePostgres } from "drizzle-orm/node-postgres";
import { drizzle as drizzleSqlite } from "drizzle-orm/better-sqlite3";
import Database from "better-sqlite3";
import { drizzle as drizzleSqlite } from "drizzle-orm/better-sqlite3";
import { drizzle as drizzlePostgres } from "drizzle-orm/node-postgres";
import { Pool } from "pg";
import { config } from "../config";
import { createChildLogger } from "../logger";
@@ -8,7 +8,10 @@ import * as schema from "./schema";
const logger = createChildLogger("drizzle");
let db: ReturnType<typeof drizzlePostgres> | ReturnType<typeof drizzleSqlite> | null = null;
let db:
| ReturnType<typeof drizzlePostgres>
| ReturnType<typeof drizzleSqlite>
| null = null;
/**
* Initialize the database connection based on DATABASE_TYPE config
@@ -51,7 +54,7 @@ export async function initializeDatabase() {
export function getDatabase() {
if (db === null) {
throw new Error(
"Database not initialized. Call initializeDatabase() first."
"Database not initialized. Call initializeDatabase() first.",
);
}
return db;
+11 -17
View File
@@ -1,18 +1,18 @@
import {
bigint as pgBigint,
foreignKey as pgForeignKey,
index as pgIndex,
integer as pgInteger,
real as pgReal,
pgTable,
text as pgText,
integer as pgInteger,
bigint as pgBigint,
real as pgReal,
index as pgIndex,
foreignKey as pgForeignKey,
} from "drizzle-orm/pg-core";
import {
sqliteTable,
text as sqliteText,
index as sqliteIndex,
integer as sqliteInteger,
real as sqliteReal,
index as sqliteIndex,
sqliteTable,
text as sqliteText,
} from "drizzle-orm/sqlite-core";
import { config } from "../config";
@@ -257,14 +257,10 @@ export const sqliteUIStateTable = sqliteTable("ui_state", {
// ========================================
export const muxerJobsTable =
config.DATABASE_TYPE === "postgres"
? pgMuxerJobsTable
: sqliteMuxerJobsTable;
config.DATABASE_TYPE === "postgres" ? pgMuxerJobsTable : sqliteMuxerJobsTable;
export const messagesTable =
config.DATABASE_TYPE === "postgres"
? pgMessagesTable
: sqliteMessagesTable;
config.DATABASE_TYPE === "postgres" ? pgMessagesTable : sqliteMessagesTable;
export const attachmentsTable =
config.DATABASE_TYPE === "postgres"
@@ -272,9 +268,7 @@ export const attachmentsTable =
: sqliteAttachmentsTable;
export const uiStateTable =
config.DATABASE_TYPE === "postgres"
? pgUIStateTable
: sqliteUIStateTable;
config.DATABASE_TYPE === "postgres" ? pgUIStateTable : sqliteUIStateTable;
// Export table types for use in queries
export type MuxerJob = typeof muxerJobsTable.$inferSelect;