Merge branch 'master' into 'master'

Fix having UPPER in query of groups retrieval

See merge request entgra/carbon-device-mgt!797
merge-requests/798/head
Charitha Goonetilleke 3 years ago
commit eee60cec89

@ -73,10 +73,10 @@ public abstract class AbstractGroupDAOImpl implements GroupDAO {
String sql = "SELECT ID, DESCRIPTION, GROUP_NAME, OWNER, STATUS, PARENT_PATH FROM DM_GROUP " String sql = "SELECT ID, DESCRIPTION, GROUP_NAME, OWNER, STATUS, PARENT_PATH FROM DM_GROUP "
+ "WHERE TENANT_ID = ?"; + "WHERE TENANT_ID = ?";
if (StringUtils.isNotBlank(request.getGroupName())) { if (StringUtils.isNotBlank(request.getGroupName())) {
sql += " AND UPPER(GROUP_NAME) LIKE ?"; sql += " AND GROUP_NAME LIKE ?";
} }
if (StringUtils.isNotBlank(request.getOwner())) { if (StringUtils.isNotBlank(request.getOwner())) {
sql += " AND UPPER(OWNER) LIKE ?"; sql += " AND OWNER LIKE ?";
} }
if (StringUtils.isNotBlank(request.getStatus())) { if (StringUtils.isNotBlank(request.getStatus())) {
sql += " AND STATUS = ?"; sql += " AND STATUS = ?";

Loading…
Cancel
Save