Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions packages/api/src/routers/admin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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 },
});

Expand Down
5 changes: 3 additions & 2 deletions packages/api/src/routers/events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
});

Expand Down
5 changes: 3 additions & 2 deletions packages/api/src/routers/hackathon/bans.ts
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -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 },
})
: [],
Expand Down
Loading