From: Andreas Müller Date: Tue, 14 Mar 2017 08:31:48 +0000 (+0100) Subject: prepare cdm 4.7 X-Git-Tag: 4.8.0^2~218 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/commitdiff_plain/25adb5691d3378196d708389c6daa410385e0535 prepare cdm 4.7 --- diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/CdmMetaData.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/CdmMetaData.java index dac6132a86..196cfabc85 100644 --- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/CdmMetaData.java +++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/metadata/CdmMetaData.java @@ -46,10 +46,9 @@ public class CdmMetaData extends CdmBase{ * be handled by SCHEMA_VALIDATION.UPDATE * The last number represents the date of change. */ -// private static final String dbSchemaVersion = "3.6.0.0.201527040000"; // private static final String dbSchemaVersion = "4.0.0.0.201604200000"; - private static final String dbSchemaVersion = "4.1.0.0.201607300000"; - +// private static final String dbSchemaVersion = "4.1.0.0.201607300000"; + private static final String dbSchemaVersion = "4.7.0.0.201710040000"; diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/CdmUpdater.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/CdmUpdater.java index bbe9459131..c3857b2992 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/CdmUpdater.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/CdmUpdater.java @@ -17,8 +17,8 @@ import eu.etaxonomy.cdm.common.monitor.DefaultProgressMonitor; import eu.etaxonomy.cdm.common.monitor.IProgressMonitor; import eu.etaxonomy.cdm.database.CdmDataSource; import eu.etaxonomy.cdm.database.ICdmDataSource; -import eu.etaxonomy.cdm.database.update.v40_41.SchemaUpdater_40_41; import eu.etaxonomy.cdm.database.update.v40_41.TermUpdater_40_41; +import eu.etaxonomy.cdm.database.update.v41_47.SchemaUpdater_41_47; import eu.etaxonomy.cdm.model.metadata.CdmMetaData; /** @@ -84,7 +84,7 @@ public class CdmUpdater { * @return */ private ISchemaUpdater getCurrentSchemaUpdater() { - return SchemaUpdater_40_41.NewInstance(); + return SchemaUpdater_41_47.NewInstance(); } /** diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v40_41/SchemaUpdater_40_41.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v40_41/SchemaUpdater_40_41.java index 909e08f4b7..d7dd7c9163 100644 --- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v40_41/SchemaUpdater_40_41.java +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v40_41/SchemaUpdater_40_41.java @@ -27,6 +27,7 @@ import eu.etaxonomy.cdm.database.update.SimpleSchemaUpdaterStep; import eu.etaxonomy.cdm.database.update.SortIndexUpdater; import eu.etaxonomy.cdm.database.update.TableDroper; import eu.etaxonomy.cdm.database.update.v36_40.SchemaUpdater_36_40; +import eu.etaxonomy.cdm.database.update.v41_47.SchemaUpdater_41_47; /** * @author a.mueller @@ -488,7 +489,7 @@ public class SchemaUpdater_40_41 extends SchemaUpdaterBase { @Override public ISchemaUpdater getNextUpdater() { - return null; + return SchemaUpdater_41_47.NewInstance(); } @Override diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v41_47/SchemaUpdater_41_47.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v41_47/SchemaUpdater_41_47.java new file mode 100644 index 0000000000..765e576989 --- /dev/null +++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v41_47/SchemaUpdater_41_47.java @@ -0,0 +1,118 @@ +/** + * Copyright (C) 2007 EDIT + * European Distributed Institute of Taxonomy + * http://www.e-taxonomy.eu + * + * The contents of this file are subject to the Mozilla Public License Version 1.1 + * See LICENSE.TXT at the top of this package for the full license terms. + */ + +package eu.etaxonomy.cdm.database.update.v41_47; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.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.IndexAdder; +import eu.etaxonomy.cdm.database.update.LanguageStringTableCreator; +import eu.etaxonomy.cdm.database.update.SchemaUpdaterBase; +import eu.etaxonomy.cdm.database.update.v40_41.NomenclaturalCodeUpdater; +import eu.etaxonomy.cdm.database.update.v40_41.SchemaUpdater_40_41; + +/** + * @author a.mueller + * @created 16.04.2016 + */ +public class SchemaUpdater_41_47 extends SchemaUpdaterBase { + + @SuppressWarnings("unused") + private static final Logger logger = Logger.getLogger(SchemaUpdater_41_47.class); + private static final String endSchemaVersion = "4.1.0.0.201607300000"; + private static final String startSchemaVersion = "4.0.0.0.201604200000"; + + // ********************** FACTORY METHOD ************************************* + + public static SchemaUpdater_41_47 NewInstance() { + return new SchemaUpdater_41_47(); + } + + /** + * @param startSchemaVersion + * @param endSchemaVersion + */ + protected SchemaUpdater_41_47() { + super(startSchemaVersion, endSchemaVersion); + } + + @Override + protected List getUpdaterList() { + + String stepName; + String tableName; + ISchemaUpdaterStep step; + String query; + String newColumnName; + String oldColumnName; + + List stepList = new ArrayList(); + + + //#3658 update nomenclatural code + NomenclaturalCodeUpdater.NewInstance(stepList); + + //#5970 + //Implement allowOverride in CdmPreference + stepName = "Add allowOverride in CdmPreference"; + tableName = "CdmPreference"; + newColumnName = "allowOverride"; + step = ColumnAdder.NewBooleanInstance(stepName, tableName, newColumnName, ! INCLUDE_AUDIT, false); + stepList.add(step); + + //#5875 + //Implement isDefault to DescriptionBase + stepName = "Add isDefault in DescriptionBase"; + tableName = "DescriptionBase"; + newColumnName = "isDefault"; + step = ColumnAdder.NewBooleanInstance(stepName, tableName, newColumnName, INCLUDE_AUDIT, false); + stepList.add(step); + + + //index + stepName = "Add identityCache index"; + tableName = "SpecimenOrObservationBase"; + newColumnName = "identityCache"; + step = IndexAdder.NewInstance(stepName, tableName, newColumnName, null); + stepList.add(step); + + stepName = "Add protectedIdentityCache"; + tableName = "SpecimenOrObservationBase"; + newColumnName = "protectedIdentityCache"; + step = ColumnAdder.NewBooleanInstance(stepName, tableName, newColumnName, INCLUDE_AUDIT, false); + stepList.add(step); + + //#5634 Add excluded note + stepName = "Add excluded note"; + tableName = "TaxonNode"; + String attributeName = "excludedNote"; + step = LanguageStringTableCreator.NewLanguageStringInstance(stepName, tableName, attributeName, INCLUDE_AUDIT); + stepList.add(step); + + return stepList; + } + + + @Override + public ISchemaUpdater getNextUpdater() { + return null; + } + + @Override + public ISchemaUpdater getPreviousUpdater() { + return SchemaUpdater_40_41.NewInstance(); + } + +}