Project

General

Profile

Revision 19bb1cb2

ID19bb1cb24a81ef125e254d68ea1d60cd530a48e9
Parent a9212ceb
Child e73de755

Added by Andreas Müller about 1 year ago

ref #6581 add TaxonName.nomenclaturalSource_id and adapt constructor visibility for DescriptionElementSource

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementSource.java
127 127
//*********************** CONSTRUCTOR ******************************/
128 128

  
129 129
	//for hibernate use only
130
	private DescriptionElementSource(){
130
	/**
131
	 * @deprecated for internal use only
132
	 */
133
	@Deprecated
134
	protected DescriptionElementSource(){
131 135
		super();
132 136
	}
133 137

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

  
66 66
		List<ISchemaUpdaterStep> stepList = new ArrayList<>();
67 67

  
68
        //#6581 make nomenclatural reference and OriginalSource
69
        stepName = "Make nomenclatural reference and OriginalSource";
70
        tableName = "TaxonName";
71
        newColumnName = "nomenclaturalSource_id";
72
        String referencedTable = "OriginalSourceBase";
73
        step = ColumnAdder.NewIntegerInstance(stepName, tableName, newColumnName, INCLUDE_AUDIT, !NOT_NULL, referencedTable);
74
        stepList.add(step);
75

  
68 76
		//#7109 nom. valid => nom. val.
69 77
		stepName = "nom valid => nom. val. (abbrevLabel)";
70 78
		UUID uuidTerm = UUID.fromString("bd036217-5499-4ccd-8f4c-72e06158db93");
......
174 182
        stepName = "Add combination 'in'-author";
175 183
        tableName = "TaxonName";
176 184
        newColumnName = "inCombinationAuthorship_id";
177
        String referencedTable = "AgentBase";
185
        referencedTable = "AgentBase";
178 186
        step = ColumnAdder.NewIntegerInstance(stepName, tableName, newColumnName, INCLUDE_AUDIT, !NOT_NULL, referencedTable);
179 187
        stepList.add(step);
180 188

  
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmGenericDaoImplTest.java
192 192
    @SpringBeanByType
193 193
    private IReferenceDao referenceDao;
194 194

  
195
	/**
196
	 * @throws java.lang.Exception
197
	 */
198 195
	@Before
199 196
	public void setUp() throws Exception {}
200 197

  
cdmlib-test/src/main/resources/dbscripts/001-cdm.h2.sql
4487 4487
    EXBASIONYMAUTHORSHIP_ID INTEGER,
4488 4488
    EXCOMBINATIONAUTHORSHIP_ID INTEGER,
4489 4489
    INBASIONYMAUTHORSHIP_ID INTEGER,
4490
    INCOMBINATIONAUTHORSHIP_ID INTEGER
4490
    INCOMBINATIONAUTHORSHIP_ID INTEGER,
4491
	NOMENCLATURALSOURCE_ID INTEGER
4491 4492
);
4492 4493
-- 0 +/- SELECT COUNT(*) FROM PUBLIC.TAXONNAME;
4493 4494
CREATE INDEX PUBLIC.TAXONNAMEBASETITLECACHEINDEX ON PUBLIC.TAXONNAME(TITLECACHE);
......
4543 4544
    NAMEAPPROBATION VARCHAR(255),
4544 4545
    SUBGENUSAUTHORSHIP VARCHAR(255),
4545 4546
    INBASIONYMAUTHORSHIP_ID INTEGER,
4546
    INCOMBINATIONAUTHORSHIP_ID INTEGER
4547
    INCOMBINATIONAUTHORSHIP_ID INTEGER,
4548
	NOMENCLATURALSOURCE_ID INTEGER
4547 4549
);
4548 4550
-- 0 +/- SELECT COUNT(*) FROM PUBLIC.TAXONNAME_AUD;
4549 4551
CREATE CACHED TABLE PUBLIC.TAXONNAME_ANNOTATION(

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)