diff --git a/packages/api/src/routers/admin.ts b/packages/api/src/routers/admin.ts index 9e76aca6..1c383562 100644 --- a/packages/api/src/routers/admin.ts +++ b/packages/api/src/routers/admin.ts @@ -12,7 +12,7 @@ import { hackathonEventAttendees, members, } from "@query/db"; -import { eq, and, count, gte, inArray } from "drizzle-orm"; +import { eq, and, count, gte, inArray, sql } from "drizzle-orm"; import { CacheKeys, invalidatePortalContext } from "../middleware/cache"; import { isAdmin } from "../middleware/procedures"; import { recordAdminAction } from "../middleware/audit"; @@ -343,8 +343,9 @@ export const adminRouter = createTRPCRouter({ } const user = await (ctx.db as DrizzleDB).query.users.findFirst({ - // Stored lowercased by every writer. - where: eq(users.email, input.email.toLowerCase()), + // lower() on both sides: some older rows kept the casing they were typed + // in. Served by user_email_lower_unique_idx. + where: sql`lower(${users.email}) = ${input.email.toLowerCase()}`, columns: { id: true, name: true, email: true, image: true }, }); diff --git a/packages/api/src/routers/events.ts b/packages/api/src/routers/events.ts index c87baead..c99114a0 100644 --- a/packages/api/src/routers/events.ts +++ b/packages/api/src/routers/events.ts @@ -516,9 +516,10 @@ export const eventRouter = createTRPCRouter({ }); } - // Stored lowercased by every writer. + // lower() on both sides: some older rows kept the casing they were + // typed in. Served by user_email_lower_unique_idx. const user = await tx.query.users.findFirst({ - where: eq(users.email, input.email.toLowerCase()), + where: sql`lower(${users.email}) = ${input.email.toLowerCase()}`, columns: { id: true, name: true, email: true }, }); diff --git a/packages/api/src/routers/hackathon/bans.ts b/packages/api/src/routers/hackathon/bans.ts index 9c49aaff..0d7cb074 100644 --- a/packages/api/src/routers/hackathon/bans.ts +++ b/packages/api/src/routers/hackathon/bans.ts @@ -1,5 +1,5 @@ import { z } from "zod"; -import { desc, eq, inArray } from "drizzle-orm"; +import { desc, eq, inArray, sql } from "drizzle-orm"; import { hackathonBans, users } from "@query/db"; import type { DrizzleDB } from "@query/db"; import { createTRPCRouter } from "../../trpc"; @@ -30,7 +30,8 @@ export const hackathonBansRouter = createTRPCRouter({ const [accounts, staff] = await Promise.all([ emails.length ? db.query.users.findMany({ - where: inArray(users.email, emails), + // Ban emails are lowercased; some older user rows are not. + where: inArray(sql`lower(${users.email})`, emails), columns: { email: true, name: true }, }) : [],