Fix the issues in the MySQL NDB cluster DB script

features/apimgt/org.wso2.carbon.apimgt.core.feature/src/main/resources/sql/mysql_cluster.sql

@@ -1014,6 +1014,7 @@ CREATE TABLE IF NOT EXISTS IDN_SAML2_ASSERTION_STORE (
   SAML2_SESSION_INDEX           VARCHAR(255),
   SAML2_AUTHN_CONTEXT_CLASS_REF VARCHAR(255),
   SAML2_ASSERTION               VARCHAR(4096),
+  ASSERTION                     BLOB,
   PRIMARY KEY (ID)
 )
   ENGINE NDB;
@@ -1637,7 +1638,7 @@ CREATE TABLE IF NOT EXISTS AM_APPLICATION (
     UUID VARCHAR(256),
     TOKEN_TYPE VARCHAR(10),
     ORGANIZATION VARCHAR(100),
-    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON DELETE RESTRICT,
     PRIMARY KEY(APPLICATION_ID),
     UNIQUE (NAME,SUBSCRIBER_ID,ORGANIZATION),
     UNIQUE (UUID)
@@ -1677,21 +1678,14 @@ CREATE TABLE IF NOT EXISTS AM_API (
     UNIQUE (API_UUID)
 )ENGINE NDB;
 
-CREATE TABLE IF NOT EXISTS AM_API_REVISION_METADATA (
-    API_UUID VARCHAR(64),
-    REVISION_UUID VARCHAR(255),
-    API_TIER VARCHAR(128),
-    UNIQUE (API_UUID,REVISION_UUID)
-)ENGINE NDB;
-
 CREATE TABLE IF NOT EXISTS AM_GRAPHQL_COMPLEXITY (
     UUID VARCHAR(256),
     API_ID INTEGER NOT NULL,
     TYPE VARCHAR(256),
     FIELD VARCHAR(256),
     COMPLEXITY_VALUE INTEGER,
     REVISION_UUID VARCHAR(255),
-    FOREIGN KEY (API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE CASCADE,
+    FOREIGN KEY (API_ID) REFERENCES AM_API(API_ID) ON DELETE CASCADE,
     PRIMARY KEY(UUID)
 )ENGINE NDB;
 
@@ -1718,7 +1712,7 @@ CREATE TABLE IF NOT EXISTS AM_API_RESOURCE_SCOPE_MAPPING (
 CREATE TABLE IF NOT EXISTS AM_SECURITY_AUDIT_UUID_MAPPING (
     API_ID INTEGER NOT NULL,
     AUDIT_UUID VARCHAR(255) NOT NULL,
-    FOREIGN KEY (API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    FOREIGN KEY (API_ID) REFERENCES AM_API(API_ID) ON DELETE RESTRICT,
     PRIMARY KEY (API_ID)
 )ENGINE NDB;
 
@@ -1746,8 +1740,8 @@ CREATE TABLE IF NOT EXISTS AM_SUBSCRIPTION (
     UPDATED_BY VARCHAR(100),
     UPDATED_TIME TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
     UUID VARCHAR(256),
-    FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE ON DELETE CASCADE,
-    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON DELETE CASCADE,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON DELETE RESTRICT,
     PRIMARY KEY (SUBSCRIPTION_ID),
     UNIQUE (UUID)
 )ENGINE NDB;
@@ -1763,7 +1757,7 @@ CREATE TABLE IF NOT EXISTS AM_APPLICATION_KEY_MAPPING (
     CREATE_MODE VARCHAR(30) DEFAULT 'CREATED',
     KEY_MANAGER VARCHAR(100),
     APP_INFO BLOB ,
-    FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE ON DELETE CASCADE,
+    FOREIGN KEY(APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID),
     PRIMARY KEY(APPLICATION_ID,KEY_TYPE,KEY_MANAGER)
 )ENGINE NDB;
 
@@ -1775,7 +1769,7 @@ CREATE TABLE IF NOT EXISTS AM_API_LC_EVENT (
     USER_ID VARCHAR(255) NOT NULL,
     TENANT_ID INTEGER NOT NULL,
     EVENT_DATE TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON DELETE CASCADE,
     PRIMARY KEY (EVENT_ID)
 )ENGINE NDB;
 
@@ -1806,7 +1800,7 @@ CREATE TABLE IF NOT EXISTS AM_API_RATINGS (
     RATING INTEGER,
     SUBSCRIBER_ID INTEGER,
     FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON DELETE CASCADE,
-    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON DELETE RESTRICT,
 PRIMARY KEY (RATING_ID)
 )ENGINE NDB;
 
@@ -1827,7 +1821,7 @@ CREATE TABLE IF NOT EXISTS AM_EXTERNAL_STORES (
     STORE_ENDPOINT VARCHAR(255) NOT NULL,
     STORE_TYPE VARCHAR(255) NOT NULL,
     LAST_UPDATED_TIME TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
+FOREIGN KEY(API_ID) REFERENCES AM_API(API_ID) ON DELETE RESTRICT,
 PRIMARY KEY (APISTORE_ID)
 )ENGINE NDB;
 
@@ -1860,8 +1854,8 @@ CREATE TABLE IF NOT EXISTS AM_APPLICATION_REGISTRATION (
     VALIDITY_PERIOD BIGINT,
     KEY_MANAGER VARCHAR(255) NOT NULL,
     UNIQUE (SUBSCRIBER_ID,APP_ID,TOKEN_TYPE,KEY_MANAGER),
-    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON UPDATE CASCADE ON DELETE RESTRICT,
-    FOREIGN KEY(APP_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON UPDATE CASCADE ON DELETE CASCADE,
+    FOREIGN KEY(SUBSCRIBER_ID) REFERENCES AM_SUBSCRIBER(SUBSCRIBER_ID) ON DELETE RESTRICT,
+    FOREIGN KEY(APP_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON DELETE CASCADE,
     PRIMARY KEY (REG_ID)
 )ENGINE NDB;
 
@@ -1878,6 +1872,7 @@ CREATE TABLE IF NOT EXISTS AM_API_DEFAULT_VERSION (
             API_PROVIDER VARCHAR(256) NOT NULL ,
             DEFAULT_API_VERSION VARCHAR(30) ,
             PUBLISHED_DEFAULT_API_VERSION VARCHAR(30) ,
+            ORGANIZATION VARCHAR(100),
             PRIMARY KEY (DEFAULT_VERSION_ID)
 )ENGINE = NDB;
 
@@ -2023,7 +2018,7 @@ CREATE TABLE IF NOT EXISTS AM_CONDITION_GROUP (
             TIME_UNIT VARCHAR(25) NOT NULL,
             DESCRIPTION VARCHAR (1024) NULL DEFAULT NULL,
             PRIMARY KEY (CONDITION_GROUP_ID),
-            FOREIGN KEY (POLICY_ID) REFERENCES AM_API_THROTTLE_POLICY(POLICY_ID) ON DELETE CASCADE ON UPDATE CASCADE
+            FOREIGN KEY (POLICY_ID) REFERENCES AM_API_THROTTLE_POLICY(POLICY_ID) ON DELETE CASCADE
 )ENGINE = NDB;
 
 CREATE TABLE IF NOT EXISTS AM_QUERY_PARAMETER_CONDITION (
@@ -2033,7 +2028,7 @@ CREATE TABLE IF NOT EXISTS AM_QUERY_PARAMETER_CONDITION (
             PARAMETER_VALUE VARCHAR(255) DEFAULT NULL,
 	    	IS_PARAM_MAPPING BOOLEAN DEFAULT 1,
             PRIMARY KEY (QUERY_PARAMETER_ID),
-            FOREIGN KEY (CONDITION_GROUP_ID) REFERENCES AM_CONDITION_GROUP(CONDITION_GROUP_ID) ON DELETE CASCADE ON UPDATE CASCADE
+            FOREIGN KEY (CONDITION_GROUP_ID) REFERENCES AM_CONDITION_GROUP(CONDITION_GROUP_ID) ON DELETE CASCADE
 )ENGINE = NDB;
 
 CREATE TABLE IF NOT EXISTS AM_HEADER_FIELD_CONDITION (
@@ -2043,7 +2038,7 @@ CREATE TABLE IF NOT EXISTS AM_HEADER_FIELD_CONDITION (
             HEADER_FIELD_VALUE VARCHAR(255) DEFAULT NULL,
 	    	IS_HEADER_FIELD_MAPPING BOOLEAN DEFAULT 1,
             PRIMARY KEY (HEADER_FIELD_ID),
-            FOREIGN KEY (CONDITION_GROUP_ID) REFERENCES AM_CONDITION_GROUP(CONDITION_GROUP_ID) ON DELETE CASCADE ON UPDATE CASCADE
+            FOREIGN KEY (CONDITION_GROUP_ID) REFERENCES AM_CONDITION_GROUP(CONDITION_GROUP_ID) ON DELETE CASCADE
 )ENGINE = NDB;
 
 CREATE TABLE IF NOT EXISTS AM_JWT_CLAIM_CONDITION (
@@ -2053,7 +2048,7 @@ CREATE TABLE IF NOT EXISTS AM_JWT_CLAIM_CONDITION (
             CLAIM_ATTRIB VARCHAR(1024) DEFAULT NULL,
 	    IS_CLAIM_MAPPING BOOLEAN DEFAULT 1,
             PRIMARY KEY (JWT_CLAIM_ID),
-            FOREIGN KEY (CONDITION_GROUP_ID) REFERENCES AM_CONDITION_GROUP(CONDITION_GROUP_ID) ON DELETE CASCADE ON UPDATE CASCADE
+            FOREIGN KEY (CONDITION_GROUP_ID) REFERENCES AM_CONDITION_GROUP(CONDITION_GROUP_ID) ON DELETE CASCADE
 )ENGINE = NDB;
 
 CREATE TABLE IF NOT EXISTS AM_IP_CONDITION (
@@ -2065,7 +2060,7 @@ CREATE TABLE IF NOT EXISTS AM_IP_CONDITION (
   CONDITION_GROUP_ID INT NULL,
   PRIMARY KEY (AM_IP_CONDITION_ID),
   INDEX fk_AM_IP_CONDITION_1_idx (CONDITION_GROUP_ID ASC),  CONSTRAINT fk_AM_IP_CONDITION_1    FOREIGN KEY (CONDITION_GROUP_ID)
-    REFERENCES AM_CONDITION_GROUP (CONDITION_GROUP_ID)   ON DELETE CASCADE ON UPDATE CASCADE)
+    REFERENCES AM_CONDITION_GROUP (CONDITION_GROUP_ID)   ON DELETE CASCADE)
 ENGINE = NDB;
 
 
@@ -2118,7 +2113,7 @@ CREATE TABLE IF NOT EXISTS `AM_API_CLIENT_CERTIFICATE` (
   `REMOVED` BOOLEAN NOT NULL DEFAULT 0,
   `TIER_NAME` VARCHAR (512),
   `REVISION_UUID` VARCHAR(255) NOT NULL DEFAULT 'Current API',
-  FOREIGN KEY (API_ID) REFERENCES AM_API (API_ID) ON DELETE CASCADE,
+  FOREIGN KEY (API_ID) REFERENCES AM_API (API_ID),
   PRIMARY KEY (`ALIAS`, `TENANT_ID`, `REMOVED`, `REVISION_UUID`)
 ) ENGINE=NDB;
 
@@ -2127,7 +2122,7 @@ CREATE TABLE IF NOT EXISTS AM_APPLICATION_GROUP_MAPPING (
     GROUP_ID VARCHAR(512) NOT NULL,
     TENANT VARCHAR(255),
     PRIMARY KEY (APPLICATION_ID,GROUP_ID,TENANT),
-    FOREIGN KEY (APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON DELETE CASCADE ON UPDATE CASCADE
+    FOREIGN KEY (APPLICATION_ID) REFERENCES AM_APPLICATION(APPLICATION_ID) ON DELETE CASCADE
 ) ENGINE=NDB;
 
 CREATE TABLE IF NOT EXISTS AM_USAGE_UPLOADED_FILES (
@@ -2153,7 +2148,7 @@ CREATE TABLE IF NOT EXISTS AM_APPLICATION_ATTRIBUTES (
   APP_ATTRIBUTE varchar(1024) NOT NULL,
   TENANT_ID int(11) NOT NULL,
   PRIMARY KEY (APPLICATION_ID,NAME),
-  FOREIGN KEY (APPLICATION_ID) REFERENCES AM_APPLICATION (APPLICATION_ID) ON DELETE CASCADE ON UPDATE CASCADE
+  FOREIGN KEY (APPLICATION_ID) REFERENCES AM_APPLICATION (APPLICATION_ID) ON DELETE CASCADE
 ) ENGINE=NDB;
 
 CREATE TABLE IF NOT EXISTS AM_SYSTEM_APPS (
@@ -2165,7 +2160,7 @@ CREATE TABLE IF NOT EXISTS AM_SYSTEM_APPS (
     CREATED_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     UNIQUE (CONSUMER_KEY),
     PRIMARY KEY (ID)
- ) ENGINE=InnoDB;
+ ) ENGINE=NDB;
 
  CREATE TABLE IF NOT EXISTS AM_API_CATEGORIES (
    UUID VARCHAR(50),
@@ -2234,25 +2229,25 @@ CREATE TABLE IF NOT EXISTS AM_GW_PUBLISHED_API_DETAILS (
   API_VERSION varchar(255),
   API_TYPE varchar(50),
   PRIMARY KEY (API_ID)
-)ENGINE=InnoDB;
+)ENGINE=NDB;
 
 CREATE TABLE IF NOT EXISTS AM_GW_API_ARTIFACTS (
   API_ID VARCHAR(255) NOT NULL,
   REVISION_ID VARCHAR(255) NOT NULL,
   ARTIFACT MEDIUMBLOB,
   TIME_STAMP TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (REVISION_ID, API_ID),
-  FOREIGN KEY (API_ID) REFERENCES AM_GW_PUBLISHED_API_DETAILS(API_ID) ON UPDATE CASCADE ON DELETE NO ACTION
-)ENGINE=InnoDB;
+  FOREIGN KEY (API_ID) REFERENCES AM_GW_PUBLISHED_API_DETAILS(API_ID)
+)ENGINE=NDB;
 
 CREATE TABLE IF NOT EXISTS AM_GW_API_DEPLOYMENTS (
   API_ID VARCHAR(255) NOT NULL,
   REVISION_ID VARCHAR(255) NOT NULL,
   LABEL VARCHAR(255) NOT NULL,
   VHOST VARCHAR(255) NULL,
   PRIMARY KEY (REVISION_ID, API_ID,LABEL),
-  FOREIGN KEY (API_ID) REFERENCES AM_GW_PUBLISHED_API_DETAILS(API_ID) ON UPDATE CASCADE ON DELETE NO ACTION
-) ENGINE=InnoDB;
+  FOREIGN KEY (API_ID) REFERENCES AM_GW_PUBLISHED_API_DETAILS(API_ID) ON DELETE CASCADE
+) ENGINE=NDB;
 
 -- Tenant Themes Table --
 CREATE TABLE IF NOT EXISTS AM_TENANT_THEMES (
@@ -2261,6 +2256,76 @@ CREATE TABLE IF NOT EXISTS AM_TENANT_THEMES (
   PRIMARY KEY (TENANT_ID)
 ) ENGINE=NDB;
 
+-- UMA tables --
+CREATE TABLE IF NOT EXISTS IDN_UMA_RESOURCE (
+  ID INTEGER AUTO_INCREMENT NOT NULL,
+  RESOURCE_ID VARCHAR(255),
+  RESOURCE_NAME VARCHAR(255),
+  TIME_CREATED TIMESTAMP NOT NULL,
+  RESOURCE_OWNER_NAME VARCHAR(255),
+  CLIENT_ID VARCHAR(255),
+  TENANT_ID INTEGER DEFAULT -1234,
+  USER_DOMAIN VARCHAR(50),
+  PRIMARY KEY (ID)
+);
+
+CREATE INDEX IDX_RID ON IDN_UMA_RESOURCE (RESOURCE_ID);
+CREATE INDEX IDX_USER ON IDN_UMA_RESOURCE (RESOURCE_OWNER_NAME, USER_DOMAIN);
+CREATE INDEX IDX_USER_RID ON IDN_UMA_RESOURCE (
+  RESOURCE_ID,
+  RESOURCE_OWNER_NAME(32),
+  USER_DOMAIN,
+  CLIENT_ID
+);
+
+CREATE TABLE IF NOT EXISTS IDN_UMA_RESOURCE_META_DATA (
+  ID INTEGER AUTO_INCREMENT NOT NULL,
+  RESOURCE_IDENTITY INTEGER NOT NULL,
+  PROPERTY_KEY VARCHAR(40),
+  PROPERTY_VALUE VARCHAR(255),
+  PRIMARY KEY (ID),
+  FOREIGN KEY (RESOURCE_IDENTITY) REFERENCES IDN_UMA_RESOURCE (ID) ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS IDN_UMA_RESOURCE_SCOPE (
+  ID INTEGER AUTO_INCREMENT NOT NULL,
+  RESOURCE_IDENTITY INTEGER NOT NULL,
+  SCOPE_NAME VARCHAR(255),
+  PRIMARY KEY (ID),
+  FOREIGN KEY (RESOURCE_IDENTITY) REFERENCES IDN_UMA_RESOURCE (ID) ON DELETE CASCADE
+);
+
+CREATE INDEX IDX_RS ON IDN_UMA_RESOURCE_SCOPE (SCOPE_NAME);
+CREATE TABLE IF NOT EXISTS IDN_UMA_PERMISSION_TICKET (
+  ID INTEGER AUTO_INCREMENT NOT NULL,
+  PT VARCHAR(255) NOT NULL,
+  TIME_CREATED TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  EXPIRY_TIME TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  TICKET_STATE VARCHAR(25) DEFAULT 'ACTIVE',
+  TENANT_ID INTEGER DEFAULT -1234,
+  TOKEN_ID VARCHAR(255),
+  PRIMARY KEY (ID)
+);
+
+CREATE INDEX IDX_PT ON IDN_UMA_PERMISSION_TICKET (PT);
+CREATE TABLE IF NOT EXISTS IDN_UMA_PT_RESOURCE (
+  ID INTEGER AUTO_INCREMENT NOT NULL,
+  PT_RESOURCE_ID INTEGER NOT NULL,
+  PT_ID INTEGER NOT NULL,
+  PRIMARY KEY (ID),
+  FOREIGN KEY (PT_ID) REFERENCES IDN_UMA_PERMISSION_TICKET (ID) ON DELETE CASCADE,
+  FOREIGN KEY (PT_RESOURCE_ID) REFERENCES IDN_UMA_RESOURCE (ID) ON DELETE CASCADE
+);
+
+CREATE TABLE IF NOT EXISTS IDN_UMA_PT_RESOURCE_SCOPE (
+  ID INTEGER AUTO_INCREMENT NOT NULL,
+  PT_RESOURCE_ID INTEGER NOT NULL,
+  PT_SCOPE_ID INTEGER NOT NULL,
+  PRIMARY KEY (ID),
+  FOREIGN KEY (PT_RESOURCE_ID) REFERENCES IDN_UMA_PT_RESOURCE (ID) ON DELETE CASCADE,
+  FOREIGN KEY (PT_SCOPE_ID) REFERENCES IDN_UMA_RESOURCE_SCOPE (ID) ON DELETE CASCADE
+);
+
 CREATE TABLE IF NOT EXISTS AM_SCOPE (
             SCOPE_ID INTEGER NOT NULL AUTO_INCREMENT,
             NAME VARCHAR(255) NOT NULL,
@@ -2309,6 +2374,14 @@ CREATE TABLE IF NOT EXISTS AM_DEPLOYED_REVISION (
   FOREIGN KEY (REVISION_UUID) REFERENCES AM_REVISION(REVISION_UUID) ON UPDATE CASCADE ON DELETE CASCADE
 )ENGINE=NDB;
 
+CREATE TABLE IF NOT EXISTS AM_API_REVISION_METADATA (
+  API_UUID VARCHAR(64),
+  REVISION_UUID VARCHAR(255),
+  API_TIER VARCHAR(128),
+  UNIQUE (API_UUID, REVISION_UUID),
+  FOREIGN KEY(REVISION_UUID) REFERENCES AM_REVISION(REVISION_UUID) ON DELETE CASCADE
+)ENGINE NDB;
+
 -- Gateway Environments Table --
 CREATE TABLE IF NOT EXISTS AM_GATEWAY_ENVIRONMENT (
   ID INTEGER NOT NULL AUTO_INCREMENT,
@@ -2332,7 +2405,7 @@ CREATE TABLE IF NOT EXISTS AM_GW_VHOST (
   HTTPS_PORT VARCHAR(5) NOT NULL,
   WS_PORT VARCHAR(5) NOT NULL,
   WSS_PORT VARCHAR(5) NOT NULL,
-  FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(ID) ON UPDATE CASCADE ON DELETE CASCADE,
+  FOREIGN KEY (GATEWAY_ENV_ID) REFERENCES AM_GATEWAY_ENVIRONMENT(ID) ON DELETE CASCADE,
   PRIMARY KEY (GATEWAY_ENV_ID, HOST)
 )ENGINE=NDB;
 
@@ -2404,7 +2477,7 @@ CREATE TABLE IF NOT EXISTS AM_API_ENVIRONMENT_KEYS
     API_UUID        VARCHAR(256) NOT NULL,
     PROPERTY_CONFIG BLOB DEFAULT NULL,
     UNIQUE (ENVIRONMENT_ID, API_UUID),
-    FOREIGN KEY (API_UUID) REFERENCES AM_API(API_UUID) ON DELETE CASCADE,
+    FOREIGN KEY (API_UUID) REFERENCES AM_API(API_UUID),
     PRIMARY KEY (UUID)
 )ENGINE=NDB;
 
@@ -2431,7 +2504,7 @@ CREATE TABLE IF NOT EXISTS AM_OPERATION_POLICY_DEFINITION (
    GATEWAY_TYPE VARCHAR(20) NOT NULL,
    DEFINITION_MD5 VARCHAR(45) NOT NULL,
    UNIQUE (POLICY_UUID, GATEWAY_TYPE),
-   FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID) ON DELETE CASCADE,
+   FOREIGN KEY (POLICY_UUID) REFERENCES AM_OPERATION_POLICY(POLICY_UUID),
    PRIMARY KEY(DEFINITION_ID)
 )ENGINE=NDB;
 
@@ -2536,6 +2609,7 @@ CREATE TABLE IF NOT EXISTS AM_CORRELATION_PROPERTIES(
 create index IDX_ITS_LMT on IDN_THRIFT_SESSION (LAST_MODIFIED_TIME);
 create index IDX_IOAT_UT on IDN_OAUTH2_ACCESS_TOKEN (USER_TYPE);
 create index IDX_AAI_CTX on AM_API (CONTEXT);
+create index IDX_AAI_ORG on AM_API (ORGANIZATION);
 create index IDX_AAKM_CK on AM_APPLICATION_KEY_MAPPING (CONSUMER_KEY);
 create index IDX_AAUM_AI on AM_API_URL_MAPPING (API_ID);
 create index IDX_AAPM_AI on AM_API_PRODUCT_MAPPING (API_ID);
@@ -2550,3 +2624,42 @@ create index IDX_IOAT_TSH_TS on IDN_OAUTH2_ACCESS_TOKEN(TOKEN_SCOPE_HASH,TOKEN_S
 
 
 -- Performance indexes end--
+
+DELIMITER //
+
+CREATE TRIGGER DELETE_AM_APPLICATION_KEY_MAPPING
+BEFORE DELETE ON AM_APPLICATION
+FOR EACH ROW
+BEGIN
+  DELETE FROM AM_APPLICATION_KEY_MAPPING WHERE APPLICATION_ID = OLD.APPLICATION_ID;
+END;//
+
+CREATE TRIGGER DELETE_AM_API_CLIENT_CERTIFICATE
+BEFORE DELETE ON AM_API
+FOR EACH ROW
+BEGIN
+  DELETE FROM AM_API_CLIENT_CERTIFICATE WHERE API_ID = OLD.API_ID;
+END;//
+
+CREATE TRIGGER DELETE_AM_GW_API_ARTIFACTS
+BEFORE DELETE ON AM_GW_PUBLISHED_API_DETAILS
+FOR EACH ROW
+BEGIN
+  DELETE FROM AM_GW_API_ARTIFACTS WHERE API_ID = OLD.API_ID;
+END;//
+
+CREATE TRIGGER DELETE_AM_API_ENVIRONMENT_KEYS
+BEFORE DELETE ON AM_API
+FOR EACH ROW
+BEGIN
+  DELETE FROM AM_API_ENVIRONMENT_KEYS WHERE API_UUID = OLD.API_UUID;
+END;//
+
+CREATE TRIGGER DELETE_AM_OPERATION_POLICY_DEFINITION
+BEFORE DELETE ON AM_OPERATION_POLICY
+FOR EACH ROW
+BEGIN
+  DELETE FROM AM_OPERATION_POLICY_DEFINITION WHERE POLICY_UUID = OLD.POLICY_UUID;
+END;//
+
+DELIMITER ;