navodzoysa
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix sql syntax errors

Browse Source
issue-10462/secure-pending-operation-6.2
Pramila Niroshan 5 months ago
parent 641ddbfb85
commit f0c48c585d
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File

11
components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java
Unescape View File

@ -1036,12 +1036,12 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
"(SELECT gd.DEVICE_ID, " + "(SELECT gd.DEVICE_ID, " +
"gd.DESCRIPTION, " + "gd.DESCRIPTION, " +
"gd.NAME, " + "gd.NAME, " +
"gd.DEVICE_IDENTIFICATION, " + "gd.DEVICE_IDENTIFICATION " +
"FROM " + "FROM " +
"(SELECT d.ID AS DEVICE_ID, " + "(SELECT d.ID AS DEVICE_ID, " +
"d.DESCRIPTION, " + "d.DESCRIPTION, " +
"d.NAME, " + "d.NAME, " +
"d.DEVICE_IDENTIFICATION, " + "d.DEVICE_IDENTIFICATION " +
"FROM DM_DEVICE d, " + "FROM DM_DEVICE d, " +
"(SELECT dgm.DEVICE_ID " + "(SELECT dgm.DEVICE_ID " +
"FROM DM_DEVICE_GROUP_MAP dgm " + "FROM DM_DEVICE_GROUP_MAP dgm " +
@ -2365,7 +2365,7 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
"e.device_id," + "e.device_id," +
"e.status, " + "e.status, " +
"e.date_of_last_update, " + "e.date_of_last_update, " +
"e.date_of_enrolment " + "e.date_of_enrolment, " +
"e.DEVICE_TYPE " + "e.DEVICE_TYPE " +
"FROM dm_enrolment e " + "FROM dm_enrolment e " +
"INNER JOIN " + "INNER JOIN " +
@ -2375,7 +2375,7 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
"KEY_FIELD = 'encryptionEnabled' " + "KEY_FIELD = 'encryptionEnabled' " +
"AND VALUE_FIELD = ?) AS di " + "AND VALUE_FIELD = ?) AS di " +
"ON di.DEVICE_ID = e.DEVICE_ID " + "ON di.DEVICE_ID = e.DEVICE_ID " +
"WHERE e.tenant_id = ?) e1, " + "WHERE e.tenant_id = ?) e1 " +
"WHERE d.id = e1.device_id " + "WHERE d.id = e1.device_id " +
"ORDER BY e1.date_of_last_update DESC " + "ORDER BY e1.date_of_last_update DESC " +
"LIMIT ? OFFSET ?"; "LIMIT ? OFFSET ?";
@ -2409,7 +2409,7 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
try { try {
Connection conn = getConnection(); Connection conn = getConnection();
String sql = String sql =
"SELECT COUNT(DEVICE_ID) " + "SELECT COUNT(DEVICE_ID) AS DEVICE_COUNT " +
"FROM DM_DEVICE_INFO " + "FROM DM_DEVICE_INFO " +
"WHERE KEY_FIELD = 'encryptionEnabled' " + "WHERE KEY_FIELD = 'encryptionEnabled' " +
"AND VALUE_FIELD = ?"; "AND VALUE_FIELD = ?";
@ -2417,7 +2417,6 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
try (PreparedStatement ps = conn.prepareStatement(sql)) { try (PreparedStatement ps = conn.prepareStatement(sql)) {
ps.setBoolean(1, isEncrypted); ps.setBoolean(1, isEncrypted);
ps.setInt(2, tenantId);
try (ResultSet rs = ps.executeQuery()) { try (ResultSet rs = ps.executeQuery()) {
return rs.next() ? rs.getInt("DEVICE_COUNT") : 0; return rs.next() ? rs.getInt("DEVICE_COUNT") : 0;

Write Preview
Loading…
Cancel
Save