From 75f825a7134de772506b86a9f053857f720f3b7e Mon Sep 17 00:00:00 2001 From: Mohamed Rashd Date: Mon, 25 Apr 2022 14:17:21 +0530 Subject: [PATCH] Fix dbscript syntax --- .../mgt/core/management/ApplicationManagementTest.java | 3 ++- .../src/main/resources/dbscripts/cdm/application-mgt/h2.sql | 2 +- .../main/resources/dbscripts/cdm/application-mgt/mssql.sql | 2 +- .../main/resources/dbscripts/cdm/application-mgt/mysql.sql | 4 ++-- .../main/resources/dbscripts/cdm/application-mgt/oracle.sql | 2 +- .../resources/dbscripts/cdm/application-mgt/postgresql.sql | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/management/ApplicationManagementTest.java b/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/management/ApplicationManagementTest.java index 5d9f59bd21..06c8283bad 100644 --- a/components/application-mgt/io.entgra.application.mgt.core/src/test/java/io/entgra/application/mgt/core/management/ApplicationManagementTest.java +++ b/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") diff --git a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql b/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql index cd91bcc8f9..8c62906e71 100644 --- a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql +++ b/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) ); diff --git a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mssql.sql b/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mssql.sql index b3e2e0f971..1b89c2dcc4 100644 --- a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mssql.sql +++ b/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) ); diff --git a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mysql.sql b/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mysql.sql index 685dc84d9e..6070139961 100644 --- a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mysql.sql +++ b/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 diff --git a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/oracle.sql b/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/oracle.sql index 2906ec657f..163db579ee 100644 --- a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/oracle.sql +++ b/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) ) diff --git a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/postgresql.sql b/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/postgresql.sql index 8e50953740..ae57ee10e9 100644 --- a/features/application-mgt/io.entgra.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/postgresql.sql +++ b/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) );