added device properties to a single table

revert-70aa11f8
ayyoob 8 years ago
parent 0e9bb7caf6
commit ea6afee772

@ -21,8 +21,8 @@ package org.wso2.carbon.device.mgt.extensions.device.type.deployer.config;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
/** /**
@ -44,61 +44,61 @@ import javax.xml.bind.annotation.XmlValue;
*/ */
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "DeviceDetails", propOrder = { @XmlType(name = "DeviceDetails", propOrder = {
"value" "properties"
}) })
public class DeviceDetails { public class DeviceDetails {
@XmlValue
protected String value;
@XmlAttribute(name = "table-id") @XmlAttribute(name = "table-id")
protected String tableId; protected String tableId;
@XmlElement(name = "Properties", required = true)
protected Properties properties;
/** /**
* Gets the value of the value property. * Gets the value of the tableId property.
* *
* @return * @return
* possible object is * possible object is
* {@link String } * {@link String }
* *
*/ */
public String getValue() { public String getTableId() {
return value; return tableId;
} }
/** /**
* Sets the value of the value property. * Sets the value of the tableId property.
* *
* @param value * @param value
* allowed object is * allowed object is
* {@link String } * {@link String }
* *
*/ */
public void setValue(String value) { public void setTableId(String value) {
this.value = value; this.tableId = value;
} }
/** /**
* Gets the value of the tableId property. * Gets the value of the properties property.
* *
* @return * @return
* possible object is * possible object is
* {@link String } * {@link Properties }
* *
*/ */
public String getTableId() { public Properties getProperties() {
return tableId; return properties;
} }
/** /**
* Sets the value of the tableId property. * Sets the value of the properties property.
* *
* @param value * @param value
* allowed object is * allowed object is
* {@link String } * {@link Properties }
* *
*/ */
public void setTableId(String value) { public void setProperties(Properties value) {
this.tableId = value; this.properties = value;
} }
} }

@ -0,0 +1,76 @@
package org.wso2.carbon.device.mgt.extensions.device.type.deployer.config;
import java.util.ArrayList;
import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
/**
* <p>Java class for Properties complex type.
*
* <p>The following schema fragment specifies the expected content contained within this class.
*
* <pre>
* &lt;complexType name="Properties">
* &lt;complexContent>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* &lt;sequence>
* &lt;element name="Property" maxOccurs="unbounded" minOccurs="0">
* &lt;simpleType>
* &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
* &lt;enumeration value="attr1"/>
* &lt;enumeration value="attr2"/>
* &lt;/restriction>
* &lt;/simpleType>
* &lt;/element>
* &lt;/sequence>
* &lt;/restriction>
* &lt;/complexContent>
* &lt;/complexType>
* </pre>
*
*
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "Properties", propOrder = {
"property"
})
public class Properties {
@XmlElement(name = "Property")
protected List<String> property;
/**
* Gets the value of the property property.
*
* <p>
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
* This is why there is not a <CODE>set</CODE> method for the property property.
*
* <p>
* For example, to add a new item, do as follows:
* <pre>
* getProperty().add(newItem);
* </pre>
*
*
* <p>
* Objects of the following type(s) are allowed in the list
* {@link String }
*
*
*/
public List<String> getProperty() {
if (property == null) {
property = new ArrayList<String>();
}
return this.property;
}
}

@ -155,6 +155,11 @@ public class DeviceTypeManager implements DeviceManager {
} finally { } finally {
PrivilegedCarbonContext.endTenantFlow(); PrivilegedCarbonContext.endTenantFlow();
} }
} else {
if (deviceDetails.getProperties() != null && deviceDetails.getProperties().getProperty() != null
&& deviceDetails.getProperties().getProperty().size() > 0 ) {
deviceTypePluginDAOManager = new DeviceTypePluginDAOManager(deviceType, deviceDetails);
}
} }
} }
} }

