DMC/scipro
7
0
Fork 0
Code Issues43 Pull Requests6 Actions Projects1 Releases Wiki Activity

added unit sql to current.sql and added unit attribute to role entity

Browse Source
This commit is contained in:
fred-fri 2012-05-29 11:29:42 +09:00
parent 3982f6798c
commit 18780cf425
2 changed files with 19 additions and 10 deletions
resources/db_update_scripts
current.sql
src/main/java/se/su/dsv/scipro/data/dataobjects
Role.java

8
resources/db_update_scripts/current.sql

@ -0,0 +1,8 @@
CREATE TABLE IF NOT EXISTS unit (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`identifier` bigint(20) DEFAULT NULL,
`title` varchar(255) NOT NULL,
`version` int(4) NOT NULL DEFAULT '0',
PRIMARY KEY (`id`),
UNIQUE KEY `identifier` (`identifier`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=2925 ;

21
src/main/java/se/su/dsv/scipro/data/dataobjects/Role.java

@ -1,15 +1,6 @@
package se.su.dsv.scipro.data.dataobjects;
import javax.persistence.DiscriminatorColumn;
import javax.persistence.DiscriminatorType;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Inheritance;
import javax.persistence.InheritanceType;
import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
import javax.persistence.*;
@Entity
@DiscriminatorColumn(name = "rolename", discriminatorType = DiscriminatorType.STRING, length = 8)
@ -26,6 +17,9 @@ public abstract class Role extends LazyDeletableDomainObject implements Comparab
@ManyToOne(optional=false)
protected User user;
@OneToOne(optional=true)
private Unit unit;
/**
* @param id the id to set
*/
@ -128,4 +122,11 @@ public abstract class Role extends LazyDeletableDomainObject implements Comparab
return comp;
}
public Unit getUnit() {
return unit;
}
public void setUnit(Unit unit) {
this.unit = unit;
}
}