MSSQL fixes to dbscrpits and DAO layer

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

@@ -162,7 +162,8 @@ public class SQLServerDeviceDAOImpl extends AbstractDeviceDAOImpl {
                          "e.DATE_OF_ENROLMENT, e.ID AS ENROLMENT_ID FROM DM_ENROLMENT e, (SELECT d.ID, d.DESCRIPTION, " +
                          "d.NAME, d.DEVICE_IDENTIFICATION, t.NAME AS DEVICE_TYPE FROM DM_DEVICE d, " +
                          "DM_DEVICE_TYPE t WHERE DEVICE_TYPE_ID = t.ID AND t.NAME = ? " +
-                         "AND d.TENANT_ID = ?) d1 WHERE d1.ID = e.DEVICE_ID AND TENANT_ID = ? OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
+                         "AND d.TENANT_ID = ?) d1 WHERE d1.ID = e.DEVICE_ID AND TENANT_ID = ? ORDER BY ENROLMENT_ID" +
+                         " OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
             stmt = conn.prepareStatement(sql);
             stmt.setString(1, request.getDeviceType());
             stmt.setInt(2, tenantId);
@@ -196,7 +197,7 @@ public class SQLServerDeviceDAOImpl extends AbstractDeviceDAOImpl {
                          "AS DEVICE_TYPE FROM DM_DEVICE d, (SELECT e.OWNER, e.OWNERSHIP, e.ID AS ENROLMENT_ID, " +
                          "e.DEVICE_ID, e.STATUS, e.DATE_OF_LAST_UPDATE, e.DATE_OF_ENROLMENT FROM DM_ENROLMENT e WHERE " +
                          "e.TENANT_ID = ? AND e.OWNER = ?) e1, DM_DEVICE_TYPE t WHERE d.ID = e1.DEVICE_ID " +
-                         "AND t.ID = d.DEVICE_TYPE_ID OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
+                         "AND t.ID = d.DEVICE_TYPE_ID ORDER BY ENROLMENT_ID OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, tenantId);
             stmt.setString(2, request.getOwner());
@@ -230,7 +231,8 @@ public class SQLServerDeviceDAOImpl extends AbstractDeviceDAOImpl {
                          "e.DATE_OF_ENROLMENT, e.ID AS ENROLMENT_ID FROM DM_ENROLMENT e, (SELECT d.ID, d.NAME, " +
                          "d.DESCRIPTION, t.NAME AS DEVICE_TYPE, d.DEVICE_IDENTIFICATION FROM DM_DEVICE d, " +
                          "DM_DEVICE_TYPE t WHERE d.DEVICE_TYPE_ID = t.ID AND d.NAME LIKE ? AND d.TENANT_ID = ?) d1 " +
-                         "WHERE DEVICE_ID = e.DEVICE_ID AND TENANT_ID = ? OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
+                         "WHERE DEVICE_ID = e.DEVICE_ID AND TENANT_ID = ? ORDER BY ENROLMENT_ID " +
+                         "OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
             stmt = conn.prepareStatement(sql);
             stmt.setString(1, request.getDeviceName() + "%");
             stmt.setInt(2, tenantId);
@@ -265,8 +267,8 @@ public class SQLServerDeviceDAOImpl extends AbstractDeviceDAOImpl {
                          "e.DATE_OF_ENROLMENT, e.ID AS ENROLMENT_ID FROM (SELECT e.ID, e.DEVICE_ID, e.OWNER, e.OWNERSHIP, e.STATUS, " +
                          "e.DATE_OF_ENROLMENT, e.DATE_OF_LAST_UPDATE, e.ID AS ENROLMENT_ID FROM DM_ENROLMENT e " +
                          "WHERE TENANT_ID = ? AND OWNERSHIP = ?) e, DM_DEVICE d, DM_DEVICE_TYPE t " +
-                         "WHERE DEVICE_ID = e.DEVICE_ID AND d.DEVICE_TYPE_ID = t.ID AND d.TENANT_ID = ? OFFSET ? " +
+                         "WHERE DEVICE_ID = e.DEVICE_ID AND d.DEVICE_TYPE_ID = t.ID AND d.TENANT_ID = ? ORDER BY ENROLMENT_ID " +
-                         "ROWS FETCH NEXT ? ROWS ONLY";
+                         "OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, tenantId);
             stmt.setString(2, request.getOwnership());
@@ -301,8 +303,8 @@ public class SQLServerDeviceDAOImpl extends AbstractDeviceDAOImpl {
                          "e.DATE_OF_ENROLMENT, e.ID AS ENROLMENT_ID FROM (SELECT e.ID, e.DEVICE_ID, e.OWNER, e.OWNERSHIP, e.STATUS, " +
                          "e.DATE_OF_ENROLMENT, e.DATE_OF_LAST_UPDATE, e.ID AS ENROLMENT_ID FROM DM_ENROLMENT e " +
                          "WHERE TENANT_ID = ? AND STATUS = ?) e, DM_DEVICE d, DM_DEVICE_TYPE t " +
-                         "WHERE DEVICE_ID = e.DEVICE_ID AND d.DEVICE_TYPE_ID = t.ID AND d.TENANT_ID = ? OFFSET ? ROWS" +
+                         "WHERE DEVICE_ID = e.DEVICE_ID AND d.DEVICE_TYPE_ID = t.ID AND d.TENANT_ID = ? ORDER BY ENROLMENT_ID " +
-                         " FETCH NEXT ? ROWS ONLY";
+                         "OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, tenantId);
             stmt.setString(2, request.getStatus());
@@ -356,7 +358,7 @@ public class SQLServerDeviceDAOImpl extends AbstractDeviceDAOImpl {
                     "e.DATE_OF_ENROLMENT, e.ID AS ENROLMENT_ID FROM DM_ENROLMENT e, (SELECT d.ID, d.NAME, " +
                         "d.DESCRIPTION, d.DEVICE_IDENTIFICATION, t.NAME AS DEVICE_TYPE FROM DM_DEVICE d, " +
                             "DM_DEVICE_TYPE t WHERE d.DEVICE_TYPE_ID = t.ID AND d.TENANT_ID = ?" + filteringString +
-                                ") d1 WHERE d1.ID = e.DEVICE_ID OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
+                                ") d1 WHERE d1.ID = e.DEVICE_ID ORDER BY ENROLMENT_ID OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
 
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, tenantId);

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

@@ -51,7 +51,7 @@ public class SQLServerNotificationDAOImpl extends AbstractNotificationDAOImpl {
                     "NOTIFICATION_ID, DEVICE_ID, OPERATION_ID, STATUS, DESCRIPTION FROM DM_NOTIFICATION WHERE " +
                     "TENANT_ID = ?) n1 WHERE n1.DEVICE_ID = d.ID AND d.DEVICE_TYPE_ID=t.ID AND TENANT_ID = ?";
 
-            sql = sql + " OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
+            sql = sql + " ORDER BY n1.NOTIFICATION_ID OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
 
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, tenantId);
@@ -92,7 +92,7 @@ public class SQLServerNotificationDAOImpl extends AbstractNotificationDAOImpl {
                          "TENANT_ID = ? AND STATUS = ?) n1 WHERE n1.DEVICE_ID = d.ID AND d.DEVICE_TYPE_ID=t.ID " +
                          "AND TENANT_ID = ?";
 
-            sql = sql + " OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
+            sql = sql + " ORDER BY n1.NOTIFICATION_ID OFFSET ? ROWS FETCH NEXT ? ROWS ONLY";
 
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, tenantId);

features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/src/main/resources/dbscripts/certMgt/mssql.sql

@@ -1,5 +1,5 @@
 CREATE TABLE DM_DEVICE_CERTIFICATE (
-  ID            INTEGER IDENTITY NOT NULL,
+  ID INTEGER IDENTITY(1,1) NOT NULL,
   SERIAL_NUMBER VARCHAR(500) DEFAULT NULL,
   CERTIFICATE   VARBINARY(max) DEFAULT NULL,
   TENANT_ID     INTEGER DEFAULT 0,

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql

@@ -34,7 +34,7 @@ CREATE TABLE DM_OPERATION (
 
 CREATE TABLE DM_CONFIG_OPERATION (
     OPERATION_ID INTEGER NOT NULL,
-    OPERATION_CONFIG VARBINARY(255) DEFAULT NULL,
+    OPERATION_CONFIG VARBINARY(MAX) DEFAULT NULL,
     PRIMARY KEY (OPERATION_ID),
     CONSTRAINT FK_DM_OPERATION_CONFIG FOREIGN KEY (OPERATION_ID) REFERENCES
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
@@ -51,7 +51,7 @@ CREATE TABLE DM_COMMAND_OPERATION (
 CREATE TABLE DM_POLICY_OPERATION (
     OPERATION_ID INTEGER NOT NULL,
     ENABLED INTEGER NOT NULL DEFAULT 0,
-    OPERATION_DETAILS VARBINARY(255) DEFAULT NULL,
+    OPERATION_DETAILS VARBINARY(MAX) DEFAULT NULL,
     PRIMARY KEY (OPERATION_ID),
     CONSTRAINT FK_DM_OPERATION_POLICY FOREIGN KEY (OPERATION_ID) REFERENCES
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
@@ -60,7 +60,7 @@ CREATE TABLE DM_POLICY_OPERATION (
 CREATE TABLE DM_PROFILE_OPERATION (
     OPERATION_ID INTEGER NOT NULL,
     ENABLED INTEGER NOT NULL DEFAULT 0,
-    OPERATION_DETAILS VARBINARY(255) DEFAULT NULL,
+    OPERATION_DETAILS VARBINARY(MAX) DEFAULT NULL,
     PRIMARY KEY (OPERATION_ID),
     CONSTRAINT FK_DM_OPERATION_PROFILE FOREIGN KEY (OPERATION_ID) REFERENCES
     DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
@@ -105,7 +105,7 @@ CREATE TABLE DM_DEVICE_OPERATION_RESPONSE (
     ID INTEGER IDENTITY(1,1) NOT NULL,
     ENROLMENT_ID INTEGER NOT NULL,
     OPERATION_ID INTEGER NOT NULL,
-    OPERATION_RESPONSE VARBINARY(255) DEFAULT NULL,
+    OPERATION_RESPONSE VARBINARY(MAX) DEFAULT NULL,
     RECEIVED_TIMESTAMP DATETIME2 DEFAULT NULL
     PRIMARY KEY (ID),
     CONSTRAINT FK_DM_DEVICE_OPERATION_RESP_ENROLMENT FOREIGN KEY (ENROLMENT_ID) REFERENCES
@@ -150,7 +150,7 @@ CREATE TABLE DM_DEVICE_POLICY (
   ID INTEGER IDENTITY(1,1) NOT NULL,
   DEVICE_ID INTEGER NOT NULL ,
   ENROLMENT_ID INTEGER NOT NULL,
-  DEVICE VARBINARY(255) NOT NULL,
+  DEVICE VARBINARY(MAX) NOT NULL,
   POLICY_ID INTEGER NOT NULL ,
   PRIMARY KEY (ID) ,
   CONSTRAINT FK_POLICY_DEVICE_POLICY FOREIGN KEY (POLICY_ID) REFERENCES DM_POLICY (ID)
@@ -176,7 +176,7 @@ CREATE TABLE DM_PROFILE_FEATURES (
   FEATURE_CODE VARCHAR(100) NOT NULL,
   DEVICE_TYPE VARCHAR(300) NOT NULL,
   TENANT_ID INTEGER NOT NULL ,
-  CONTENT VARBINARY(255) NULL DEFAULT NULL,
+  CONTENT VARBINARY(MAX) NULL DEFAULT NULL,
   PRIMARY KEY (ID),
   CONSTRAINT FK_DM_PROFILE_DM_POLICY_FEATURES FOREIGN KEY (PROFILE_ID) REFERENCES DM_PROFILE (ID)
   ON DELETE NO ACTION ON UPDATE NO ACTION
@@ -205,7 +205,7 @@ CREATE TABLE DM_USER_POLICY (
   DEVICE_ID INTEGER NOT NULL ,
   ENROLMENT_ID INTEGER NOT NULL,
   POLICY_ID INTEGER NOT NULL ,
-  POLICY_CONTENT VARBINARY(255) NULL ,
+  POLICY_CONTENT VARBINARY(MAX) NULL ,
   TENANT_ID INTEGER NOT NULL,
   APPLIED BIT NULL ,
   CREATED_TIME DATETIME2 NULL ,
@@ -239,7 +239,7 @@ CREATE TABLE DM_POLICY_CRITERIA_PROPERTIES (
   POLICY_CRITERION_ID INTEGER NOT NULL,
   PROP_KEY VARCHAR(45) NULL,
   PROP_VALUE VARCHAR(100) NULL,
-  CONTENT VARBINARY(255) NULL,
+  CONTENT VARBINARY(MAX) NULL,
   PRIMARY KEY (ID),
   CONSTRAINT FK_POLICY_CRITERIA_PROPERTIES FOREIGN KEY (POLICY_CRITERION_ID) REFERENCES DM_POLICY_CRITERIA (ID)
   ON DELETE CASCADE ON UPDATE NO ACTION
@@ -288,7 +288,7 @@ CREATE TABLE DM_APPLICATION (
     TYPE VARCHAR(50) NULL,
     LOCATION_URL VARCHAR(100) DEFAULT NULL,
     IMAGE_URL VARCHAR(100) DEFAULT NULL,
-    APP_PROPERTIES VARBINARY(255) NULL,
+    APP_PROPERTIES VARBINARY(MAX) NULL,
     MEMORY_USAGE INTEGER NULL,
     IS_ACTIVE BIT NOT NULL DEFAULT 0,
     TENANT_ID INTEGER NOT NULL,
@@ -434,67 +434,3 @@ CREATE TABLE DM_DEVICE_DETAIL (
     ON DELETE NO ACTION
     ON UPDATE NO ACTION
 );
-
--- DASHBOARD RELATED VIEWS --
-
-CREATE VIEW DEVICE_INFO_VIEW AS
-SELECT
-DM_DEVICE.ID AS DEVICE_ID,
-DM_DEVICE.DEVICE_IDENTIFICATION,
-DM_DEVICE_TYPE.NAME AS PLATFORM,
-DM_ENROLMENT.OWNERSHIP,
-DM_ENROLMENT.STATUS AS CONNECTIVITY_STATUS,
-DM_DEVICE.TENANT_ID
-FROM DM_DEVICE, DM_DEVICE_TYPE, DM_ENROLMENT
-WHERE DM_DEVICE.DEVICE_TYPE_ID = DM_DEVICE_TYPE.ID AND DM_DEVICE.ID = DM_ENROLMENT.DEVICE_ID;
-
-CREATE VIEW DEVICE_WITH_POLICY_INFO_VIEW AS
-SELECT
-DEVICE_ID,
-POLICY_ID,
-STATUS AS IS_COMPLIANT
-FROM DM_POLICY_COMPLIANCE_STATUS;
-
-CREATE VIEW POLICY_COMPLIANCE_INFO AS
-SELECT
-DEVICE_INFO_VIEW.DEVICE_ID,
-DEVICE_INFO_VIEW.DEVICE_IDENTIFICATION,
-DEVICE_INFO_VIEW.PLATFORM,
-DEVICE_INFO_VIEW.OWNERSHIP,
-DEVICE_INFO_VIEW.CONNECTIVITY_STATUS,
-IFNULL(DEVICE_WITH_POLICY_INFO_VIEW.POLICY_ID, -1) AS POLICY_ID,
-IFNULL(DEVICE_WITH_POLICY_INFO_VIEW.IS_COMPLIANT, -1) AS IS_COMPLIANT,
-DEVICE_INFO_VIEW.TENANT_ID
-FROM
-DEVICE_INFO_VIEW
-LEFT JOIN
-DEVICE_WITH_POLICY_INFO_VIEW
-ON DEVICE_INFO_VIEW.DEVICE_ID = DEVICE_WITH_POLICY_INFO_VIEW.DEVICE_ID
-ORDER BY DEVICE_INFO_VIEW.DEVICE_ID;
-
-CREATE VIEW FEATURE_NON_COMPLIANCE_INFO AS
-SELECT
-DM_DEVICE.ID AS DEVICE_ID,
-DM_DEVICE.DEVICE_IDENTIFICATION,
-DM_DEVICE_DETAIL.DEVICE_MODEL,
-DM_DEVICE_DETAIL.VENDOR,
-DM_DEVICE_DETAIL.OS_VERSION,
-DM_ENROLMENT.OWNERSHIP,
-DM_ENROLMENT.OWNER,
-DM_ENROLMENT.STATUS AS CONNECTIVITY_STATUS,
-DM_POLICY_COMPLIANCE_STATUS.POLICY_ID,
-DM_DEVICE_TYPE.NAME AS PLATFORM,
-DM_POLICY_COMPLIANCE_FEATURES.FEATURE_CODE,
-DM_POLICY_COMPLIANCE_FEATURES.STATUS AS IS_COMPLAINT,
-DM_DEVICE.TENANT_ID
-FROM
-DM_POLICY_COMPLIANCE_FEATURES, DM_POLICY_COMPLIANCE_STATUS, DM_ENROLMENT, DM_DEVICE, DM_DEVICE_TYPE, DM_DEVICE_DETAIL
-WHERE
-DM_POLICY_COMPLIANCE_FEATURES.COMPLIANCE_STATUS_ID = DM_POLICY_COMPLIANCE_STATUS.ID AND
-DM_POLICY_COMPLIANCE_STATUS.ENROLMENT_ID = DM_ENROLMENT.ID AND
-DM_POLICY_COMPLIANCE_STATUS.DEVICE_ID = DM_DEVICE.ID AND
-DM_DEVICE.DEVICE_TYPE_ID = DM_DEVICE_TYPE.ID AND
-DM_DEVICE.ID = DM_DEVICE_DETAIL.DEVICE_ID
-ORDER BY TENANT_ID, DEVICE_ID;
-
--- END OF DASHBOARD RELATED VIEWS --