From a24cf30f56647b865eefdbd6a7fdf54dc82847c7 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Thu, 17 Jul 2025 22:37:58 -0700
Subject: [PATCH] GUACAMOLE-2088: Add missing "AND" for MySQL/MariaDB "DELETE"
 query.

---
 .../apache/guacamole/auth/jdbc/usergroup/UserGroupMapper.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/UserGroupMapper.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/usergroup/UserGroupMapper.xml
index 1c521e8d4..8e82bfe19 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/usergroup/UserGroupMapper.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/org/apache/guacamole/auth/jdbc/usergroup/UserGroupMapper.xml
@@ -291,7 +291,6 @@
     <delete id="delete">
         DELETE FROM guacamole_entity
         WHERE
-            type = 'USER_GROUP'
             <choose>
                 <when test="caseSensitivity.caseSensitiveGroupNames()">
                     name = #{identifier,jdbcType=VARCHAR}
@@ -300,6 +299,7 @@
                     LOWER(name) = LOWER(#{identifier,jdbcType=VARCHAR})
                 </otherwise>
             </choose>
+            AND type = 'USER_GROUP'
     </delete>
 
     <!-- Insert single group -->