fix: added missing parentheses in where conditions (#10650)

added missing parentheses in where conditions and with And/Or operators

Closes: #10534

src/query-builder/QueryBuilder.ts

@@ -1130,9 +1130,9 @@ export abstract class QueryBuilder<Entity extends ObjectLiteral> {
                     true,
                 )}`
             case "and":
-                return condition.parameters.join(" AND ")
+                return "(" + condition.parameters.join(" AND ") + ")"
             case "or":
-                return condition.parameters.join(" OR ")
+                return "(" + condition.parameters.join(" OR ") + ")"
         }
 
         throw new TypeError(

src/query-builder/SelectQueryBuilder.ts

@@ -4226,21 +4226,18 @@ export class SelectQueryBuilder<Entity extends ObjectLiteral>
         // let parameterIndex = Object.keys(this.expressionMap.nativeParameters).length;
         if (Array.isArray(where)) {
             if (where.length) {
-                condition =
-                    "(" +
-                    where
-                        .map((whereItem) => {
-                            return this.buildWhere(
-                                whereItem,
-                                metadata,
-                                alias,
-                                embedPrefix,
-                            )
-                        })
-                        .filter((condition) => !!condition)
-                        .map((condition) => "(" + condition + ")")
-                        .join(" OR ") +
-                    ")"
+                condition = where
+                    .map((whereItem) => {
+                        return this.buildWhere(
+                            whereItem,
+                            metadata,
+                            alias,
+                            embedPrefix,
+                        )
+                    })
+                    .filter((condition) => !!condition)
+                    .map((condition) => "(" + condition + ")")
+                    .join(" OR ")
             }
         } else {
             let andConditions: string[] = []
@@ -4510,8 +4507,10 @@ export class SelectQueryBuilder<Entity extends ObjectLiteral>
                     }
                 }
             }
-            condition = andConditions.join(" AND ")
+            condition = andConditions.length
+                ? "(" + andConditions.join(") AND (") + ")"
+                : andConditions.join(" AND ")
         }
-        return condition
+        return condition.length ? "(" + condition + ")" : condition
     }
 }