Commit 6a228b51 authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Minor bugfix

parent 2d81ecbb
Pipeline #8641 passed with stages
in 1 minute and 58 seconds
...@@ -917,12 +917,12 @@ public abstract class DBBrokerTemplate implements DBBroker { ...@@ -917,12 +917,12 @@ public abstract class DBBrokerTemplate implements DBBroker {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
sb.append("SELECT k.key_id AS key_id\n"); sb.append("SELECT k.key_id AS key_id\n");
sb.append("FROM "); sb.append("FROM ");
sb.append(tapSchemaName); sb.append(escape(tapSchemaName));
sb.append("."); sb.append(".");
sb.append(escape("keys")); sb.append(escape("keys"));
sb.append(" k\n"); sb.append(" k\n");
sb.append("JOIN "); 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(".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 = ?)"); sb.append("WHERE (k.from_table = ? AND c.from_column = ?) OR (k.target_table = ? AND c.target_column = ?)");
......
...@@ -427,7 +427,7 @@ public class TapSchemaEditingBean implements Serializable { ...@@ -427,7 +427,7 @@ public class TapSchemaEditingBean implements Serializable {
if (!parentSchemaRemovable) { if (!parentSchemaRemovable) {
return !column.isMandatory(); return !column.isMandatory();
} }
return true; return column.getStatus() != Status.TO_REMOVE && column.getStatus() != Status.REMOVED_NOT_PERSISTED;
} }
public boolean isHasColumnsSorter() { public boolean isHasColumnsSorter() {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment