Merge branch 'icat-schema-extension-affiliation' into icat-schema-extension

Author: RKrahl

src/main/java/org/icatproject/core/entity/Affiliation.java

@@ -20,10 +20,14 @@ public class Affiliation extends EntityBaseBean implements Serializable {
 	@ManyToOne(fetch = FetchType.LAZY)
 	private DataPublicationUser user;
 
-	@Comment("Name and optionally address of the affiliation")
-	@Column(name = "NAME", nullable = false, length = 511)
+	@Comment("An internal name for that affiliation entry, possibly the organization name")
+	@Column(name = "NAME", nullable = false, length = 255)
 	private String name;
 
+	@Comment("The full reference of the affiliation, optionally including street address and department, as it should appear in the publication")
+	@Column(length = 1023)
+	private String fullReference;
+
 	@Comment("Identifier such as ROR or ISNI")
 	private String pid;
 
@@ -39,6 +43,10 @@ public String getName() {
 		return name;
 	}
 
+	public String getFullReference() {
+		return fullReference;
+	}
+
 	public String getPid() {
 		return pid;
 	}
@@ -51,6 +59,10 @@ public void setName(String name) {
 		this.name = name;
 	}
 
+	public void setFullReference(String fullReference) {
+		this.fullReference = fullReference;
+	}
+
 	public void setPid(String pid) {
 		this.pid = pid;
 	}

src/main/scripts/upgrade_mysql_5_0.sql

@@ -105,9 +105,10 @@ CREATE TABLE AFFILIATION (
 	ID BIGINT NOT NULL AUTO_INCREMENT,
 	CREATE_ID VARCHAR(255) NOT NULL,
 	CREATE_TIME DATETIME NOT NULL,
+	FULLREFERENCE varchar(1023) DEFAULT NULL,
 	MOD_ID VARCHAR(255) NOT NULL,
 	MOD_TIME DATETIME NOT NULL,
-	NAME VARCHAR(511) NOT NULL,
+	NAME VARCHAR(255) NOT NULL,
 	PID VARCHAR(255),
 	DATAPUBLICATIONUSER_ID BIGINT NOT NULL,
 	PRIMARY KEY (ID)

src/main/scripts/upgrade_oracle_5_0.sql

@@ -105,9 +105,10 @@ CREATE TABLE AFFILIATION (
 	ID NUMBER(19) NOT NULL,
 	CREATE_ID VARCHAR2(255) NOT NULL,
 	CREATE_TIME TIMESTAMP NOT NULL,
+	FULLREFERENCE VARCHAR2(1023),
 	MOD_ID VARCHAR2(255) NOT NULL,
 	MOD_TIME TIMESTAMP NOT NULL,
-	NAME VARCHAR2(511) NOT NULL,
+	NAME VARCHAR2(255) NOT NULL,
 	PID VARCHAR2(255),
 	DATAPUBLICATIONUSER_ID NUMBER(19) NOT NULL,
 	PRIMARY KEY (ID)