From 8568897ce2273e196c238952d29d08adabde1de4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Tue, 30 May 2023 11:12:02 +0200 Subject: [PATCH] ref #10320 adapt update script for annotatable TermRelationBase --- .../v536_538/SchemaUpdater_5361_5380.java | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v536_538/SchemaUpdater_5361_5380.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v536_538/SchemaUpdater_5361_5380.java index 6327069c35..a7866c5219 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v536_538/SchemaUpdater_5361_5380.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v536_538/SchemaUpdater_5361_5380.java @@ -17,9 +17,9 @@ import org.apache.logging.log4j.Logger; import eu.etaxonomy.cdm.database.update.ColumnAdder; import eu.etaxonomy.cdm.database.update.ISchemaUpdater; import eu.etaxonomy.cdm.database.update.ISchemaUpdaterStep; +import eu.etaxonomy.cdm.database.update.MnTableCreator; import eu.etaxonomy.cdm.database.update.SchemaUpdaterBase; import eu.etaxonomy.cdm.database.update.SimpleSchemaUpdaterStep; -import eu.etaxonomy.cdm.database.update.TableCreator; import eu.etaxonomy.cdm.database.update.v535_536.SchemaUpdater_5360_5361; import eu.etaxonomy.cdm.model.metadata.CdmMetaData.CdmVersion; @@ -61,9 +61,22 @@ public class SchemaUpdater_5361_5380 extends SchemaUpdaterBase { List stepList = new ArrayList<>(); //#10320 make term relation annotatable - stepName = "Make term relation annotatable"; + stepName = "Make term relation annotatable (Annotation)"; tableName = "TermRelation"; - TableCreator.makeMnTables(stepList, tableName, true, false); + columnName = "TermRelationBase"; + String secondTableName = "Annotation"; +// TableCreator.makeMnTables(stepList, tableName, true, false); + MnTableCreator.NewMnInstance(stepList, stepName, tableName, tableName, columnName, + secondTableName, secondTableName, secondTableName, SchemaUpdaterBase.INCLUDE_AUDIT, !IS_LIST, IS_1_TO_M); + + //#10320 ... for markers + stepName = "Make term relation annotatable (Marker)"; + tableName = "TermRelation"; + columnName = "TermRelationBase"; + secondTableName = "Marker"; + MnTableCreator.NewMnInstance(stepList, stepName, tableName, tableName, columnName, + secondTableName, secondTableName, secondTableName, SchemaUpdaterBase.INCLUDE_AUDIT, !IS_LIST, IS_1_TO_M); + //#10328 add maxPerDataset stepName = "Add maxPerDataset column to Feature"; -- 2.34.1