Commit a16a41c3 authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Bugfix

parent 7061c12b

TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/ColumnImpl.java

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ public class ColumnImpl extends ChildEntityImpl<Table> implements Column { 
        addProperty(PRINCIPAL_KEY, new EditableProperty<>(isPrimaryKey, false));

        addProperty(STD_KEY, new EditableProperty<>(false, false));

        addProperty(COLUMN_INDEX_KEY, new EditableProperty<Integer>());

        addProperty(ID_KEY, new EditableProperty<Integer>());

        addProperty(COLUMN_ID_KEY, new EditableProperty<Long>());



        setStatus(Status.LOADED);

TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/Dao.java

+1 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ public class Dao { 
                querySb.append("indexed       integer      NOT NULL,\n");

                querySb.append("std           integer      NOT NULL,\n");

                if (TSMUtil.isIA2(version)) {

                    querySb.append("id      integer,\n");

                    querySb.append("columnID      bigint,\n");

                }

                querySb.append("PRIMARY KEY (table_name, column_name),\n");

TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/EntityPropertyInfo.java

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ public class EntityPropertyInfo { 
        columnProperties.add(new EntityPropertyInfo(Column.PRINCIPAL_KEY, Boolean.class, true));

        columnProperties.add(new EntityPropertyInfo(Column.STD_KEY, Boolean.class, true));

        columnProperties.add(new EntityPropertyInfo(Column.COLUMN_INDEX_KEY, Integer.class, true, TapSchemaVersion.TAP_SCHEMA_1_1, TapSchemaVersion.TAP_SCHEMA_1_1_IA2));

        columnProperties.add(new EntityPropertyInfo(Column.ID_KEY, Integer.class, true, TapSchemaVersion.TAP_SCHEMA_1_IA2, TapSchemaVersion.TAP_SCHEMA_1_1_IA2));

        columnProperties.add(new EntityPropertyInfo(Column.COLUMN_ID_KEY, Long.class, true, TapSchemaVersion.TAP_SCHEMA_1_IA2, TapSchemaVersion.TAP_SCHEMA_1_1_IA2));



        List<EntityPropertyInfo> keyProperties = new ArrayList<>();

TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/TSMUtil.java

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class TSMUtil { 
        List<T> ret = new ArrayList<>();

        for (T child : entities) {

            if (statuses == null || statuses.length == 0) {

                if (child != null) {

                if (child != null && child.getStatus() != Status.LOADED) {

                    ret.add(child);

                }

            } else {