Project

General

Profile

« Previous | Next » 

Revision 432e932d

Added by Andreas Müller almost 6 years ago

fix #7096 Add second symbol attribute to DefinedTermBase

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java
177 177
    //empty string is explicitly allowed and should be distinguished from NULL!
178 178
    private String symbol;
179 179

  
180
    @XmlElement(name = "symbol2")
181
    @Column(length=30)
182
    //the second symbol to be used in String representations for this term #7096
183
    //this term can be changed by the database instance even if the term is not managed by this instance as it is only for representation and has no semantic or identifying character
184
    //empty string is explicitly allowed and should be distinguished from NULL!
185
    private String symbol2;
186

  
180 187
//***************************** CONSTRUCTOR *******************************************/
181 188

  
182 189
    //for javassit only
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/RelationshipTermBase.java
87 87
    @XmlElement(name = "inverseSymbol")
88 88
    @Column(length=30)
89 89
    //the symbol to be used in String representations for the reverse representation of this term #5734
90
    //this term can be changed by the database instance even if the term is not managed by this instance as it is only for representation and has no semantic or identifying character
90
    //this term can be changed by the database instance even if the term is not managed by this instance
91
    //as it is only for representation and has no semantic or identifying character
91 92
    //empty string is explicitly allowed and should be distinguished from NULL!
92 93
    private String inverseSymbol;
93 94

  
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v47_49/SchemaUpdater_47_49.java
15 15

  
16 16
import org.apache.log4j.Logger;
17 17

  
18
import eu.etaxonomy.cdm.database.update.ColumnAdder;
18 19
import eu.etaxonomy.cdm.database.update.ISchemaUpdater;
19 20
import eu.etaxonomy.cdm.database.update.ISchemaUpdaterStep;
20 21
import eu.etaxonomy.cdm.database.update.SchemaUpdaterBase;
......
73 74
		step = SimpleSchemaUpdaterStep.NewAuditedInstance(stepName, query, tableName, -99);
74 75
		stepList.add(step);
75 76

  
77
		//#7096 Add second symbol attribute to DefinedTermBase
78
		stepName = "Add second symbol to DefinedTermBase";
79
		tableName = "DefinedTermBase";
80
		newColumnName = "symbol2";
81
		int length = 30;
82
		step = ColumnAdder.NewStringInstance(stepName, tableName, newColumnName, length, INCLUDE_AUDIT);
83
		stepList.add(step);
84

  
85

  
86

  
76 87
//        //#5149 remove unique index on Sequence_Reference.citations_id
77 88
//        tableName = "Sequence_Reference";
78 89
//        String columnName = "citations_id";
cdmlib-test/src/main/resources/dbscripts/001-cdm.h2.sql
909 909
    TERMTYPE VARCHAR(4),
910 910
    IDINVOCABULARY VARCHAR(255),
911 911
	SYMBOL VARCHAR(30),
912
	SYMBOL2 VARCHAR(30),
912 913
	INVERSESYMBOL VARCHAR(30),
913 914
    LSID_AUTHORITY VARCHAR(255),
914 915
    LSID_LSID VARCHAR(255),
......
964 965
    TERMTYPE VARCHAR(4),
965 966
    IDINVOCABULARY VARCHAR(255),
966 967
	SYMBOL VARCHAR(30),
968
	SYMBOL2 VARCHAR(30),
967 969
	INVERSESYMBOL VARCHAR(30),
968 970
    LSID_AUTHORITY VARCHAR(255),
969 971
    LSID_LSID VARCHAR(255),

Also available in: Unified diff