Remove unnecessary files and update DB scripts

apim-is-as-km-with-analytics/mysql/provisioner/db_provisioner.sh

@@ -24,8 +24,6 @@ WORKING_DIRECTORY=/home/vagrant
 echo "Execute the database scripts..."
 mysql -u${DB_USER} -p${DB_PASSWORD} -e "source ${WORKING_DIRECTORY}/mysql/scripts/mysql.sql"
 mysql -u${DB_USER} -p${DB_PASSWORD} -e "source ${WORKING_DIRECTORY}/mysql/scripts/um_mysql.sql"
-mysql -u${DB_USER} -p${DB_PASSWORD} -e "source ${WORKING_DIRECTORY}/mysql/scripts/mb_store_mysql.sql"
-
 echo "Successfully executed the database scripts."
 
 # grants root access to MySQL server from any host

apim-is-as-km-with-analytics/mysql/scripts/mysql.sql

@@ -21,7 +21,7 @@ CREATE TABLE IF NOT EXISTS REG_LOG (
              PRIMARY KEY (REG_LOG_ID, REG_TENANT_ID)
 )ENGINE INNODB;
 
-CREATE INDEX REG_LOG_IND_BY_REGLOG USING HASH ON REG_LOG(REG_LOGGED_TIME, REG_TENANT_ID);
+CREATE INDEX REG_LOG_IND_BY_REG_LOGTIME USING HASH ON REG_LOG(REG_LOGGED_TIME, REG_TENANT_ID);
 
 -- The REG_PATH_VALUE should be less than 767 bytes, and hence was fixed at 750.
 -- See CARBON-5917.
@@ -73,7 +73,7 @@ ALTER TABLE REG_RESOURCE ADD CONSTRAINT REG_RESOURCE_FK_BY_CONTENT_ID FOREIGN KE
 CREATE INDEX REG_RESOURCE_IND_BY_NAME USING HASH ON REG_RESOURCE(REG_NAME, REG_TENANT_ID);
 CREATE INDEX REG_RESOURCE_IND_BY_PATH_ID_NAME USING HASH ON REG_RESOURCE(REG_PATH_ID, REG_NAME, REG_TENANT_ID);
 CREATE INDEX REG_RESOURCE_IND_BY_UUID USING HASH ON REG_RESOURCE(REG_UUID);
-CREATE INDEX REG_RESOURCE_IND_BY_TENAN USING HASH ON REG_RESOURCE(REG_TENANT_ID, REG_UUID);
+CREATE INDEX REG_RESOURCE_IND_BY_TENANT USING HASH ON REG_RESOURCE(REG_TENANT_ID, REG_UUID);
 CREATE INDEX REG_RESOURCE_IND_BY_TYPE USING HASH ON REG_RESOURCE(REG_TENANT_ID, REG_MEDIA_TYPE);
 
 CREATE TABLE IF NOT EXISTS REG_RESOURCE_HISTORY (
@@ -82,9 +82,9 @@ CREATE TABLE IF NOT EXISTS REG_RESOURCE_HISTORY (
             REG_VERSION         INTEGER NOT NULL,
             REG_MEDIA_TYPE      VARCHAR(500),
             REG_CREATOR         VARCHAR(31) NOT NULL,
-            REG_CREATED_TIME    TIMESTAMP NOT NULL DEFAULT 0,
+            REG_CREATED_TIME    TIMESTAMP NOT NULL,
             REG_LAST_UPDATOR    VARCHAR(31),
-            REG_LAST_UPDATED_TIME    TIMESTAMP NOT NULL DEFAULT 0,
+            REG_LAST_UPDATED_TIME    TIMESTAMP NOT NULL,
             REG_DESCRIPTION     VARCHAR(1000),
             REG_CONTENT_ID      INTEGER,
             REG_DELETED         SMALLINT,
@@ -306,6 +306,7 @@ CREATE TABLE UM_PERMISSION (
              UM_ACTION VARCHAR(255) NOT NULL,
              UM_TENANT_ID INTEGER DEFAULT 0,
 		UM_MODULE_ID INTEGER DEFAULT 0,
+		     		 UNIQUE(UM_RESOURCE_ID,UM_ACTION, UM_TENANT_ID),
              PRIMARY KEY (UM_ID, UM_TENANT_ID)
 )ENGINE INNODB;
 
@@ -382,6 +383,7 @@ CREATE TABLE UM_USER_ATTRIBUTE (
 
 CREATE INDEX UM_USER_ID_INDEX ON UM_USER_ATTRIBUTE(UM_USER_ID);
 
+
 CREATE TABLE UM_DIALECT(
             UM_ID INTEGER NOT NULL AUTO_INCREMENT,
             UM_DIALECT_URI VARCHAR(255) NOT NULL,
@@ -420,6 +422,16 @@ CREATE TABLE UM_PROFILE_CONFIG(
             PRIMARY KEY (UM_ID, UM_TENANT_ID)
 )ENGINE INNODB;
 
+CREATE TABLE IF NOT EXISTS UM_CLAIM_BEHAVIOR(
+    UM_ID INTEGER NOT NULL AUTO_INCREMENT,
+    UM_PROFILE_ID INTEGER,
+    UM_CLAIM_ID INTEGER,
+    UM_BEHAVIOUR SMALLINT,
+    UM_TENANT_ID INTEGER DEFAULT 0,
+    FOREIGN KEY(UM_PROFILE_ID, UM_TENANT_ID) REFERENCES UM_PROFILE_CONFIG(UM_ID,UM_TENANT_ID),
+    FOREIGN KEY(UM_CLAIM_ID, UM_TENANT_ID) REFERENCES UM_CLAIM(UM_ID,UM_TENANT_ID),
+    PRIMARY KEY(UM_ID, UM_TENANT_ID)
+)ENGINE INNODB;
 
 CREATE TABLE UM_HYBRID_ROLE(
             UM_ID INTEGER NOT NULL AUTO_INCREMENT,
@@ -447,6 +459,8 @@ CREATE TABLE UM_SYSTEM_ROLE(
             PRIMARY KEY (UM_ID, UM_TENANT_ID)
 )ENGINE INNODB;
 
+CREATE INDEX SYSTEM_ROLE_IND_BY_RN_TI ON UM_SYSTEM_ROLE(UM_ROLE_NAME, UM_TENANT_ID);
+
 CREATE TABLE UM_SYSTEM_USER_ROLE(
             UM_ID INTEGER NOT NULL AUTO_INCREMENT,
             UM_USER_NAME VARCHAR(255),