From f25bd09d7148d5fe4adba335e4207d42badd2134 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Wed, 3 Sep 2025 12:24:20 -0700
Subject: [PATCH 1/2] GUACAMOLE-2088: Correct typo in MySQL reference to method
 name ("case", not "caes").

---
 .../auth/jdbc/usergroup/UserGroupMemberUserGroupMapper.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/usergroup/UserGroupMemberUserGroupMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/usergroup/UserGroupMemberUserGroupMapper.xml
index e589a8501..bba8d9be3 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/usergroup/UserGroupMemberUserGroupMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/usergroup/UserGroupMemberUserGroupMapper.xml
@@ -96,7 +96,7 @@
             guacamole_entity.type = 'USER_GROUP'
             AND
             <choose>
-                <when test="caseSensitivity.caesSensitiveGroupNames()">
+                <when test="caseSensitivity.caseSensitiveGroupNames()">
                     guacamole_entity.name
                 </when>
                 <otherwise>

From ee57d653994b9dc460e350057c9effb689f93526 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Wed, 3 Sep 2025 12:27:14 -0700
Subject: [PATCH 2/2] GUACAMOLE-2099: Add missing "AND" in SQL Server query for
 permission deletion.

---
 .../auth/jdbc/permission/UserGroupPermissionMapper.xml        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/permission/UserGroupPermissionMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/permission/UserGroupPermissionMapper.xml
index 389c1826a..91c9990e8 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/permission/UserGroupPermissionMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/org/apache/guacamole/auth/jdbc/permission/UserGroupPermissionMapper.xml
@@ -135,7 +135,7 @@
                      open="(" separator=" OR " close=")">
                 ([guacamole_user_group_permission].entity_id = #{permission.entityID,jdbcType=INTEGER} AND
                  permission = #{permission.type,jdbcType=VARCHAR} AND
-                 affected_entity.type = 'USER_GROUP'
+                 affected_entity.type = 'USER_GROUP' AND
                 <choose>
                     <when test="caseSensitivity.caseSensitiveGroupNames()">
                         affected_entity.name = #{permission.objectIdentifier,jdbcType=VARCHAR}
@@ -189,4 +189,4 @@
 
     </insert>
 
-</mapper>
\ No newline at end of file
+</mapper>