mdstore data

data/sql/mdstores_data.sql

@@ -1 +1,4 @@
--- TODO
+BEGIN;
+
+COMMIT;
+

dnet-app/frontends/is/src/app/mdstores/add-mdstore-dialog.html

@@ -26,6 +26,7 @@
 		<mat-form-field appearance="fill" floatLabel="always" style="width: 100%;">
 			<mat-label>Type</mat-label>
 			<mat-select matInput formControlName="type">
+				<mat-option value="SQL_DB">sql database</mat-option>
 				<mat-option value="HDFS">hdfs</mat-option>
 				<mat-option value="MOCK">mock</mat-option>
 			</mat-select>

dnet-app/libs/dnet-mdstore-postgres/src/main/java/eu/dnetlib/common/mdstores/backends/sql/MDStoreSqlBackend.java

@@ -43,8 +43,13 @@ public class MDStoreSqlBackend implements MDStoreBackend {
 
 	@Override
 	public void delete(final MDStore mdstore) throws MDStoreManagerException {
-		final String filterCond = asTableName(mdstore.getId()) + "%";
-		final List<String> toDelete = jdbcTemplate.queryForList("select tablename FROM pg_tables WHERE like = ?", String.class, filterCond);
+
+		final String table = asTableName(mdstore.getId());
+		final String vCond = table + "-" + "%";
+
+		final List<String> toDelete =
+				jdbcTemplate.queryForList("select tablename FROM pg_tables WHERE tablename = ? OR tablename like ?", String.class, table, vCond);
+
 		toDelete.forEach(t -> jdbcTemplate.execute("drop table " + t));
 	}
 

docker-compose.dev.yml

@@ -98,7 +98,7 @@ services:
       - SPRING_DATASOURCE_URL=jdbc:postgresql://db-main:${PG_PORT}/${PG_MDSTORES_DB}
       - SPRING_DATASOURCE_USERNAME=${PG_USER}
       - SPRING_DATASOURCE_PASSWORD=${PG_PASSWORD}
-      - MDSTORES_DATA_DATASOURCE_URL=jdbc:postgresql://db-main:${PG_PORT}/${PG_MDSTORES_DATA_DB}
+      - MDSTORES_DATA_DATASOURCE_URL=jdbc:postgresql://db-mdstores-data:${PG_PORT}/${PG_MDSTORES_DATA_DB}
       - MDSTORES_DATA_DATASOURCE_USERNAME=${PG_USER}
       - MDSTORES_DATA_DATASOURCE_PASSWORD=${PG_PASSWORD}
     profiles:
@@ -154,7 +154,7 @@ services:
       - SPRING_DATASOURCE_URL=jdbc:postgresql://db-main:${PG_PORT}/${PG_WFS_DB}
       - SPRING_DATASOURCE_USERNAME=${PG_USER}
       - SPRING_DATASOURCE_PASSWORD=${PG_PASSWORD}
-      - MDSTORES_DATA_DATASOURCE_URL=jdbc:postgresql://db-main:${PG_PORT}/${PG_MDSTORES_DATA_DB}
+      - MDSTORES_DATA_DATASOURCE_URL=jdbc:postgresql://db-mdstores-data:${PG_PORT}/${PG_MDSTORES_DATA_DB}
       - MDSTORES_DATA_DATASOURCE_USERNAME=${PG_USER}
       - MDSTORES_DATA_DATASOURCE_PASSWORD=${PG_PASSWORD}
       - SOLR_URLS=http://solr-1:${SOLR_PORT}/solr