From e408e735be839e79ad8513b4e59be3f3f236d6ff Mon Sep 17 00:00:00 2001 From: Owen Date: Wed, 3 Jun 2026 17:58:59 -0700 Subject: [PATCH] Make alias cross compatable --- server/db/pg/index.ts | 1 + server/db/queries/verifySessionQueries.ts | 2 +- server/db/sqlite/index.ts | 1 + server/private/routers/hybrid.ts | 2 +- server/routers/resource/authWithPassword.ts | 2 +- server/routers/resource/authWithPincode.ts | 2 +- server/routers/resource/getResourceAuthInfo.ts | 2 +- 7 files changed, 7 insertions(+), 5 deletions(-) diff --git a/server/db/pg/index.ts b/server/db/pg/index.ts index f8c04ac9e..95ca9ca3b 100644 --- a/server/db/pg/index.ts +++ b/server/db/pg/index.ts @@ -4,3 +4,4 @@ export * from "./safeRead"; export * from "./schema/schema"; export * from "./schema/privateSchema"; export * from "./migrate"; +export { alias } from "drizzle-orm/pg-core"; diff --git a/server/db/queries/verifySessionQueries.ts b/server/db/queries/verifySessionQueries.ts index 145b0c5e1..302671b0d 100644 --- a/server/db/queries/verifySessionQueries.ts +++ b/server/db/queries/verifySessionQueries.ts @@ -35,7 +35,7 @@ import { resourcePolicyHeaderAuth, ResourcePolicyHeaderAuth } from "@server/db"; -import { alias } from "drizzle-orm/sqlite-core"; +import { alias } from "@server/db"; import { and, eq, inArray, isNull, or, sql } from "drizzle-orm"; import logger from "@server/logger"; diff --git a/server/db/sqlite/index.ts b/server/db/sqlite/index.ts index f8c04ac9e..d1d8d7dd4 100644 --- a/server/db/sqlite/index.ts +++ b/server/db/sqlite/index.ts @@ -4,3 +4,4 @@ export * from "./safeRead"; export * from "./schema/schema"; export * from "./schema/privateSchema"; export * from "./migrate"; +export { alias } from "drizzle-orm/sqlite-core"; diff --git a/server/private/routers/hybrid.ts b/server/private/routers/hybrid.ts index 0ed75d8d2..5d35ca2a7 100644 --- a/server/private/routers/hybrid.ts +++ b/server/private/routers/hybrid.ts @@ -61,7 +61,7 @@ import { roles } from "@server/db"; import { eq, and, inArray, isNotNull, isNull, ne, or, sql } from "drizzle-orm"; -import { alias } from "drizzle-orm/sqlite-core"; +import { alias } from "@server/db"; import { response } from "@server/lib/response"; import HttpCode from "@server/types/HttpCode"; import { NextFunction, Request, Response } from "express"; diff --git a/server/routers/resource/authWithPassword.ts b/server/routers/resource/authWithPassword.ts index 1ad409901..040c640a0 100644 --- a/server/routers/resource/authWithPassword.ts +++ b/server/routers/resource/authWithPassword.ts @@ -11,7 +11,7 @@ import { import HttpCode from "@server/types/HttpCode"; import response from "@server/lib/response"; import { eq } from "drizzle-orm"; -import { alias } from "drizzle-orm/sqlite-core"; +import { alias } from "@server/db"; import { NextFunction, Request, Response } from "express"; import createHttpError from "http-errors"; import { z } from "zod"; diff --git a/server/routers/resource/authWithPincode.ts b/server/routers/resource/authWithPincode.ts index 0e547f1eb..7c6ca8538 100644 --- a/server/routers/resource/authWithPincode.ts +++ b/server/routers/resource/authWithPincode.ts @@ -10,7 +10,7 @@ import { import HttpCode from "@server/types/HttpCode"; import response from "@server/lib/response"; import { eq } from "drizzle-orm"; -import { alias } from "drizzle-orm/sqlite-core"; +import { alias } from "@server/db"; import { NextFunction, Request, Response } from "express"; import createHttpError from "http-errors"; import { z } from "zod"; diff --git a/server/routers/resource/getResourceAuthInfo.ts b/server/routers/resource/getResourceAuthInfo.ts index b0d17850c..4957781f5 100644 --- a/server/routers/resource/getResourceAuthInfo.ts +++ b/server/routers/resource/getResourceAuthInfo.ts @@ -12,7 +12,7 @@ import { resources } from "@server/db"; import { eq } from "drizzle-orm"; -import { alias } from "drizzle-orm/sqlite-core"; +import { alias } from "@server/db"; import response from "@server/lib/response"; import HttpCode from "@server/types/HttpCode"; import createHttpError from "http-errors";