Changing view names to fix oracle naming issues in dashboard analytics feature

components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/src/main/java/org/wso2/carbon/device/mgt/analytics/dashboard/dao/GadgetDataServiceDAOConstants.java

@@ -22,8 +22,8 @@ public final class GadgetDataServiceDAOConstants {
 
     public static class DatabaseView {
 
-        public static final String DEVICES_VIEW_1 = "DEVICES_WITH_POLICY_COMPLIANCE_STATUS";
+        public static final String DEVICES_VIEW_1 = "POLICY_COMPLIANCE_INFO";
-        public static final String DEVICES_VIEW_2 = "DEVICES_WITH_NON_COMPLIANT_FEATURES";
+        public static final String DEVICES_VIEW_2 = "FEATURE_NON_COMPLIANCE_INFO";
 
         private DatabaseView() {
             throw new AssertionError();

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

@@ -516,7 +516,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_GROUP_POLICY (
 
 -- DASHBOARD RELATED VIEWS --
 
-CREATE VIEW DEVICES_WITH_POLICY_COMPLIANCE_STATUS AS
+CREATE VIEW POLICY_COMPLIANCE_INFO AS
 SELECT
 DEVICE_INFO.DEVICE_ID,
 DEVICE_INFO.DEVICE_IDENTIFICATION,
@@ -545,7 +545,7 @@ 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;
 
-CREATE VIEW DEVICES_WITH_NON_COMPLIANT_FEATURES AS
+CREATE VIEW FEATURE_NON_COMPLIANCE_INFO AS
 SELECT
 DM_DEVICE.ID AS DEVICE_ID,
 DM_DEVICE.DEVICE_IDENTIFICATION,

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

@@ -508,7 +508,7 @@ CREATE INDEX FK_DM_DEVICE_DETAILS_DEVICE_idx ON DM_DEVICE_DETAIL (DEVICE_ID ASC)
 
 -- DASHBOARD RELATED VIEWS --
 
-CREATE VIEW DEVICES_WITH_POLICY_COMPLIANCE_STATUS AS
+CREATE VIEW POLICY_COMPLIANCE_INFO AS
 SELECT TOP 100 PERCENT
 DEVICE_INFO.DEVICE_ID,
 DEVICE_INFO.DEVICE_IDENTIFICATION,
@@ -540,7 +540,7 @@ ON DEVICE_INFO.DEVICE_ID = DEVICE_WITH_POLICY_INFO.DEVICE_ID
 ORDER BY DEVICE_INFO.DEVICE_ID;
 GO
 
-CREATE VIEW DEVICES_WITH_NON_COMPLIANT_FEATURES AS
+CREATE VIEW FEATURE_NON_COMPLIANCE_INFO AS
 SELECT TOP 100 PERCENT
 DM_DEVICE.ID AS DEVICE_ID,
 DM_DEVICE.DEVICE_IDENTIFICATION,

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

@@ -546,7 +546,7 @@ POLICY_ID,
 STATUS AS IS_COMPLIANT
 FROM DM_POLICY_COMPLIANCE_STATUS;
 
-CREATE VIEW DEVICES_WITH_POLICY_COMPLIANCE_STATUS AS
+CREATE VIEW POLICY_COMPLIANCE_INFO AS
 SELECT
 DEVICE_INFO_VIEW.DEVICE_ID,
 DEVICE_INFO_VIEW.DEVICE_IDENTIFICATION,
@@ -563,7 +563,7 @@ 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 DEVICES_WITH_NON_COMPLIANT_FEATURES AS
+CREATE VIEW FEATURE_NON_COMPLIANCE_INFO AS
 SELECT
 DM_DEVICE.ID AS DEVICE_ID,
 DM_DEVICE.DEVICE_IDENTIFICATION,

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

@@ -435,7 +435,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_DETAIL (
 
 -- DASHBOARD RELATED VIEWS --
 
-CREATE VIEW DEVICES_WITH_POLICY_COMPLIANCE_STATUS AS
+CREATE VIEW POLICY_COMPLIANCE_INFO AS
 SELECT
 DEVICE_INFO.DEVICE_ID,
 DEVICE_INFO.DEVICE_IDENTIFICATION,
@@ -464,7 +464,7 @@ 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;
 
-CREATE VIEW DEVICES_WITH_NON_COMPLIANT_FEATURES AS
+CREATE VIEW FEATURE_NON_COMPLIANCE_INFO AS
 SELECT
 DM_DEVICE.ID AS DEVICE_ID,
 DM_DEVICE.DEVICE_IDENTIFICATION,

pom.xml

@@ -1721,7 +1721,6 @@
         </repository>
     </repositories>
 
-
     <properties>
         <testng.version>6.1.1</testng.version>
         <carbon.kernel.version>4.4.3</carbon.kernel.version>