Project

General

Profile

« Previous | Next » 

Revision 6b34400c

Added by Andreas Müller over 2 years ago

minor and cleanup

View differences:

cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java
129 129

  
130 130
    @XmlElementWrapper(name = "Rights", nillable = true)
131 131
    @XmlElement(name = "Rights")
132
    @ManyToMany(fetch = FetchType.LAZY /*, orphanRemoval=false*/)  //#5762 M:N now
132
    @ManyToMany(fetch = FetchType.LAZY)  //#5762 M:N now
133 133
    @Cascade({CascadeType.SAVE_UPDATE, CascadeType.MERGE})
134 134
    //TODO
135 135
    @Merge(MergeMode.ADD_CLONE)
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/v525_527/SchemaUpdater_5251_5270.java
75 75
		ColumnAdder.NewStringInstance(stepList, stepName, tableName, newColumnName, INCLUDE_AUDIT);
76 76

  
77 77
		//update where rank = CultivarGroup
78
		stepName = "Update rank = cultivarGroup";
78 79
		String sql = "UPDATE @@TaxonName@@ "
79 80
		        + " SET cultivarGroupEpithet = cultivarEpithet,  cultivarEpithet = null "
80 81
		        + " WHERE rank_id IN (SELECT id FROM @@DefinedTermBase@@ r WHERE r.uuid = 'd763e7d3-e7de-4bb1-9d75-225ca6948659')";

Also available in: Unified diff