From 9f5cb199a669a6b176dcfcf23ad49d27b3374a46 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Tue, 4 Mar 2025 17:52:30 +0100
Subject: [PATCH] docker/db: removes db_schema from params (set by db-user at
db init)
---
data-discovery/src/main/java/search/DbConnArgs.java | 4 +---
data-discovery/src/main/java/webapi/SearchSettings.java | 1 -
data-discovery/src/main/resources/search.properties | 1 -
docker/start-siav2.sh | 1 -
4 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/data-discovery/src/main/java/search/DbConnArgs.java b/data-discovery/src/main/java/search/DbConnArgs.java
index 2063db2..df26889 100644
--- a/data-discovery/src/main/java/search/DbConnArgs.java
+++ b/data-discovery/src/main/java/search/DbConnArgs.java
@@ -2,18 +2,16 @@
class DbConnArgs
{
public String uri;
- public String schema;
public String user_name;
public String password;
public String uri() {return uri;}
- public String schema() {return schema;}
public String userName() {return user_name;}
public String password() {return password;}
public String toString()
{
- return uri + " schema[" + schema + "] " + user_name;
+ return uri + " " + user_name;
}
}
diff --git a/data-discovery/src/main/java/webapi/SearchSettings.java b/data-discovery/src/main/java/webapi/SearchSettings.java
index cff18dc..ebc4052 100644
--- a/data-discovery/src/main/java/webapi/SearchSettings.java
+++ b/data-discovery/src/main/java/webapi/SearchSettings.java
@@ -37,7 +37,6 @@ class SearchSettings
{
DbConnArgs dbConnArgs = new DbConnArgs();
dbConnArgs.uri = properties.getProperty("db_uri","jdbc:postgresql://localhost:5432/vialactea").strip();
- dbConnArgs.schema = properties.getProperty("db_schema","ivoa").strip();
dbConnArgs.user_name = properties.getProperty("db_user_name","").strip();
dbConnArgs.password = properties.getProperty("db_password","").strip();
diff --git a/data-discovery/src/main/resources/search.properties b/data-discovery/src/main/resources/search.properties
index 6828d84..5452506 100644
--- a/data-discovery/src/main/resources/search.properties
+++ b/data-discovery/src/main/resources/search.properties
@@ -1,7 +1,6 @@
# database with 'obscore' table
# db_uri=jdbc:postgresql://localhost:5432/vialactea
-# db_schema=ivoa
db_user_name=
db_password=
diff --git a/docker/start-siav2.sh b/docker/start-siav2.sh
index fcf8e49..8d8da23 100755
--- a/docker/start-siav2.sh
+++ b/docker/start-siav2.sh
@@ -21,7 +21,6 @@ echo "<Context docBase=\"$WEBAPP_DIR\"/>" > $CATALINA_BASE/conf/Catalina/localho
# configure DB with ObsTAP
{
echo "db_uri=$DB_URI"
- echo "db_schema=$DB_SCHEMA"
echo "db_user_name=$DB_USERNAME"
echo "db_password=$DB_PASSWORD"
} > $WEBAPP_DIR/WEB-INF/classes/search.properties
--
GitLab