Merge branch 'device-delete-db-fix' into 'master'

Fix sql syntax error in device large response delete

See merge request entgra/carbon-device-mgt!550
merge-requests/552/head
Charitha Goonetilleke 5 years ago
commit 798663fef7

@ -2417,11 +2417,10 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
private void removeDeviceLargeOperationResponse(Connection conn, List<Integer> enrollmentIds) private void removeDeviceLargeOperationResponse(Connection conn, List<Integer> enrollmentIds)
throws DeviceManagementDAOException { throws DeviceManagementDAOException {
String sql = "DELETE DM_DEVICE_OPERATION_RESPONSE_LARGE " + String sql = "DELETE FROM DM_DEVICE_OPERATION_RESPONSE_LARGE " +
"FROM DM_DEVICE_OPERATION_RESPONSE_LARGE " + "WHERE EXISTS (SELECT ID FROM DM_DEVICE_OPERATION_RESPONSE " +
"INNER JOIN DM_DEVICE_OPERATION_RESPONSE ON DM_DEVICE_OPERATION_RESPONSE_LARGE.ID = " + "WHERE DM_DEVICE_OPERATION_RESPONSE.ID = DM_DEVICE_OPERATION_RESPONSE_LARGE.ID " +
"DM_DEVICE_OPERATION_RESPONSE.ID " + "AND DM_DEVICE_OPERATION_RESPONSE.ENROLMENT_ID = ?)";
"WHERE ENROLMENT_ID = ?";
try { try {
if (!executeBatchOperation(conn, sql, enrollmentIds)) { if (!executeBatchOperation(conn, sql, enrollmentIds)) {
String msg = "Failed to remove device large operation response of devices with " + String msg = "Failed to remove device large operation response of devices with " +

Loading…
Cancel
Save