From 3ff2ec30217734522d47805d3229f73fca9431e2 Mon Sep 17 00:00:00 2001 From: mustard Date: Mon, 30 Jun 2025 06:05:27 +0000 Subject: [PATCH] [server] Fix mismatch collation issue in workspace instance metrics query --- components/gitpod-db/src/typeorm/workspace-db-impl.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/components/gitpod-db/src/typeorm/workspace-db-impl.ts b/components/gitpod-db/src/typeorm/workspace-db-impl.ts index a6a67d59bd040b..d9d4beef9b1f92 100644 --- a/components/gitpod-db/src/typeorm/workspace-db-impl.ts +++ b/components/gitpod-db/src/typeorm/workspace-db-impl.ts @@ -476,7 +476,12 @@ export class TypeORMWorkspaceDBImpl extends TransactionalDBImpl imp const sessions = (await workspaceInstanceRepo .createQueryBuilder("wsi") .leftJoinAndMapOne("wsi.workspace", DBWorkspace, "ws", "ws.id = wsi.workspaceId") - .leftJoinAndMapOne("wsi.metrics", DBWorkspaceInstanceMetrics, "wsim", "wsim.instanceId = wsi.id") + .leftJoinAndMapOne( + "wsi.metrics", + DBWorkspaceInstanceMetrics, + "wsim", + "wsim.instanceId COLLATE utf8mb4_general_ci = wsi.id COLLATE utf8mb4_general_ci", + ) .where("ws.organizationId = :organizationId", { organizationId }) .andWhere("wsi.creationTime >= :periodStart", { periodStart: periodStart.toISOString() }) .andWhere("wsi.creationTime <= :periodEnd", { periodEnd: periodEnd.toISOString() })