Merge remote-tracking branch 'upstream/master'

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/sql/h2.sql

@@ -123,7 +123,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_OPERATION_RESPONSE (
     ID INTEGER AUTO_INCREMENT NOT NULL,
     ENROLMENT_ID INTEGER NOT NULL,
     OPERATION_ID INTEGER NOT NULL,
-    OPERATION_RESPONSE BLOB DEFAULT NULL,
+    OPERATION_RESPONSE LONGBLOB DEFAULT NULL,
     PRIMARY KEY (ID),
     CONSTRAINT fk_dm_device_operation_response_enrollment FOREIGN KEY (ENROLMENT_ID) REFERENCES
     DM_ENROLMENT (ID) ON DELETE NO ACTION ON UPDATE NO ACTION,

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

@@ -119,7 +119,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_OPERATION_RESPONSE (
     ID INTEGER AUTO_INCREMENT NOT NULL,
     ENROLMENT_ID INTEGER NOT NULL,
     OPERATION_ID INTEGER NOT NULL,
-    OPERATION_RESPONSE BLOB DEFAULT NULL,
+    OPERATION_RESPONSE LONGBLOB DEFAULT NULL,
     RECEIVED_TIMESTAMP TIMESTAMP NULL,
     PRIMARY KEY (ID),
     CONSTRAINT fk_dm_device_operation_response_enrollment FOREIGN KEY (ENROLMENT_ID) REFERENCES

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

@@ -435,11 +435,10 @@ CREATE TABLE DM_DEVICE_DETAIL (
     ON DELETE NO ACTION
     ON UPDATE NO ACTION
 );
-GO
 
 -- DASHBOARD RELATED VIEWS --
 
-CREATE VIEW POLICY_COMPLIANCE_INFO AS
+exec('CREATE VIEW POLICY_COMPLIANCE_INFO AS
 SELECT TOP 100 PERCENT
 DEVICE_INFO.DEVICE_ID,
 DEVICE_INFO.DEVICE_IDENTIFICATION,
@@ -468,10 +467,9 @@ STATUS AS IS_COMPLIANT
 FROM
 DM_POLICY_COMPLIANCE_STATUS) DEVICE_WITH_POLICY_INFO
 ON DEVICE_INFO.DEVICE_ID = DEVICE_WITH_POLICY_INFO.DEVICE_ID
-ORDER BY DEVICE_INFO.DEVICE_ID;
-GO
+ORDER BY DEVICE_INFO.DEVICE_ID');
 
-CREATE VIEW FEATURE_NON_COMPLIANCE_INFO AS
+exec('CREATE VIEW FEATURE_NON_COMPLIANCE_INFO AS
 SELECT TOP 100 PERCENT
 DM_DEVICE.ID AS DEVICE_ID,
 DM_DEVICE.DEVICE_IDENTIFICATION,
@@ -496,7 +494,6 @@ 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;
-GO
+ORDER BY TENANT_ID, DEVICE_ID');
 
 -- END OF DASHBOARD RELATED VIEWS --

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

@@ -108,7 +108,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_OPERATION_RESPONSE (
     ID INTEGER AUTO_INCREMENT NOT NULL,
     ENROLMENT_ID INTEGER NOT NULL,
     OPERATION_ID INTEGER NOT NULL,
-    OPERATION_RESPONSE BLOB DEFAULT NULL,
+    OPERATION_RESPONSE LONGBLOB DEFAULT NULL,
     RECEIVED_TIMESTAMP TIMESTAMP NULL,
     PRIMARY KEY (ID),
     CONSTRAINT fk_dm_device_operation_response_enrollment FOREIGN KEY (ENROLMENT_ID) REFERENCES