@ -19,17 +19,25 @@
package org.wso2.carbon.device.mgt.extensions.device.type.deployer.template.dao; package org.wso2.carbon.device.mgt.extensions.device.type.deployer.template.dao;
import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.DeviceDetails;
public class DeviceTypePluginDAOManager { public class DeviceTypePluginDAOManager {
private DeviceTypePluginDAO deviceTypePluginDAO; private PluginDAO deviceTypePluginDAO;
private DeviceTypeDAOHandler deviceTypeDAOHandler; private DeviceTypeDAOHandler deviceTypeDAOHandler;
private static String DEFAULT_DATASOURCE_NAME = "jdbc/DM_DS";
public DeviceTypePluginDAOManager(String datasourceName, DeviceDAODefinition deviceDAODefinition) { public DeviceTypePluginDAOManager(String datasourceName, DeviceDAODefinition deviceDAODefinition) {
deviceTypeDAOHandler = new DeviceTypeDAOHandler(datasourceName); deviceTypeDAOHandler = new DeviceTypeDAOHandler(datasourceName);
deviceTypePluginDAO = new DeviceTypePluginDAO(deviceDAODefinition, deviceTypeDAOHandler); deviceTypePluginDAO = new PerDeviceTypePluginDAOImpl(deviceDAODefinition, deviceTypeDAOHandler);
}
public DeviceTypePluginDAOManager(String deviceType, DeviceDetails deviceDetails) {
deviceTypeDAOHandler = new DeviceTypeDAOHandler(DEFAULT_DATASOURCE_NAME);
deviceTypePluginDAO = new PropertyBasedPluginDAOImpl(deviceDetails, deviceTypeDAOHandler, deviceType);
} }
public DeviceTypePluginDAO getDeviceDAO() { public PluginDAO getDeviceDAO() {
return deviceTypePluginDAO; return deviceTypePluginDAO;
} }

@ -36,9 +36,9 @@ import java.util.List;
* Implements CRUD for Devices. This holds the generic implementation. An instance of this will be created for * Implements CRUD for Devices. This holds the generic implementation. An instance of this will be created for
* each device type. * each device type.
*/ */
public class DeviceTypePluginDAO { public class PerDeviceTypePluginDAOImpl implements PluginDAO{
private static final Log log = LogFactory.getLog(DeviceTypePluginDAO.class); private static final Log log = LogFactory.getLog(PerDeviceTypePluginDAOImpl.class);
private DeviceTypeDAOHandler deviceTypeDAOHandler; private DeviceTypeDAOHandler deviceTypeDAOHandler;
private DeviceDAODefinition deviceDAODefinition; private DeviceDAODefinition deviceDAODefinition;
private String selectDBQueryForGetDevice; private String selectDBQueryForGetDevice;
@ -47,8 +47,8 @@ public class DeviceTypePluginDAO {
private String deleteDBQueryToRemoveDevicd; private String deleteDBQueryToRemoveDevicd;
private String selectDBQueryToGetAllDevice; private String selectDBQueryToGetAllDevice;
public DeviceTypePluginDAO(DeviceDAODefinition deviceDAODefinition, public PerDeviceTypePluginDAOImpl(DeviceDAODefinition deviceDAODefinition,
DeviceTypeDAOHandler deviceTypeDAOHandler) { DeviceTypeDAOHandler deviceTypeDAOHandler) {
this.deviceTypeDAOHandler = deviceTypeDAOHandler; this.deviceTypeDAOHandler = deviceTypeDAOHandler;
this.deviceDAODefinition = deviceDAODefinition; this.deviceDAODefinition = deviceDAODefinition;
initializeDbQueries(); initializeDbQueries();

@ -0,0 +1,36 @@
/*
* Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* WSO2 Inc. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.device.mgt.extensions.device.type.deployer.template.dao;
import org.wso2.carbon.device.mgt.common.Device;
import org.wso2.carbon.device.mgt.extensions.device.type.deployer.exception.DeviceTypeMgtPluginException;
import java.util.List;
public interface PluginDAO {
Device getDevice(String deviceId) throws DeviceTypeMgtPluginException;
boolean addDevice(Device device) throws DeviceTypeMgtPluginException;
boolean updateDevice(Device device) throws DeviceTypeMgtPluginException;
boolean deleteDevice(String deviceId) throws DeviceTypeMgtPluginException;
List<Device> getAllDevices() throws DeviceTypeMgtPluginException;
}

@ -0,0 +1,239 @@
/*
* Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
*
* WSO2 Inc. licenses this file to you under the Apache License,
* Version 2.0 (the "License"); you may not use this file except
* in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.wso2.carbon.device.mgt.extensions.device.type.deployer.template.dao;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.device.mgt.common.Device;
import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.DeviceDetails;
import org.wso2.carbon.device.mgt.extensions.device.type.deployer.exception.DeviceTypeMgtPluginException;
import org.wso2.carbon.device.mgt.extensions.device.type.deployer.template.util.DeviceTypeUtils;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* Implements CRUD for Devices. This holds the generic implementation. An instance of this will be created for
* each device type.
*/
public class PropertyBasedPluginDAOImpl implements PluginDAO {
private static final Log log = LogFactory.getLog(PropertyBasedPluginDAOImpl.class);
private DeviceTypeDAOHandler deviceTypeDAOHandler;
private List<String> deviceProps;
private String deviceType;
private static final String PROPERTY_KEY_COLUMN_NAME = "PROPERTY_NAME";
private static final String PROPERTY_VALUE_COLUMN_NAME = "PROPERTY_VALUE";
public PropertyBasedPluginDAOImpl(DeviceDetails deviceDetails,
DeviceTypeDAOHandler deviceTypeDAOHandler, String deviceType) {
this.deviceTypeDAOHandler = deviceTypeDAOHandler;
this.deviceProps = deviceDetails.getProperties().getProperty();
this.deviceType = deviceType;
}
public Device getDevice(String deviceId) throws DeviceTypeMgtPluginException {
Connection conn = null;
PreparedStatement stmt = null;
Device device = null;
ResultSet resultSet = null;
try {
conn = deviceTypeDAOHandler.getConnection();
stmt = conn.prepareStatement(
"SELECT * FROM DM_DEVICE_PROPERTIES WHERE DEVICE_TYPE_NAME = ? AND DEVICE_IDENTIFICATION = ?");
stmt.setString(1, deviceType);
stmt.setString(2, deviceId);
resultSet = stmt.executeQuery();
device = new Device();
device.setDeviceIdentifier(deviceId);
device.setType(deviceType);
List<Device.Property> properties = new ArrayList<>();
while (resultSet.next()) {
Device.Property property = new Device.Property();
property.setName(resultSet.getString(PROPERTY_KEY_COLUMN_NAME));
property.setValue(resultSet.getString(PROPERTY_VALUE_COLUMN_NAME));
properties.add(property);
}
device.setProperties(properties);
} catch (SQLException e) {
String msg = "Error occurred while fetching device : '" + deviceId + "' type " + deviceType;
log.error(msg, e);
throw new DeviceTypeMgtPluginException(msg, e);
} finally {
DeviceTypeUtils.cleanupResources(stmt, resultSet);
deviceTypeDAOHandler.closeConnection();
}
return device;
}
public boolean addDevice(Device device) throws DeviceTypeMgtPluginException {
boolean status = false;
Connection conn = null;
PreparedStatement stmt = null;
try {
conn = deviceTypeDAOHandler.getConnection();
stmt = conn.prepareStatement(
"INSERT INTO DM_DEVICE_PROPERTIES(DEVICE_TYPE_NAME, DEVICE_IDENTIFICATION, PROPERTY_NAME, " +
"PROPERTY_VALUE) VALUES (?, ?, ?, ?)");
for (String propertyKey : deviceProps) {
stmt.setString(1, deviceType);
stmt.setString(2, device.getDeviceIdentifier());
stmt.setString(3, propertyKey);
stmt.setString(4, getPropertyValue(device.getProperties(), propertyKey));
stmt.addBatch();
}
stmt.executeBatch();
status = true;
} catch (SQLException e) {
String msg = "Error occurred while adding the device '" +
device.getDeviceIdentifier() + "' to the type " + deviceType + " db.";
log.error(msg, e);
throw new DeviceTypeMgtPluginException(msg, e);
} finally {
DeviceTypeUtils.cleanupResources(stmt, null);
}
return status;
}
public boolean updateDevice(Device device) throws DeviceTypeMgtPluginException {
boolean status = false;
Connection conn = null;
PreparedStatement stmt = null;
try {
conn = deviceTypeDAOHandler.getConnection();
stmt = conn.prepareStatement(
"UPDATE DM_DEVICE_PROPERTIES SET PROPERTY_VALUE = ? WHERE DEVICE_TYPE_NAME = ? AND " +
"DEVICE_IDENTIFICATION = ? AND PROPERTY_NAME = ?");
for (Device.Property property : device.getProperties()) {
stmt.setString(1, getPropertyValue(device.getProperties(), property.getValue()));
stmt.setString(1, deviceType);
stmt.setString(2, device.getDeviceIdentifier());
stmt.setString(3, property.getName());
stmt.addBatch();
}
stmt.executeBatch();
int rows = stmt.executeUpdate();
if (rows > 0) {
status = true;
if (log.isDebugEnabled()) {
log.debug("device " + device.getDeviceIdentifier() + " data has been modified.");
}
}
} catch (SQLException e) {
String msg = "Error occurred while modifying the device '" +
device.getDeviceIdentifier() + "' data on" + deviceType;
log.error(msg, e);
throw new DeviceTypeMgtPluginException(msg, e);
} finally {
DeviceTypeUtils.cleanupResources(stmt, null);
}
return status;
}
public boolean deleteDevice(String deviceId) throws DeviceTypeMgtPluginException {
boolean status = false;
Connection conn = null;
PreparedStatement stmt = null;
try {
conn = deviceTypeDAOHandler.getConnection();
stmt = conn.prepareStatement("DELETE FROM DM_DEVICE_PROPERTIES WHERE DEVICE_TYPE_NAME = ? " +
"AND DEVICE_IDENTIFICATION = ?");
stmt.setString(1, deviceType);
stmt.setString(2, deviceId);
int rows = stmt.executeUpdate();
if (rows > 0) {
status = true;
if (log.isDebugEnabled()) {
log.debug("device " + deviceId + " data has deleted from the " +
deviceType + " table.");
}
}
} catch (SQLException e) {
String msg =
"Error occurred while deleting " + deviceType + " device " + deviceId;
log.error(msg, e);
throw new DeviceTypeMgtPluginException(msg, e);
} finally {
DeviceTypeUtils.cleanupResources(stmt, null);
}
return status;
}
public List<Device> getAllDevices() throws DeviceTypeMgtPluginException {
Connection conn;
PreparedStatement stmt = null;
ResultSet resultSet = null;
Map<String, Device> deviceMap = new HashMap<>();
try {
conn = deviceTypeDAOHandler.getConnection();
stmt = conn.prepareStatement("SELECT DEVICE_IDENTIFICATION, PROPERTY_NAME" +
", PROPERTY_VALUE FROM DM_DEVICE_PROPERTIES WHERE DEVICE_TYPE_NAME = ?");
stmt.setString(1, deviceType);
resultSet = stmt.executeQuery();
while (resultSet.next()) {
String deviceId = resultSet.getString("DEVICE_IDENTIFICATION");
Device deviceInMap = deviceMap.get(deviceId);
if (deviceInMap == null) {
deviceInMap = new Device();
deviceInMap.setDeviceIdentifier(deviceId);
deviceInMap.setType(deviceType);
List<Device.Property> properties = new ArrayList<>();
deviceInMap.setProperties(properties);
deviceMap.put(deviceId, deviceInMap);
}
Device.Property prop = new Device.Property();
prop.setName(resultSet.getString(PROPERTY_KEY_COLUMN_NAME));
prop.setName(resultSet.getString(PROPERTY_VALUE_COLUMN_NAME));
deviceInMap.getProperties().add(prop);
}
if (log.isDebugEnabled()) {
log.debug(
"All device details have fetched from " + deviceType + " table.");
}
return Arrays.asList((Device[])deviceMap.values().toArray());
} catch (SQLException e) {
String msg =
"Error occurred while fetching all " + deviceType + " device data'";
log.error(msg, e);
throw new DeviceTypeMgtPluginException(msg, e);
} finally {
DeviceTypeUtils.cleanupResources(stmt, resultSet);
deviceTypeDAOHandler.closeConnection();
}
}
private String getPropertyValue(List<Device.Property> properties, String propertyName) {
for (Device.Property property : properties) {
if (property.getName() != null && property.getName().equals(propertyName)) {
return property.getValue();
}
}
return null;
}
}

@ -19,7 +19,16 @@
--> -->
<DeviceTypeConfiguration name="samples"> <DeviceTypeConfiguration name="samples">
<DeviceDetails table-id="SAMPLE_DEVICE_1"/> <!--IF SAVE ON PREDEFINED TABLE-->
<!--<DeviceDetails table-id="SAMPLE_DEVICE_1"/>-->
<!--ELSE SAVE ON EXISTING TABLE-->
<DeviceDetails>
<Properties>
<Property>attr1</Property>
<Property>attr2</Property>
</Properties>
</DeviceDetails>
<!--END-->
<Features> <Features>
<Feature code="abc"> <Feature code="abc">
@ -38,28 +47,28 @@
<Claimable enabled="true"/> <Claimable enabled="true"/>
<Sensors table-id="SAMPLE_DEVICE_2"> <!--<Sensors table-id="SAMPLE_DEVICE_2">-->
<Sensor code="CPU_Temperature"> <!--<Sensor code="CPU_Temperature">-->
<Name>temperature sensor fitted</Name> <!--<Name>temperature sensor fitted</Name>-->
<StreamDefinition>org.wso2.temperature.stream</StreamDefinition> <!--<StreamDefinition>org.wso2.temperature.stream</StreamDefinition>-->
<Description>this is a sensor</Description> <!--<Description>this is a sensor</Description>-->
<SensorStaticProperties> <!--<SensorStaticProperties>-->
<Property name="unit">celcius</Property> <!--<Property name="unit">celcius</Property>-->
<Property name="model_number">atmeggga11234</Property> <!--<Property name="model_number">atmeggga11234</Property>-->
</SensorStaticProperties> <!--</SensorStaticProperties>-->
</Sensor> <!--</Sensor>-->
<Sensor code="DHT11_Temperature"> <!--<Sensor code="DHT11_Temperature">-->
<Name>temperature sensor fitted</Name> <!--<Name>temperature sensor fitted</Name>-->
<StreamDefinition>org.wso2.temperature.stream</StreamDefinition> <!--<StreamDefinition>org.wso2.temperature.stream</StreamDefinition>-->
<Description>this is a sensor</Description> <!--<Description>this is a sensor</Description>-->
<SensorStaticProperties> <!--<SensorStaticProperties>-->
<Property name="unit">celcius</Property> <!--<Property name="unit">celcius</Property>-->
</SensorStaticProperties> <!--</SensorStaticProperties>-->
<SensorDynamicProperties> <!--<SensorDynamicProperties>-->
<Property name="model_number"/> <!--<Property name="model_number"/>-->
</SensorDynamicProperties> <!--</SensorDynamicProperties>-->
</Sensor> <!--</Sensor>-->
</Sensors> <!--</Sensors>-->
<ProvisioningConfig> <ProvisioningConfig>
<SharedWithAllTenants>false</SharedWithAllTenants> <SharedWithAllTenants>false</SharedWithAllTenants>

@ -39,6 +39,14 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE (
CONSTRAINT uk_DM_DEVICE UNIQUE (NAME, DEVICE_TYPE_ID, DEVICE_IDENTIFICATION, TENANT_ID) CONSTRAINT uk_DM_DEVICE UNIQUE (NAME, DEVICE_TYPE_ID, DEVICE_IDENTIFICATION, TENANT_ID)
); );
CREATE TABLE IF NOT EXISTS DM_DEVICE_PROPERTIES (
DEVICE_TYPE_NAME VARCHAR(300) NOT NULL,
DEVICE_IDENTIFICATION VARCHAR(300) NOT NULL,
PROPERTY_NAME VARCHAR(100) DEFAULT 0,
PROPERTY_VALUE VARCHAR(100) DEFAULT NULL,
PRIMARY KEY (DEVICE_TYPE_NAME, DEVICE_IDENTIFICATION, PROPERTY_NAME)
);
CREATE TABLE IF NOT EXISTS DM_DEVICE_GROUP_MAP ( CREATE TABLE IF NOT EXISTS DM_DEVICE_GROUP_MAP (
ID INTEGER AUTO_INCREMENT NOT NULL, ID INTEGER AUTO_INCREMENT NOT NULL,
DEVICE_ID INTEGER DEFAULT NULL, DEVICE_ID INTEGER DEFAULT NULL,

@ -52,6 +52,15 @@ CREATE TABLE DM_DEVICE (
REFERENCES DM_DEVICE_TYPE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION REFERENCES DM_DEVICE_TYPE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
); );
IF NOT EXISTS (SELECT * FROM SYS.OBJECTS WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[DM_DEVICE_PROPERTIES]') AND TYPE IN (N'U'))
CREATE TABLE IF NOT EXISTS DM_DEVICE_PROPERTIES (
DEVICE_TYPE_NAME VARCHAR(300) NOT NULL,
DEVICE_IDENTIFICATION VARCHAR(300) NOT NULL,
PROPERTY_NAME VARCHAR(100) DEFAULT 0,
PROPERTY_VALUE VARCHAR(100) DEFAULT NULL,
PRIMARY KEY (DEVICE_TYPE_NAME, DEVICE_IDENTIFICATION, PROPERTY_NAME)
);
IF NOT EXISTS(SELECT * IF NOT EXISTS(SELECT *
FROM SYS.OBJECTS FROM SYS.OBJECTS
WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[DM_DEVICE_GROUP_MAP]') AND TYPE IN (N'U')) WHERE OBJECT_ID = OBJECT_ID(N'[DBO].[DM_DEVICE_GROUP_MAP]') AND TYPE IN (N'U'))

@ -46,6 +46,14 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE (
CREATE INDEX IDX_DM_DEVICE ON DM_DEVICE(TENANT_ID, DEVICE_TYPE_ID); CREATE INDEX IDX_DM_DEVICE ON DM_DEVICE(TENANT_ID, DEVICE_TYPE_ID);
CREATE TABLE IF NOT EXISTS DM_DEVICE_PROPERTIES (
DEVICE_TYPE_NAME VARCHAR(300) NOT NULL,
DEVICE_IDENTIFICATION VARCHAR(300) NOT NULL,
PROPERTY_NAME VARCHAR(100) DEFAULT 0,
PROPERTY_VALUE VARCHAR(100) DEFAULT NULL,
PRIMARY KEY (DEVICE_TYPE_NAME, DEVICE_IDENTIFICATION, PROPERTY_NAME)
)ENGINE = InnoDB;
CREATE TABLE IF NOT EXISTS DM_DEVICE_GROUP_MAP ( CREATE TABLE IF NOT EXISTS DM_DEVICE_GROUP_MAP (
ID INTEGER AUTO_INCREMENT NOT NULL, ID INTEGER AUTO_INCREMENT NOT NULL,
DEVICE_ID INTEGER DEFAULT NULL, DEVICE_ID INTEGER DEFAULT NULL,

@ -97,6 +97,16 @@ WHEN (NEW.ID IS NULL)
END; END;
/ /
CREATE TABLE IF NOT EXISTS DM_DEVICE_PROPERTIES (
DEVICE_TYPE_NAME VARCHAR2(300) NOT NULL,
DEVICE_IDENTIFICATION VARCHAR2(300) NOT NULL,
PROPERTY_NAME VARCHAR2(100) DEFAULT 0,
PROPERTY_VALUE VARCHAR2(100) DEFAULT NULL,
CONSTRAINT PK_DM_DEVICE_PROPERTY PRIMARY KEY (DEVICE_TYPE_NAME, DEVICE_IDENTIFICATION, PROPERTY_NAME)
)
/
CREATE TABLE DM_DEVICE_GROUP_MAP ( CREATE TABLE DM_DEVICE_GROUP_MAP (
ID NUMBER(10) NOT NULL, ID NUMBER(10) NOT NULL,
DEVICE_ID NUMBER(10) DEFAULT NULL, DEVICE_ID NUMBER(10) DEFAULT NULL,

@ -38,6 +38,14 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE (
REFERENCES DM_DEVICE_TYPE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION REFERENCES DM_DEVICE_TYPE (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
); );
CREATE TABLE IF NOT EXISTS DM_DEVICE_PROPERTIES (
DEVICE_TYPE_NAME VARCHAR(300) NOT NULL,
DEVICE_IDENTIFICATION VARCHAR(300) NOT NULL,
PROPERTY_NAME VARCHAR(100) DEFAULT 0,
PROPERTY_VALUE VARCHAR(100) DEFAULT NULL,
PRIMARY KEY (DEVICE_TYPE_NAME, DEVICE_IDENTIFICATION, PROPERTY_NAME)
);
CREATE INDEX IDX_DM_DEVICE ON DM_DEVICE(TENANT_ID, DEVICE_TYPE_ID); CREATE INDEX IDX_DM_DEVICE ON DM_DEVICE(TENANT_ID, DEVICE_TYPE_ID);
CREATE TABLE IF NOT EXISTS DM_DEVICE_GROUP_MAP ( CREATE TABLE IF NOT EXISTS DM_DEVICE_GROUP_MAP (

Loading…
Cancel
Save