Merge branch 'fix/dbscript/is-integration' into 'master'

Fix dbscript in service provider application integration feature

See merge request entgra/carbon-device-mgt!885

components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/management/ApplicationManagementTest.java

@@ -121,7 +121,8 @@ public class ApplicationManagementTest extends BaseTestCase {
 
         applicationArtifact.setScreenshots(screenshots);
         ApplicationManager manager = new ApplicationManagerImpl();
-         manager.createApplication(applicationWrapper, false);
+        log.error(manager);
+        manager.createApplication(applicationWrapper, false);
     }
 
     @DataProvider(name = "applicationIdDataProvider")

features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql

@@ -290,7 +290,7 @@ CREATE TABLE IF NOT EXISTS AP_IDENTITY_SERVER (
   URL VARCHAR(255) NOT NULL,
   API_PARAMS VARCHAR(255) NOT NULL,
   USERNAME VARCHAR(255) NOT NULL,
-  PASSWORD VARCHAR(255) NOT NULL
+  PASSWORD VARCHAR(255) NOT NULL,
   TENANT_ID INT NOT NULL,
   PRIMARY KEY(ID)
 );

features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mssql.sql

@@ -291,7 +291,7 @@ CREATE TABLE IF NOT EXISTS AP_IDENTITY_SERVER (
   URL VARCHAR(255) NOT NULL,
   API_PARAMS VARCHAR(255) NOT NULL,
   USERNAME VARCHAR(255) NOT NULL,
-  PASSWORD VARCHAR(255) NOT NULL
+  PASSWORD VARCHAR(255) NOT NULL,
   TENANT_ID INT NOT NULL,
   PRIMARY KEY(ID)
 );

features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mysql.sql

@@ -246,8 +246,8 @@ CREATE TABLE IF NOT EXISTS AP_IDENTITY_SERVER (
   URL VARCHAR(255) NOT NULL,
   API_PARAMS TEXT NOT NULL,
   USERNAME VARCHAR(255) NOT NULL,
-  PASSWORD VARCHAR(255) NOT NULL
-  TENANT_ID INT NOT NULL,
+  PASSWORD VARCHAR(255) NOT NULL,
+  TENANT_ID INT NOT NULL
 );
 -- -----------------------------------------------------
 -- Table AP_IS_SP_APP_MAPPING

features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/oracle.sql

@@ -391,7 +391,7 @@ CREATE TABLE IF NOT EXISTS AP_IDENTITY_SERVER (
   URL VARCHAR(255) NOT NULL,
   API_PARAMS VARCHAR(255) NOT NULL,
   USERNAME VARCHAR(255) NOT NULL,
-  PASSWORD VARCHAR(255) NOT NULL
+  PASSWORD VARCHAR(255) NOT NULL,
   TENANT_ID INT NOT NULL,
   PRIMARY KEY(ID)
 )

features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/postgresql.sql

@@ -317,7 +317,7 @@ CREATE TABLE IF NOT EXISTS AP_IDENTITY_SERVER (
   URL VARCHAR(255) NOT NULL,
   API_PARAMS VARCHAR(255) NOT NULL,
   USERNAME VARCHAR(255) NOT NULL,
-  PASSWORD VARCHAR(255) NOT NULL
+  PASSWORD VARCHAR(255) NOT NULL,
   TENANT_ID INT NOT NULL,
   PRIMARY KEY(ID)
 );