Incorrect Or Group Serialization

[jdmcd]

Executing this fluent command:

return try school
    .users
    .query(on: req)
    .filter(\.user_type_id == 1)
    .group(.or) { orGroup in
        try orGroup.filter(\.firstName ~~ "sally")
        try orGroup.filter(\.lastName ~~ "sally")
    }
    .sort(\.firstName, .ascending)
    .all()

Creates this SQL:

SELECT * FROM `users` WHERE (`users`.`school_id` = ? AND `users`.`user_type_id` = ? AND (`users`.`school_id` = ? OR `users`.`user_type_id` = ? OR `users`.`firstName` LIKE ? OR `users`.`lastName` LIKE ?)) ORDER BY `users`.`firstName` ASC ["integer8(1)", "integer8(1)", "integer8(1)", "integer8(1)", "string(\"%sally%\")", "string(\"%sally%\")"]

Note `users`.`school_id` = ? is incorrectly included at the root level of the query as well as inside of the or group. As a result, when I query for "sally" (and expect only one result back) all of the users within this school are returned. That part of the query should only be included at the root of the query.