Remco/Epicnabbo-Catalogus-Updated-Daily
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore MySQL/MariaDB Drizzle ORM driver for strict type safety and schema compatibility

Browse Source
This commit is contained in:
openhands
2026-10-23 21:03:50 +02:00
parent a8172ce88e
commit c0a5079ede
1 changed files with 7 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/db.ts
+7 -62
View File
@@ -1,9 +1,7 @@
import type { SQL } from "drizzle-orm"; import type { SQL } from "drizzle-orm";
import { drizzle as drizzleMysql } from "drizzle-orm/mysql2"; import { drizzle } from "drizzle-orm/mysql2";
import { drizzle as drizzlePg } from "drizzle-orm/node-postgres";
import type { ResultSetHeader } from "mysql2"; import type { ResultSetHeader } from "mysql2";
import mysql from "mysql2/promise"; import mysql from "mysql2/promise";
import pg from "pg";
import * as relations from "@/db/relations"; import * as relations from "@/db/relations";
import * as schema from "@/db/schema"; import * as schema from "@/db/schema";
import { env } from "@/env"; import { env } from "@/env";
@@ -18,10 +16,7 @@ const globalForDb = globalThis as unknown as {
}; };
function createDb() { function createDb() {
const urlStr = env.DATABASE_URL; const url = new URL(env.DATABASE_URL);
const isPostgres =
urlStr.startsWith("postgres://") || urlStr.startsWith("postgresql://");
const url = new URL(urlStr);
const isBuild = const isBuild =
process.env.NEXT_PHASE === "phase-production-build" || process.env.NEXT_PHASE === "phase-production-build" ||
process.env.NEXT_PHASE === "phase-production-compile"; process.env.NEXT_PHASE === "phase-production-compile";
@@ -31,21 +26,6 @@ function createDb() {
? Math.min(env.DATABASE_CONNECT_TIMEOUT_MS, 5_000) ? Math.min(env.DATABASE_CONNECT_TIMEOUT_MS, 5_000)
: env.DATABASE_CONNECT_TIMEOUT_MS; : env.DATABASE_CONNECT_TIMEOUT_MS;
if (isPostgres) {
const { Pool } = pg;
const pool = new Pool({
connectionString: urlStr,
max: connectionLimit,
idleTimeoutMillis: env.DATABASE_IDLE_TIMEOUT_MS,
connectionTimeoutMillis: connectTimeout,
});
return drizzlePg(instrumentDatabase(pool) as unknown as pg.Pool, {
schema: fullSchema,
logger: false,
}) as unknown as ReturnType<typeof drizzleMysql>;
}
const pool = mysql.createPool({ const pool = mysql.createPool({
host: url.hostname, host: url.hostname,
port: Number(url.port) || 3306, port: Number(url.port) || 3306,
@@ -66,7 +46,7 @@ function createDb() {
supportBigNumbers: true, supportBigNumbers: true,
}); });
return drizzleMysql(instrumentDatabase(pool), { return drizzle(instrumentDatabase(pool), {
schema: fullSchema, schema: fullSchema,
mode: "default", mode: "default",
logger: false, logger: false,
@@ -78,19 +58,8 @@ export const db = globalForDb.db ?? createDb();
if (env.NODE_ENV !== "production") globalForDb.db = db; if (env.NODE_ENV !== "production") globalForDb.db = db;
export function rowsFrom<T>(result: unknown): T[] { export function rowsFrom<T>(result: unknown): T[] {
if (!result) return []; const [first] = result as [unknown, unknown];
if (Array.isArray(result)) { return (Array.isArray(first) ? first : []) as T[];
const [first] = result as [unknown, unknown];
return (Array.isArray(first) ? first : []) as T[];
}
if (
typeof result === "object" &&
"rows" in result &&
Array.isArray((result as { rows: unknown }).rows)
) {
return (result as { rows: T[] }).rows;
}
return [];
} }
export async function queryRows<T>(query: SQL | string): Promise<T[]> { export async function queryRows<T>(query: SQL | string): Promise<T[]> {
@@ -100,32 +69,8 @@ export async function queryRows<T>(query: SQL | string): Promise<T[]> {
export async function execResult( export async function execResult(
query: SQL | string, query: SQL | string,
): Promise<ResultSetHeader> { ): Promise<ResultSetHeader> {
const res = await db.execute(query); const [first] = (await db.execute(query)) as unknown as [unknown, unknown];
if (Array.isArray(res)) { return first as ResultSetHeader;
const [first] = res as [unknown, unknown];
return first as ResultSetHeader;
}
if (typeof res === "object" && res !== null) {
const r = res as Record<string, unknown>;
return {
affectedRows: typeof r.rowCount === "number" ? r.rowCount : 0,
insertId: typeof r.insertId === "number" ? r.insertId : 0,
fieldCount: 0,
info: "",
serverStatus: 0,
warningStatus: 0,
changedRows: 0,
} as unknown as ResultSetHeader;
}
return {
affectedRows: 0,
insertId: 0,
fieldCount: 0,
info: "",
serverStatus: 0,
warningStatus: 0,
changedRows: 0,
} as unknown as ResultSetHeader;
} }
export async function affectedRows(query: SQL | string): Promise<number> { export async function affectedRows(query: SQL | string): Promise<number> {