Skip to content

Commit e93eb6c

Browse files
authored
[server] Fix mismatch collation issue in workspace instance metrics query (#20933)
1 parent 2b23aeb commit e93eb6c

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

components/gitpod-db/src/typeorm/workspace-db-impl.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,12 @@ export class TypeORMWorkspaceDBImpl extends TransactionalDBImpl<WorkspaceDB> imp
476476
const sessions = (await workspaceInstanceRepo
477477
.createQueryBuilder("wsi")
478478
.leftJoinAndMapOne("wsi.workspace", DBWorkspace, "ws", "ws.id = wsi.workspaceId")
479-
.leftJoinAndMapOne("wsi.metrics", DBWorkspaceInstanceMetrics, "wsim", "wsim.instanceId = wsi.id")
479+
.leftJoinAndMapOne(
480+
"wsi.metrics",
481+
DBWorkspaceInstanceMetrics,
482+
"wsim",
483+
"wsim.instanceId COLLATE utf8mb4_general_ci = wsi.id COLLATE utf8mb4_general_ci",
484+
)
480485
.where("ws.organizationId = :organizationId", { organizationId })
481486
.andWhere("wsi.creationTime >= :periodStart", { periodStart: periodStart.toISOString() })
482487
.andWhere("wsi.creationTime <= :periodEnd", { periodEnd: periodEnd.toISOString() })

0 commit comments

Comments
 (0)