Resolved merge conflicts

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/dao/impl/WindowsFeatureDAOImpl.java

@@ -61,7 +61,6 @@ public class WindowsFeatureDAOImpl implements MobileFeatureDAO {
             stmt.setString(3, mobileFeature.getDescription());
             stmt.executeUpdate();
             status = true;
-            status = true;
         } catch (SQLException e) {
             throw new WindowsFeatureManagementDAOException(
                     "Error occurred while adding windows feature '" +
@@ -135,7 +134,7 @@ public class WindowsFeatureDAOImpl implements MobileFeatureDAO {
         Connection conn;
         try {
             conn = WindowsDAOFactory.getConnection();
-            String sql = "DELETE FROM WIN_FEATURE WHERE FEATURE_ID = ?";
+            String sql = "DELETE FROM WIN_FEATURE WHERE ID = ?";
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, mblFeatureId);
             stmt.execute();
@@ -179,7 +178,7 @@ public class WindowsFeatureDAOImpl implements MobileFeatureDAO {
         Connection conn;
         try {
             conn = WindowsDAOFactory.getConnection();
-            String sql = "SELECT FEATURE_ID, CODE, NAME, DESCRIPTION FROM WIN_FEATURE WHERE ID = ?";
+            String sql = "SELECT ID, CODE, NAME, DESCRIPTION FROM WIN_FEATURE WHERE ID = ?";
             stmt = conn.prepareStatement(sql);
             stmt.setInt(1, mblFeatureId);
             rs = stmt.executeQuery();
@@ -210,7 +209,7 @@ public class WindowsFeatureDAOImpl implements MobileFeatureDAO {
         Connection conn;
         try {
             conn = WindowsDAOFactory.getConnection();
-            String sql = "SELECT FEATURE_ID, CODE, NAME, DESCRIPTION FROM WIN_FEATURE WHERE CODE = ?";
+            String sql = "SELECT ID, CODE, NAME, DESCRIPTION FROM WIN_FEATURE WHERE CODE = ?";
             stmt = conn.prepareStatement(sql);
             stmt.setString(1, mblFeatureCode);
             rs = stmt.executeQuery();
@@ -247,7 +246,7 @@ public class WindowsFeatureDAOImpl implements MobileFeatureDAO {
         List<MobileFeature> features = new ArrayList<>();
         try {
             conn = WindowsDAOFactory.getConnection();
-            String sql = "SELECT FEATURE_ID, CODE, NAME, DESCRIPTION FROM WIN_FEATURE";
+            String sql = "SELECT ID, CODE, NAME, DESCRIPTION FROM WIN_FEATURE";
             stmt = conn.prepareStatement(sql);
             rs = stmt.executeQuery();
             MobileFeature mobileFeature;

features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/h2.sql

@@ -22,9 +22,9 @@
 -- Table `WIN_FEATURE`
 -- -----------------------------------------------------
 CREATE TABLE IF NOT EXISTS `WIN_FEATURE` (
-  `FEATURE_ID` INT NOT NULL AUTO_INCREMENT,
+  `ID` INT NOT NULL AUTO_INCREMENT,
   `CODE` VARCHAR(45) NOT NULL,
   `NAME` VARCHAR(100) NULL,
   `DESCRIPTION` VARCHAR(200) NULL,
-  PRIMARY KEY (`FEATURE_ID`)
+  PRIMARY KEY (`ID`)
 );

features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/mysql.sql

@@ -23,11 +23,11 @@ ENGINE = InnoDB;
 -- Table `WIN_FEATURE`
 -- -----------------------------------------------------
 CREATE TABLE IF NOT EXISTS `WIN_FEATURE` (
-  `FEATURE_ID` INT NOT NULL AUTO_INCREMENT,
+  `ID` INT NOT NULL AUTO_INCREMENT,
   `CODE` VARCHAR(45) NULL,
   `NAME` VARCHAR(100) NULL,
   `DESCRIPTION` VARCHAR(200) NULL,
-  PRIMARY KEY (`FEATURE_ID`))
+  PRIMARY KEY (`ID`))
 ENGINE = InnoDB;
 
 

features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/src/main/resources/dbscripts/plugins/windows/mysql.sql~

@@ -0,0 +1,38 @@
+-- -----------------------------------------------------
+-- Table `WIN_DEVICE`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `WIN_DEVICE` (
+  `DEVICE_ID` VARCHAR(45) NOT NULL,
+  `PUSH_TOKEN` VARCHAR(45) NULL DEFAULT NULL,
+  `IMEI` VARCHAR(45) NULL DEFAULT NULL,
+  `IMSI` VARCHAR(45) NULL DEFAULT NULL,
+  `OS_VERSION` VARCHAR(45) NULL DEFAULT NULL,
+  `DEVICE_MODEL` VARCHAR(45) NULL DEFAULT NULL,
+  `VENDOR` VARCHAR(45) NULL DEFAULT NULL,
+  `LATITUDE` VARCHAR(45) NULL DEFAULT NULL,
+  `LONGITUDE` VARCHAR(45) NULL DEFAULT NULL,
+  `CHALLENGE` VARCHAR(45) NULL DEFAULT NULL,
+  `TOKEN` VARCHAR(50) NULL DEFAULT NULL,
+  `UNLOCK_TOKEN` VARCHAR(2000) NULL DEFAULT NULL,
+  `SERIAL` VARCHAR(45) NULL DEFAULT NULL,
+  PRIMARY KEY (`DEVICE_ID`))
+ENGINE = InnoDB;
+
+
+-- -----------------------------------------------------
+-- Table `WIN_FEATURE`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `WIN_FEATURE` (
+<<<<<<< HEAD
+  `FEATURE_ID` INT NOT NULL AUTO_INCREMENT,
+=======
+  `ID` INT NOT NULL AUTO_INCREMENT,
+>>>>>>> b33be7d49d6c06bc8f1068bd6600b674bff470a8
+  `CODE` VARCHAR(45) NULL,
+  `NAME` VARCHAR(100) NULL,
+  `DESCRIPTION` VARCHAR(200) NULL,
+  PRIMARY KEY (`ID`))
+ENGINE = InnoDB;
+
+
+