Merge remote-tracking branch 'entgra/master' into entgra-master

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java

@@ -899,6 +899,7 @@ public class GenericDeviceDAOImpl extends AbstractDeviceDAOImpl {
                        ") d1 " +
                        "WHERE d1.DEVICE_ID = e.DEVICE_ID " +
                        "AND d1.DEVICE_ID = ddi.DEVICE_ID " +
+                       "AND d1.DEVICE_ID = ddd.DEVICE_ID " +
                        "AND ddi.KEY_FIELD = ? ";
             if (dataSourceType.contains(DeviceManagementConstants.DataBaseTypes.DB_TYPE_H2)) {
                 sql += "AND CAST( ddi.VALUE_FIELD AS BIGINT ) < ? ";

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/OracleDeviceDAOImpl.java

@@ -865,6 +865,7 @@ public class OracleDeviceDAOImpl extends AbstractDeviceDAOImpl {
                        ") d1 " +
                        "WHERE d1.DEVICE_ID = e.DEVICE_ID " +
                        "AND d1.DEVICE_ID = ddi.DEVICE_ID " +
+                       "AND d1.DEVICE_ID = ddd.DEVICE_ID " +
                        "AND ddi.KEY_FIELD = ? " +
                        "AND CAST( ddi.VALUE_FIELD AS BIGINT ) < ? " +
                        "ORDER BY ENROLMENT_ID " +

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/PostgreSQLDeviceDAOImpl.java

@@ -851,6 +851,7 @@ public class PostgreSQLDeviceDAOImpl extends AbstractDeviceDAOImpl {
                        ") d1 " +
                        "WHERE d1.DEVICE_ID = e.DEVICE_ID " +
                        "AND d1.DEVICE_ID = ddi.DEVICE_ID " +
+                       "AND d1.DEVICE_ID = ddd.DEVICE_ID " +
                        "AND ddi.KEY_FIELD = ? " +
                        "AND CAST( ddi.VALUE_FIELD AS BIGINT ) < ? " +
                        "LIMIT ? OFFSET ?";

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java

@@ -667,6 +667,7 @@ public class SQLServerDeviceDAOImpl extends AbstractDeviceDAOImpl {
                        ") d1 " +
                        "WHERE d1.DEVICE_ID = e.DEVICE_ID " +
                        "AND d1.DEVICE_ID = ddi.DEVICE_ID " +
+                       "AND d1.DEVICE_ID = ddd.DEVICE_ID " +
                        "AND ddi.KEY_FIELD = ? " +
                        "AND CAST( ddi.VALUE_FIELD AS BIGINT ) < ? " +
                        "LIMIT ? OFFSET ?";