From 6a228b5158ec2d72535b50e9d7ca0b53572d62f2 Mon Sep 17 00:00:00 2001
From: Sonia Zorba <sonia.zorba@inaf.it>
Date: Mon, 22 Nov 2021 16:54:50 +0100
Subject: [PATCH] Minor bugfix
---
.../main/java/it/inaf/ia2/tsm/datalayer/DBBrokerTemplate.java | 4 ++--
.../java/it/inaf/ia2/tsm/webapp/TapSchemaEditingBean.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/DBBrokerTemplate.java b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/DBBrokerTemplate.java
index b6ee032..242c04b 100644
--- a/TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/DBBrokerTemplate.java
+++ b/TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/DBBrokerTemplate.java
@@ -917,12 +917,12 @@ public abstract class DBBrokerTemplate implements DBBroker {
StringBuilder sb = new StringBuilder();
sb.append("SELECT k.key_id AS key_id\n");
sb.append("FROM ");
- sb.append(tapSchemaName);
+ sb.append(escape(tapSchemaName));
sb.append(".");
sb.append(escape("keys"));
sb.append(" k\n");
sb.append("JOIN ");
- sb.append(tapSchemaName);
+ sb.append(escape(tapSchemaName));
sb.append(".key_columns c ON k.key_id = c.key_id\n");
sb.append("WHERE (k.from_table = ? AND c.from_column = ?) OR (k.target_table = ? AND c.target_column = ?)");
diff --git a/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/TapSchemaEditingBean.java b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/TapSchemaEditingBean.java
index 82f4940..7bfecb8 100644
--- a/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/TapSchemaEditingBean.java
+++ b/TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/TapSchemaEditingBean.java
@@ -427,7 +427,7 @@ public class TapSchemaEditingBean implements Serializable {
if (!parentSchemaRemovable) {
return !column.isMandatory();
}
- return true;
+ return column.getStatus() != Status.TO_REMOVE && column.getStatus() != Status.REMOVED_NOT_PERSISTED;
}
public boolean isHasColumnsSorter() {
--
GitLab