From b0252469ed3a19461452d019093f4fb6df3b0a4d Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Mon, 23 Sep 2024 12:33:25 +0100
Subject: [PATCH] Removing wrap for MySQL.

---
 packages/backend-core/src/sql/sql.ts | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/packages/backend-core/src/sql/sql.ts b/packages/backend-core/src/sql/sql.ts
index a9400b1839..91b4e124cc 100644
--- a/packages/backend-core/src/sql/sql.ts
+++ b/packages/backend-core/src/sql/sql.ts
@@ -991,10 +991,8 @@ class InternalBuilder {
           this.on(`${toAlias}.${toPrimary}`, "=", `${throughAlias}.${toKey}`)
         })
       }
-      // my-sql needs the where statement to be part of main query, not sub-query
-      if (sqlClient !== SqlClient.MY_SQL) {
-        subQuery = addCorrelatedWhere(subQuery, correlatedTo, correlatedFrom)
-      }
+
+      subQuery = addCorrelatedWhere(subQuery, correlatedTo, correlatedFrom)
 
       const standardWrap = (select: string): Knex.QueryBuilder => {
         subQuery = subQuery.select(`${toAlias}.*`)
@@ -1018,11 +1016,7 @@ class InternalBuilder {
           )
           break
         case SqlClient.MY_SQL:
-          wrapperQuery = addCorrelatedWhere(
-            standardWrap(`json_arrayagg(json_object(${fieldList}))`),
-            isManyToMany ? fromKey! : toKey!,
-            correlatedFrom
-          )
+          wrapperQuery = knex.raw(`json_arrayagg(json_object(${fieldList}))`)
           break
         case SqlClient.ORACLE:
           wrapperQuery = standardWrap(