Fix sql issues

pull/335/head
Pasindu Rupasinghe 10 months ago
parent 1a9782c3f3
commit 14554ba161

@ -65,7 +65,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE
ID INTEGER auto_increment NOT NULL, ID INTEGER auto_increment NOT NULL,
DESCRIPTION TEXT DEFAULT NULL, DESCRIPTION TEXT DEFAULT NULL,
NAME VARCHAR(100) DEFAULT NULL, NAME VARCHAR(100) DEFAULT NULL,
DEVICE_TYPE_ID INT(11) DEFAULT NULL, DEVICE_TYPE_ID INT DEFAULT NULL,
DEVICE_IDENTIFICATION VARCHAR(300) DEFAULT NULL, DEVICE_IDENTIFICATION VARCHAR(300) DEFAULT NULL,
LAST_UPDATED_TIMESTAMP TIMESTAMP NOT NULL, LAST_UPDATED_TIMESTAMP TIMESTAMP NOT NULL,
TENANT_ID INTEGER DEFAULT 0, TENANT_ID INTEGER DEFAULT 0,
@ -209,17 +209,17 @@ CREATE TABLE IF NOT EXISTS DM_PROFILE
CREATE TABLE IF NOT EXISTS DM_POLICY CREATE TABLE IF NOT EXISTS DM_POLICY
( (
ID INT(11) NOT NULL AUTO_INCREMENT, ID INT NOT NULL AUTO_INCREMENT,
NAME VARCHAR(45) DEFAULT NULL, NAME VARCHAR(45) DEFAULT NULL,
DESCRIPTION VARCHAR(1000) NULL, DESCRIPTION VARCHAR(1000) NULL,
PAYLOAD_VERSION VARCHAR(45) NULL, PAYLOAD_VERSION VARCHAR(45) NULL,
TENANT_ID INT(11) NOT NULL, TENANT_ID INT NOT NULL,
PROFILE_ID INT(11) NOT NULL, PROFILE_ID INT NOT NULL,
OWNERSHIP_TYPE VARCHAR(45) NULL, OWNERSHIP_TYPE VARCHAR(45) NULL,
COMPLIANCE VARCHAR(100) NULL, COMPLIANCE VARCHAR(100) NULL,
PRIORITY INT NOT NULL, PRIORITY INT NOT NULL,
ACTIVE INT(2) NOT NULL, ACTIVE INT NOT NULL,
UPDATED INT(1) NULL, UPDATED INT NULL,
POLICY_TYPE VARCHAR(45) NULL, POLICY_TYPE VARCHAR(45) NULL,
PRIMARY KEY (ID), PRIMARY KEY (ID),
CONSTRAINT FK_DM_PROFILE_DM_POLICY CONSTRAINT FK_DM_PROFILE_DM_POLICY
@ -231,11 +231,11 @@ CREATE TABLE IF NOT EXISTS DM_POLICY
CREATE TABLE IF NOT EXISTS DM_DEVICE_POLICY CREATE TABLE IF NOT EXISTS DM_DEVICE_POLICY
( (
ID INT(11) NOT NULL AUTO_INCREMENT, ID INT NOT NULL AUTO_INCREMENT,
DEVICE_ID INT(11) NOT NULL, DEVICE_ID INT NOT NULL,
ENROLMENT_ID INT(11) NOT NULL, ENROLMENT_ID INT NOT NULL,
DEVICE BLOB NOT NULL, DEVICE BLOB NOT NULL,
POLICY_ID INT(11) NOT NULL, POLICY_ID INT NOT NULL,
PRIMARY KEY (ID), PRIMARY KEY (ID),
CONSTRAINT FK_POLICY_DEVICE_POLICY CONSTRAINT FK_POLICY_DEVICE_POLICY
FOREIGN KEY (POLICY_ID) FOREIGN KEY (POLICY_ID)
@ -251,9 +251,9 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_POLICY
CREATE TABLE IF NOT EXISTS DM_DEVICE_TYPE_POLICY CREATE TABLE IF NOT EXISTS DM_DEVICE_TYPE_POLICY
( (
ID INT(11) NOT NULL, ID INT NOT NULL,
DEVICE_TYPE VARCHAR(300) NOT NULL, DEVICE_TYPE VARCHAR(300) NOT NULL,
POLICY_ID INT(11) NOT NULL, POLICY_ID INT NOT NULL,
PRIMARY KEY (ID), PRIMARY KEY (ID),
CONSTRAINT FK_DEVICE_TYPE_POLICY CONSTRAINT FK_DEVICE_TYPE_POLICY
FOREIGN KEY (POLICY_ID) FOREIGN KEY (POLICY_ID)
@ -264,11 +264,11 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_TYPE_POLICY
CREATE TABLE IF NOT EXISTS DM_PROFILE_FEATURES CREATE TABLE IF NOT EXISTS DM_PROFILE_FEATURES
( (
ID INT(11) NOT NULL AUTO_INCREMENT, ID INT NOT NULL AUTO_INCREMENT,
PROFILE_ID INT(11) NOT NULL, PROFILE_ID INT NOT NULL,
FEATURE_CODE VARCHAR(100) NOT NULL, FEATURE_CODE VARCHAR(100) NOT NULL,
DEVICE_TYPE VARCHAR(300) NOT NULL, DEVICE_TYPE VARCHAR(300) NOT NULL,
TENANT_ID INT(11) NOT NULL, TENANT_ID INT NOT NULL,
CONTENT BLOB NULL DEFAULT NULL, CONTENT BLOB NULL DEFAULT NULL,
PRIMARY KEY (ID), PRIMARY KEY (ID),
CONSTRAINT FK_DM_PROFILE_DM_POLICY_FEATURES CONSTRAINT FK_DM_PROFILE_DM_POLICY_FEATURES
@ -280,11 +280,11 @@ CREATE TABLE IF NOT EXISTS DM_PROFILE_FEATURES
CREATE TABLE IF NOT EXISTS DM_POLICY_CORRECTIVE_ACTION CREATE TABLE IF NOT EXISTS DM_POLICY_CORRECTIVE_ACTION
( (
ID INT(11) NOT NULL AUTO_INCREMENT, ID INT NOT NULL AUTO_INCREMENT,
ACTION_TYPE VARCHAR(45) NOT NULL, ACTION_TYPE VARCHAR(45) NOT NULL,
CORRECTIVE_POLICY_ID INT(11) DEFAULT NULL, CORRECTIVE_POLICY_ID INT DEFAULT NULL,
POLICY_ID INT(11) NOT NULL, POLICY_ID INT NOT NULL,
FEATURE_ID INT(11) DEFAULT NULL, FEATURE_ID INT DEFAULT NULL,
IS_REACTIVE BOOLEAN NOT NULL DEFAULT FALSE, IS_REACTIVE BOOLEAN NOT NULL DEFAULT FALSE,
PRIMARY KEY (ID), PRIMARY KEY (ID),
CONSTRAINT FK_DM_POLICY_DM_POLICY_CORRECTIVE_ACTION CONSTRAINT FK_DM_POLICY_DM_POLICY_CORRECTIVE_ACTION
@ -296,9 +296,9 @@ CREATE TABLE IF NOT EXISTS DM_POLICY_CORRECTIVE_ACTION
CREATE TABLE IF NOT EXISTS DM_ROLE_POLICY CREATE TABLE IF NOT EXISTS DM_ROLE_POLICY
( (
ID INT(11) NOT NULL AUTO_INCREMENT, ID INT NOT NULL AUTO_INCREMENT,
ROLE_NAME VARCHAR(45) NOT NULL, ROLE_NAME VARCHAR(45) NOT NULL,
POLICY_ID INT(11) NOT NULL, POLICY_ID INT NOT NULL,
PRIMARY KEY (ID), PRIMARY KEY (ID),
CONSTRAINT FK_ROLE_POLICY_POLICY CONSTRAINT FK_ROLE_POLICY_POLICY
FOREIGN KEY (POLICY_ID) FOREIGN KEY (POLICY_ID)
@ -324,11 +324,11 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_POLICY_APPLIED
( (
ID INT NOT NULL AUTO_INCREMENT, ID INT NOT NULL AUTO_INCREMENT,
DEVICE_ID INT NOT NULL, DEVICE_ID INT NOT NULL,
ENROLMENT_ID INT(11) NOT NULL, ENROLMENT_ID INT NOT NULL,
POLICY_ID INT NOT NULL, POLICY_ID INT NOT NULL,
POLICY_CONTENT BLOB NULL, POLICY_CONTENT BLOB NULL,
TENANT_ID INT NOT NULL, TENANT_ID INT NOT NULL,
APPLIED TINYINT(1) NULL, APPLIED TINYINT NULL,
CREATED_TIME TIMESTAMP NULL, CREATED_TIME TIMESTAMP NULL,
UPDATED_TIME TIMESTAMP NULL, UPDATED_TIME TIMESTAMP NULL,
APPLIED_TIME TIMESTAMP NULL, APPLIED_TIME TIMESTAMP NULL,
@ -385,7 +385,7 @@ CREATE TABLE IF NOT EXISTS DM_POLICY_COMPLIANCE_STATUS
( (
ID INT NOT NULL AUTO_INCREMENT, ID INT NOT NULL AUTO_INCREMENT,
DEVICE_ID INT NOT NULL, DEVICE_ID INT NOT NULL,
ENROLMENT_ID INT(11) NOT NULL, ENROLMENT_ID INT NOT NULL,
POLICY_ID INT NOT NULL, POLICY_ID INT NOT NULL,
TENANT_ID INT NOT NULL, TENANT_ID INT NOT NULL,
STATUS INT NULL, STATUS INT NULL,
@ -401,7 +401,7 @@ CREATE TABLE IF NOT EXISTS DM_POLICY_CHANGE_MGT
ID INT NOT NULL AUTO_INCREMENT, ID INT NOT NULL AUTO_INCREMENT,
POLICY_ID INT NOT NULL, POLICY_ID INT NOT NULL,
DEVICE_TYPE VARCHAR(300) NOT NULL, DEVICE_TYPE VARCHAR(300) NOT NULL,
TENANT_ID INT(11) NOT NULL, TENANT_ID INT NOT NULL,
PRIMARY KEY (ID) PRIMARY KEY (ID)
); );
@ -432,7 +432,7 @@ CREATE TABLE IF NOT EXISTS DM_APPLICATION
LOCATION_URL VARCHAR(100) DEFAULT NULL, LOCATION_URL VARCHAR(100) DEFAULT NULL,
IMAGE_URL VARCHAR(100) DEFAULT NULL, IMAGE_URL VARCHAR(100) DEFAULT NULL,
APP_PROPERTIES BLOB NULL, APP_PROPERTIES BLOB NULL,
MEMORY_USAGE INTEGER(10) NULL, MEMORY_USAGE INTEGER NULL,
IS_ACTIVE BOOLEAN NOT NULL DEFAULT FALSE, IS_ACTIVE BOOLEAN NOT NULL DEFAULT FALSE,
DEVICE_ID INTEGER NOT NULL, DEVICE_ID INTEGER NOT NULL,
ENROLMENT_ID INTEGER NOT NULL, ENROLMENT_ID INTEGER NOT NULL,
@ -504,7 +504,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_LOCATION
STATE VARCHAR(45) NULL, STATE VARCHAR(45) NULL,
COUNTRY VARCHAR(45) NULL, COUNTRY VARCHAR(45) NULL,
GEO_HASH VARCHAR(45) NULL, GEO_HASH VARCHAR(45) NULL,
UPDATE_TIMESTAMP BIGINT(15) NOT NULL, UPDATE_TIMESTAMP BIGINT NOT NULL,
ALTITUDE DOUBLE NULL, ALTITUDE DOUBLE NULL,
SPEED FLOAT NULL, SPEED FLOAT NULL,
BEARING FLOAT NULL, BEARING FLOAT NULL,
@ -542,8 +542,8 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_DETAIL
CPU_USAGE DECIMAL(5) NULL, CPU_USAGE DECIMAL(5) NULL,
TOTAL_RAM_MEMORY DECIMAL(30, 3) NULL, TOTAL_RAM_MEMORY DECIMAL(30, 3) NULL,
AVAILABLE_RAM_MEMORY DECIMAL(30, 3) NULL, AVAILABLE_RAM_MEMORY DECIMAL(30, 3) NULL,
PLUGGED_IN INT(1) NULL, PLUGGED_IN INT NULL,
UPDATE_TIMESTAMP BIGINT(15) NOT NULL, UPDATE_TIMESTAMP BIGINT NOT NULL,
PRIMARY KEY (ID), PRIMARY KEY (ID),
CONSTRAINT FK_DM_DEVICE_DETAILS_DEVICE CONSTRAINT FK_DM_DEVICE_DETAILS_DEVICE
FOREIGN KEY (DEVICE_ID) FOREIGN KEY (DEVICE_ID)
@ -570,7 +570,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_HISTORY_LAST_SEVEN_DAYS
LONGITUDE DOUBLE NULL, LONGITUDE DOUBLE NULL,
SPEED FLOAT NULL, SPEED FLOAT NULL,
HEADING FLOAT NULL, HEADING FLOAT NULL,
TIMESTAMP BIGINT(15) NOT NULL, TIMESTAMP BIGINT NOT NULL,
GEO_HASH VARCHAR(45) NULL, GEO_HASH VARCHAR(45) NULL,
DEVICE_OWNER VARCHAR(45) NULL, DEVICE_OWNER VARCHAR(45) NULL,
DEVICE_ALTITUDE DOUBLE NULL, DEVICE_ALTITUDE DOUBLE NULL,
@ -876,8 +876,8 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_ORGANIZATION
( (
ORGANIZATION_ID INT NOT NULL AUTO_INCREMENT, ORGANIZATION_ID INT NOT NULL AUTO_INCREMENT,
TENANT_ID INT DEFAULT 0, TENANT_ID INT DEFAULT 0,
DEVICE_ID INT(11) NOT NULL, DEVICE_ID INT NOT NULL,
PARENT_DEVICE_ID INT(11) DEFAULT NULL, PARENT_DEVICE_ID INT DEFAULT NULL,
DEVICE_ORGANIZATION_META TEXT DEFAULT NULL, DEVICE_ORGANIZATION_META TEXT DEFAULT NULL,
LAST_UPDATED_TIMESTAMP TIMESTAMP NOT NULL, LAST_UPDATED_TIMESTAMP TIMESTAMP NOT NULL,
PRIMARY KEY (ORGANIZATION_ID), PRIMARY KEY (ORGANIZATION_ID),

@ -22,8 +22,8 @@
CREATE TABLE IF NOT EXISTS DM_DEVICE_ORGANIZATION ( CREATE TABLE IF NOT EXISTS DM_DEVICE_ORGANIZATION (
ORGANIZATION_ID INT NOT NULL AUTO_INCREMENT, ORGANIZATION_ID INT NOT NULL AUTO_INCREMENT,
TENANT_ID INT DEFAULT 0, TENANT_ID INT DEFAULT 0,
DEVICE_ID INT(11) NOT NULL, DEVICE_ID INT NOT NULL,
PARENT_DEVICE_ID INT(11) DEFAULT NULL, PARENT_DEVICE_ID INT DEFAULT NULL,
DEVICE_ORGANIZATION_META TEXT DEFAULT NULL, DEVICE_ORGANIZATION_META TEXT DEFAULT NULL,
LAST_UPDATED_TIMESTAMP TIMESTAMP NOT NULL, LAST_UPDATED_TIMESTAMP TIMESTAMP NOT NULL,
PRIMARY KEY (ORGANIZATION_ID), PRIMARY KEY (ORGANIZATION_ID),

@ -17,7 +17,7 @@
--> -->
<DataSourceConfig> <DataSourceConfig>
<Url>jdbc:h2:mem:smart-meter-test-db;DB_CLOSE_ON_EXIT=FALSE;MVCC=true</Url> <Url>jdbc:h2:mem:smart-meter-test-db;DB_CLOSE_ON_EXIT=FALSE</Url>
<DriverClassName>org.h2.Driver</DriverClassName> <DriverClassName>org.h2.Driver</DriverClassName>
<User>wso2carbon</User> <User>wso2carbon</User>
<Password>wso2carbon</Password> <Password>wso2carbon</Password>

@ -18,7 +18,7 @@
--> -->
<DataSourceConfig> <DataSourceConfig>
<Url>jdbc:h2:mem:cdm-test-db;DB_CLOSE_ON_EXIT=FALSE;MVCC=true</Url> <Url>jdbc:h2:mem:cdm-test-db;DB_CLOSE_ON_EXIT=FALSE</Url>
<DriverClassName>io.entgra.device.mgt.core.device.mgt.extensions.device.organization.mock.MockJDBCDriver</DriverClassName> <DriverClassName>io.entgra.device.mgt.core.device.mgt.extensions.device.organization.mock.MockJDBCDriver</DriverClassName>
<User>wso2carbon</User> <User>wso2carbon</User>
<Password>wso2carbon</Password> <Password>wso2carbon</Password>

@ -18,7 +18,7 @@
--> -->
<DataSourceConfig> <DataSourceConfig>
<Url>jdbc:h2:mem:nodb-test-db;DB_CLOSE_ON_EXIT=FALSE;MVCC=true</Url> <Url>jdbc:h2:mem:nodb-test-db;DB_CLOSE_ON_EXIT=FALSE</Url>
<DriverClassName>org.h2.Driver</DriverClassName> <DriverClassName>org.h2.Driver</DriverClassName>
<User>wso2carbon</User> <User>wso2carbon</User>
<Password>wso2carbon</Password> <Password>wso2carbon</Password>

@ -18,7 +18,7 @@
--> -->
<DataSourceConfig> <DataSourceConfig>
<Url>jdbc:h2:mem:cdm-test-db;DB_CLOSE_ON_EXIT=FALSE;MVCC=true</Url> <Url>jdbc:h2:mem:cdm-test-db;DB_CLOSE_ON_EXIT=FALSE</Url>
<DriverClassName>org.h2.Driver</DriverClassName> <DriverClassName>org.h2.Driver</DriverClassName>
<User>wso2carbon</User> <User>wso2carbon</User>
<Password>wso2carbon</Password> <Password>wso2carbon</Password>

@ -27,17 +27,18 @@
PRIMARY KEY (`SUB_TYPE_ID`,`DEVICE_TYPE`) PRIMARY KEY (`SUB_TYPE_ID`,`DEVICE_TYPE`)
); );
-- SUB_OPERATION_TEMPLATE TABLE-- -- SUB_OPERATION_TEMPLATE TABLE--
CREATE TABLE SUB_OPERATION_TEMPLATE ( CREATE TABLE IF NOT EXISTS SUB_OPERATION_TEMPLATE (
SUB_OPERATION_TEMPLATE_ID int NOT NULL AUTO_INCREMENT, SUB_OPERATION_TEMPLATE_ID INT NOT NULL AUTO_INCREMENT,
OPERATION_DEFINITION TEXT NOT NULL, OPERATION_DEFINITION TEXT NOT NULL,
OPERATION_CODE varchar(100) NOT NULL, OPERATION_CODE VARCHAR (100) NOT NULL,
SUB_TYPE_ID int NOT NULL, SUB_TYPE_ID INT NOT NULL,
DEVICE_TYPE VARCHAR(25) NOT NULL, DEVICE_TYPE VARCHAR (25) NOT NULL,
CREATE_TIMESTAMP timestamp NULL DEFAULT NULL, CREATE_TIMESTAMP TIMESTAMP NULL DEFAULT NULL,
UPDATE_TIMESTAMP timestamp NULL DEFAULT NULL, UPDATE_TIMESTAMP TIMESTAMP NULL DEFAULT NULL,
PRIMARY KEY (SUB_OPERATION_TEMPLATE_ID), PRIMARY KEY (SUB_OPERATION_TEMPLATE_ID),
UNIQUE KEY SUB_OPERATION_TEMPLATE (SUB_TYPE_ID,OPERATION_CODE, DEVICE_TYPE), UNIQUE (SUB_TYPE_ID,OPERATION_CODE, DEVICE_TYPE),
CONSTRAINT fk_SUB_OPERATION_TEMPLATE_DM_DEVICE_SUB_TYPE FOREIGN KEY (SUB_TYPE_ID, DEVICE_TYPE) REFERENCES DM_DEVICE_SUB_TYPE (SUB_TYPE_ID, DEVICE_TYPE) CONSTRAINT fk_SUB_OPERATION_TEMPLATE_DM_DEVICE_SUB_TYPE FOREIGN KEY (SUB_TYPE_ID, DEVICE_TYPE)
REFERENCES DM_DEVICE_SUB_TYPE (SUB_TYPE_ID, DEVICE_TYPE)
); );
-- ----------------------------------------------------- -- -----------------------------------------------------
-- Sample data for test cases -- Sample data for test cases

@ -846,8 +846,8 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_ORGANIZATION
( (
ORGANIZATION_ID INT NOT NULL AUTO_INCREMENT, ORGANIZATION_ID INT NOT NULL AUTO_INCREMENT,
TENANT_ID INT DEFAULT 0, TENANT_ID INT DEFAULT 0,
DEVICE_ID INT(11) NOT NULL, DEVICE_ID INT NOT NULL,
PARENT_DEVICE_ID INT(11) DEFAULT NULL, PARENT_DEVICE_ID INT DEFAULT NULL,
DEVICE_ORGANIZATION_META TEXT DEFAULT NULL, DEVICE_ORGANIZATION_META TEXT DEFAULT NULL,
LAST_UPDATED_TIMESTAMP TIMESTAMP NOT NULL, LAST_UPDATED_TIMESTAMP TIMESTAMP NOT NULL,
PRIMARY KEY (ORGANIZATION_ID), PRIMARY KEY (ORGANIZATION_ID),

@ -2194,7 +2194,7 @@
<mokito.version>2.23.4</mokito.version> <mokito.version>2.23.4</mokito.version>
<xerces.version>2.8.1.wso2v2</xerces.version> <xerces.version>2.8.1.wso2v2</xerces.version>
<org.wso2.apache.httpcomponents.httpclient.version>4.3.1.wso2v1</org.wso2.apache.httpcomponents.httpclient.version> <org.wso2.apache.httpcomponents.httpclient.version>4.3.1.wso2v1</org.wso2.apache.httpcomponents.httpclient.version>
<orbit.h2.version>2.1.210.wso2v1</orbit.h2.version> <orbit.h2.version>2.1.214.wso2v1</orbit.h2.version>
<securevault.version>1.1.3</securevault.version> <securevault.version>1.1.3</securevault.version>
<pax.logging.api.version>1.11.2</pax.logging.api.version> <pax.logging.api.version>1.11.2</pax.logging.api.version>

Loading…
Cancel
Save