diff --git a/app/api/llm-hint/route.ts b/app/api/llm-hint/route.ts
index 3b573a06b..d03a5fab9 100644
--- a/app/api/llm-hint/route.ts
+++ b/app/api/llm-hint/route.ts
@@ -19,8 +19,8 @@ type GradrResultTestWithGraderResults = GetResult<
   ` id,
         extra_data,
         class_id,
-        grader_results!inner (
-          submissions!inner (
+        grader_results!grader_result_tests_grader_result_id_fkey!inner (
+          submissions!grader_results_submission_id_fkey!inner (
             id,
             class_id,
             assignment_id,
@@ -306,8 +306,8 @@ export async function POST(request: NextRequest) {
         id,
         extra_data,
         class_id,
-        grader_results!inner (
-          submissions!inner (
+        grader_results!grader_result_tests_grader_result_id_fkey!inner (
+          submissions!grader_results_submission_id_fkey!inner (
             id,
             class_id,
             assignment_id,
diff --git a/app/course/[course_id]/assignments/[assignment_id]/commitHistory.tsx b/app/course/[course_id]/assignments/[assignment_id]/commitHistory.tsx
index b3e3380ab..c6600e5a3 100644
--- a/app/course/[course_id]/assignments/[assignment_id]/commitHistory.tsx
+++ b/app/course/[course_id]/assignments/[assignment_id]/commitHistory.tsx
@@ -25,7 +25,10 @@ function CommitHistory({
   const { assignment } = useAssignmentController();
   const { data } = useList<SubmissionWithGraderResultsAndReview>({
     resource: "submissions",
-    meta: { select: "*, grader_results(*), submission_reviews!submissions_grading_review_id_fkey(*)" },
+    meta: {
+      select:
+        "*, grader_results!grader_results_submission_id_fkey(*), submission_reviews!submissions_grading_review_id_fkey(*)"
+    },
     filters: [{ field: "repository", operator: "eq", value: repository_full_name }],
     sorters: [{ field: "created_at", order: "desc" }]
   });
diff --git a/app/course/[course_id]/assignments/[assignment_id]/page.tsx b/app/course/[course_id]/assignments/[assignment_id]/page.tsx
index 6b2df47a2..c14cd10ee 100644
--- a/app/course/[course_id]/assignments/[assignment_id]/page.tsx
+++ b/app/course/[course_id]/assignments/[assignment_id]/page.tsx
@@ -59,7 +59,8 @@ export default function AssignmentPage() {
   const { data: submissionsData } = useList<SubmissionWithGraderResultsAndReview>({
     resource: "submissions",
     meta: {
-      select: "*, grader_results(*), submission_reviews!submissions_grading_review_id_fkey(*)",
+      select:
+        "*, grader_results!grader_results_submission_id_fkey(*), submission_reviews!submissions_grading_review_id_fkey(*)",
       order: "created_at, { ascending: false }"
     },
     pagination: {
diff --git a/app/course/[course_id]/assignments/[assignment_id]/submissions/[submissions_id]/layout.tsx b/app/course/[course_id]/assignments/[assignment_id]/submissions/[submissions_id]/layout.tsx
index 5b57cffdb..dcc649a40 100644
--- a/app/course/[course_id]/assignments/[assignment_id]/submissions/[submissions_id]/layout.tsx
+++ b/app/course/[course_id]/assignments/[assignment_id]/submissions/[submissions_id]/layout.tsx
@@ -270,7 +270,8 @@ function SubmissionHistoryContents({ submission }: { submission: SubmissionWithG
   const { data, isLoading } = useList<SubmissionWithGraderResultsAndReview>({
     resource: "submissions",
     meta: {
-      select: "*, grader_results(*), submission_reviews!submissions_grading_review_id_fkey(*)"
+      select:
+        "*, grader_results!grader_results_submission_id_fkey(*), submission_reviews!submissions_grading_review_id_fkey(*)"
     },
     filters: [
       {
diff --git a/app/course/[course_id]/assignments/[assignment_id]/submissions/[submissions_id]/results/page.tsx b/app/course/[course_id]/assignments/[assignment_id]/submissions/[submissions_id]/results/page.tsx
index 70d571d2e..9b1767123 100644
--- a/app/course/[course_id]/assignments/[assignment_id]/submissions/[submissions_id]/results/page.tsx
+++ b/app/course/[course_id]/assignments/[assignment_id]/submissions/[submissions_id]/results/page.tsx
@@ -783,7 +783,7 @@ export default function GraderResults() {
     id: Number(submissions_id),
     meta: {
       select:
-        "*, assignments(*), grader_results(*, grader_result_tests(*, grader_result_test_output(*)), grader_result_output(*)), workflow_run_error(*)"
+        "*, assignments(*), grader_results!grader_results_submission_id_fkey(*, grader_result_tests(*, grader_result_test_output(*)), grader_result_output(*)), workflow_run_error(*)"
     }
   });
   const isObfuscatedGradesMode = useObfuscatedGradesMode();
diff --git a/app/course/[course_id]/manage/assignments/[assignment_id]/assignmentsTable.tsx b/app/course/[course_id]/manage/assignments/[assignment_id]/assignmentsTable.tsx
index c6dd26207..d4db612d5 100644
--- a/app/course/[course_id]/manage/assignments/[assignment_id]/assignmentsTable.tsx
+++ b/app/course/[course_id]/manage/assignments/[assignment_id]/assignmentsTable.tsx
@@ -1104,7 +1104,7 @@ async function exportGrades({
 
   const { data: autograder_test_results, error: autograder_test_results_error } = await supabase
     .from("grader_result_tests")
-    .select("*, submissions!inner(id, assignment_id, is_active)")
+    .select("*, submissions!grader_result_tests_submission_id_fkey!inner(id, assignment_id, is_active)")
     .eq("submissions.is_active", true)
     .eq("submissions.assignment_id", assignment_id);
   if (autograder_test_results_error) {
diff --git a/app/course/[course_id]/manage/assignments/[assignment_id]/test/page.tsx b/app/course/[course_id]/manage/assignments/[assignment_id]/test/page.tsx
index 2a5059811..570de3270 100644
--- a/app/course/[course_id]/manage/assignments/[assignment_id]/test/page.tsx
+++ b/app/course/[course_id]/manage/assignments/[assignment_id]/test/page.tsx
@@ -19,7 +19,8 @@ export default function TestAssignmentPage() {
   const { data: submissions } = useList<SubmissionWithGraderResultsAndReview>({
     resource: "submissions",
     meta: {
-      select: "*, grader_results(*), submission_reviews!submissions_grading_review_id_fkey(*)"
+      select:
+        "*, grader_results!grader_results_submission_id_fkey(*), submission_reviews!submissions_grading_review_id_fkey(*)"
     },
     sorters: [
       {
diff --git a/app/course/[course_id]/studentDashboard.tsx b/app/course/[course_id]/studentDashboard.tsx
index b761e7b4d..391e8b7ee 100644
--- a/app/course/[course_id]/studentDashboard.tsx
+++ b/app/course/[course_id]/studentDashboard.tsx
@@ -38,7 +38,9 @@ export default async function StudentDashboard({
   const supabase = await createClient();
   const { data: assignments } = await supabase
     .from("assignments_with_effective_due_dates")
-    .select("*, submissions!submissio_assignment_id_fkey(*, grader_results(*)), classes(time_zone)")
+    .select(
+      "*, submissions!submissio_assignment_id_fkey(*, grader_results!grader_results_submission_id_fkey(*)), classes(time_zone)"
+    )
     .eq("class_id", course_id)
     .eq("submissions.is_active", true)
     .eq("student_profile_id", private_profile_id)
diff --git a/hooks/useSubmission.tsx b/hooks/useSubmission.tsx
index 261c8029b..b509a3ef2 100644
--- a/hooks/useSubmission.tsx
+++ b/hooks/useSubmission.tsx
@@ -545,7 +545,7 @@ function SubmissionControllerCreator({
       select: `
         *,
         submission_files(*),
-        grader_results(*, grader_result_tests(*), grader_result_output(*)),
+        grader_results!grader_results_submission_id_fkey(*, grader_result_tests(*), grader_result_output(*)),
         submission_artifacts(*)
       `.trim()
     }
diff --git a/supabase/functions/autograder-create-submission/index.ts b/supabase/functions/autograder-create-submission/index.ts
index 21168be19..d6093d79c 100644
--- a/supabase/functions/autograder-create-submission/index.ts
+++ b/supabase/functions/autograder-create-submission/index.ts
@@ -920,7 +920,7 @@ async function handleRequest(req: Request, scope: Sentry.Scope) {
             : `profile_id.eq.${repoData.profile_id}`;
           const { data: submissions, error: submissionsError } = await adminSupabase
             .from("submissions")
-            .select("*, grader_results(*)")
+            .select("*, grader_results!grader_results_submission_id_fkey(*)")
             .or(ownershipFilter)
             .eq("assignment_id", repoData.assignment_id)
             .gte(
diff --git a/supabase/functions/autograder-submit-feedback/index.ts b/supabase/functions/autograder-submit-feedback/index.ts
index a5af2aee0..f0c8e0290 100644
--- a/supabase/functions/autograder-submit-feedback/index.ts
+++ b/supabase/functions/autograder-submit-feedback/index.ts
@@ -398,7 +398,7 @@ async function handleRequest(req: Request, scope: Sentry.Scope): Promise<GradeRe
   } else {
     const { data: submission, error: submissionError } = await adminSupabase
       .from("submissions")
-      .select("*, repository_check_runs(*)")
+      .select("*, repository_check_runs!submissions_repository_check_run_id_fkey(*)")
       .eq("repository", repository)
       .eq("sha", sha)
       .eq("run_attempt", Number.parseInt(decoded.run_attempt))
diff --git a/supabase/functions/autograder-trigger-grading-workflow/index.ts b/supabase/functions/autograder-trigger-grading-workflow/index.ts
index e74752a36..dd3f15f91 100644
--- a/supabase/functions/autograder-trigger-grading-workflow/index.ts
+++ b/supabase/functions/autograder-trigger-grading-workflow/index.ts
@@ -17,7 +17,7 @@ export async function handleRequest(req: Request, scope: Sentry.Scope) {
   );
   const { data: repoData } = await supabase
     .from("repositories")
-    .select("*, repository_check_runs(*)")
+    .select("*, repository_check_runs!repository_check_run_repository_id_fkey(*)")
     .eq("repository", repository)
     .eq("repository_check_runs.sha", sha)
     .single();
diff --git a/supabase/functions/github-repo-webhook/index.ts b/supabase/functions/github-repo-webhook/index.ts
index 88ec83596..5fa26169c 100644
--- a/supabase/functions/github-repo-webhook/index.ts
+++ b/supabase/functions/github-repo-webhook/index.ts
@@ -932,7 +932,7 @@ async function handleWorkflowCompletionErrors(
     const { data: submissions, error: submissionsError } = await adminSupabase
       .from("submissions")
       .select(
-        "id, repository_check_run_id, run_number, run_attempt, sha, repository_id, repository_check_runs(check_run_id), profile_id, assignment_group_id, assignment_id"
+        "id, repository_check_run_id, run_number, run_attempt, sha, repository_id, repository_check_runs!submissions_repository_check_run_id_fkey(check_run_id), profile_id, assignment_group_id, assignment_id"
       )
       .eq("repository_id", repositoryId)
       .eq("sha", workflowRun.head_sha)
diff --git a/utils/supabase/DatabaseTypes.d.ts b/utils/supabase/DatabaseTypes.d.ts
index 3d40e66bc..6e955aa09 100644
--- a/utils/supabase/DatabaseTypes.d.ts
+++ b/utils/supabase/DatabaseTypes.d.ts
@@ -169,7 +169,7 @@ export type AssignmentWithRepositoryAndSubmissionsAndGraderResults = GetResult<
   Database["public"]["Tables"]["assignments"]["Row"],
   "assignments",
   Database["public"]["Tables"]["assignments"]["Relationships"],
-  "*, submissions(*, grader_results(*)), repositories(*)"
+  "*, submissions(*, grader_results!grader_results_submission_id_fkey(*)), repositories(*)"
 >;
 export type SubmissionFileWithComments = GetResult<
   Database["public"],
@@ -234,21 +234,21 @@ export type SubmissionWithGraderResultsAndReview = GetResult<
   Database["public"]["Tables"]["submissions"]["Row"],
   "submissions",
   Database["public"]["Tables"]["submissions"]["Relationships"],
-  "*, grader_results(*), submission_reviews!submissions_grading_review_id_fkey(*)"
+  "*, grader_results!grader_results_submission_id_fkey(*), submission_reviews!submissions_grading_review_id_fkey(*)"
 >;
 export type SubmissionWithGraderResultsAndFiles = GetResult<
   Database["public"],
   Database["public"]["Tables"]["submissions"]["Row"],
   "submissions",
   Database["public"]["Tables"]["submissions"]["Relationships"],
-  "*, grader_results(*, grader_result_tests(*), grader_result_output(*)), submission_files(*), submission_artifacts(*)"
+  "*, grader_results!grader_results_submission_id_fkey(*, grader_result_tests(*), grader_result_output(*)), submission_files(*), submission_artifacts(*)"
 >;
 export type SubmissionWithGraderResultsAndErrors = GetResult<
   Database["public"],
   Database["public"]["Tables"]["submissions"]["Row"],
   "submissions",
   Database["public"]["Tables"]["submissions"]["Relationships"],
-  "*, assignments(*), grader_results(*, grader_result_tests(*, grader_result_test_output(*)), grader_result_output(*)), workflow_run_error(*)"
+  "*, assignments(*), grader_results!grader_results_submission_id_fkey(*, grader_result_tests(*, grader_result_test_output(*)), grader_result_output(*)), workflow_run_error(*)"
 >;
 export type GraderResultTest = GetResult<
   Database["public"],
@@ -636,7 +636,7 @@ export type RepositoryWithSubmissionsAndGraderResults = GetResult<
   Database["public"]["Tables"]["repositories"]["Row"],
   "repositories",
   Database["public"]["Tables"]["repositories"]["Relationships"],
-  "*, submissions(*, grader_results(*))"
+  "*, submissions(*, grader_results!grader_results_submission_id_fkey(*))"
 >;
 
 export type PollQuestionWithAnswers = GetResult<