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

Minor bugfix

parent 2d81ecbb

TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/DBBrokerTemplate.java

+2 −2
Original line number Diff line number Diff line
@@ -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 = ?)");

TASMAN-webapp/src/main/java/it/inaf/ia2/tsm/webapp/TapSchemaEditingBean.java

+1 −1
Original line number Diff line number Diff line
@@ -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() {