Commit 8ea9fa8e authored by Yiming Liu's avatar Yiming Liu

Add explict column name for entity

parent 3f7016ef
...@@ -2,25 +2,27 @@ package com.ctrip.apollo.biz.entity; ...@@ -2,25 +2,27 @@ package com.ctrip.apollo.biz.entity;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table;
import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where; import org.hibernate.annotations.Where;
@Entity @Entity
@Table(name = "App")
@SQLDelete(sql = "Update App set isDeleted = 1 where id = ?") @SQLDelete(sql = "Update App set isDeleted = 1 where id = ?")
@Where(clause = "isDeleted = 0") @Where(clause = "isDeleted = 0")
public class App extends BaseEntity { public class App extends BaseEntity {
@Column(nullable = false) @Column(name = "Name", nullable = false)
private String name; private String name;
@Column(nullable = false) @Column(name = "AppId", nullable = false)
private String appId; private String appId;
@Column(nullable = false) @Column(name = "OwnerName", nullable = false)
private String ownerName; private String ownerName;
@Column(nullable = false) @Column(name = "OnwerEmail", nullable = false)
private String ownerEmail; private String ownerEmail;
public String getAppId() { public String getAppId() {
......
...@@ -2,22 +2,24 @@ package com.ctrip.apollo.biz.entity; ...@@ -2,22 +2,24 @@ package com.ctrip.apollo.biz.entity;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table;
import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where; import org.hibernate.annotations.Where;
@Entity @Entity
@Table(name = "AppNamespace")
@SQLDelete(sql = "Update AppNamespace set isDeleted = 1 where id = ?") @SQLDelete(sql = "Update AppNamespace set isDeleted = 1 where id = ?")
@Where(clause = "isDeleted = 0") @Where(clause = "isDeleted = 0")
public class AppNamespace extends BaseEntity{ public class AppNamespace extends BaseEntity {
@Column(nullable = false) @Column(name = "Name", nullable = false)
private String name; private String name;
@Column(nullable = false) @Column(name = "AppId", nullable = false)
private String appId; private String appId;
@Column @Column(name = "Comment")
private String comment; private String comment;
public String getAppId() { public String getAppId() {
......
...@@ -18,9 +18,10 @@ public abstract class BaseEntity { ...@@ -18,9 +18,10 @@ public abstract class BaseEntity {
@Id @Id
@GeneratedValue @GeneratedValue
@Column(name = "Id")
private long id; private long id;
@Column(name = "IsDeleted", columnDefinition="Bit default '0'") @Column(name = "IsDeleted", columnDefinition = "Bit default '0'")
protected boolean isDeleted = false; protected boolean isDeleted = false;
@Column(name = "DataChange_CreatedBy") @Column(name = "DataChange_CreatedBy")
......
...@@ -2,6 +2,7 @@ package com.ctrip.apollo.biz.entity; ...@@ -2,6 +2,7 @@ package com.ctrip.apollo.biz.entity;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table;
import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where; import org.hibernate.annotations.Where;
...@@ -10,14 +11,15 @@ import org.hibernate.annotations.Where; ...@@ -10,14 +11,15 @@ import org.hibernate.annotations.Where;
* @author Jason Song(song_s@ctrip.com) * @author Jason Song(song_s@ctrip.com)
*/ */
@Entity @Entity
@Table(name = "Cluster")
@SQLDelete(sql = "Update Cluster set isDeleted = 1 where id = ?") @SQLDelete(sql = "Update Cluster set isDeleted = 1 where id = ?")
@Where(clause = "isDeleted = 0") @Where(clause = "isDeleted = 0")
public class Cluster extends BaseEntity { public class Cluster extends BaseEntity {
@Column(nullable = false) @Column(name = "Name", nullable = false)
private String name; private String name;
@Column(nullable = false) @Column(name = "AppId", nullable = false)
private String appId; private String appId;
public String getAppId() { public String getAppId() {
......
...@@ -2,28 +2,30 @@ package com.ctrip.apollo.biz.entity; ...@@ -2,28 +2,30 @@ package com.ctrip.apollo.biz.entity;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table;
import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where; import org.hibernate.annotations.Where;
@Entity @Entity
@Table(name = "Item")
@SQLDelete(sql = "Update Item set isDeleted = 1 where id = ?") @SQLDelete(sql = "Update Item set isDeleted = 1 where id = ?")
@Where(clause = "isDeleted = 0") @Where(clause = "isDeleted = 0")
public class Item extends BaseEntity { public class Item extends BaseEntity {
@Column(nullable = false) @Column(name = "NamespaceId", nullable = false)
private long namespaceId; private long namespaceId;
@Column(nullable = false) @Column(name = "key", nullable = false)
private String key; private String key;
@Column @Column(name = "value")
private String value; private String value;
@Column @Column(name = "comment")
private String comment; private String comment;
@Column @Column(name = "LineNum")
private Integer lineNum; private Integer lineNum;
public String getComment() { public String getComment() {
......
...@@ -2,22 +2,24 @@ package com.ctrip.apollo.biz.entity; ...@@ -2,22 +2,24 @@ package com.ctrip.apollo.biz.entity;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table;
import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where; import org.hibernate.annotations.Where;
@Entity @Entity
@Table(name = "Namespace")
@SQLDelete(sql = "Update Namespace set isDeleted = 1 where id = ?") @SQLDelete(sql = "Update Namespace set isDeleted = 1 where id = ?")
@Where(clause = "isDeleted = 0") @Where(clause = "isDeleted = 0")
public class Namespace extends BaseEntity { public class Namespace extends BaseEntity {
@Column(nullable = false) @Column(name = "appId", nullable = false)
private String appId; private String appId;
@Column(nullable = false) @Column(name = "ClusterName", nullable = false)
private String clusterName; private String clusterName;
@Column(nullable = false) @Column(name = "NamespaceName", nullable = false)
private String namespaceName; private String namespaceName;
public String getAppId() { public String getAppId() {
......
...@@ -2,22 +2,24 @@ package com.ctrip.apollo.biz.entity; ...@@ -2,22 +2,24 @@ package com.ctrip.apollo.biz.entity;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table;
import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where; import org.hibernate.annotations.Where;
@Entity @Entity
@Table(name = "Privilege")
@SQLDelete(sql = "Update Privilege set isDeleted = 1 where id = ?") @SQLDelete(sql = "Update Privilege set isDeleted = 1 where id = ?")
@Where(clause = "isDeleted = 0") @Where(clause = "isDeleted = 0")
public class Privilege extends BaseEntity { public class Privilege extends BaseEntity {
@Column @Column(name = "Name", nullable = false)
private String name; private String name;
@Column @Column(name = "PrivilType", nullable = false)
private String privilType; private String privilType;
@Column @Column(name = "NamespaceId")
private long namespaceId; private long namespaceId;
public String getName() { public String getName() {
......
...@@ -6,32 +6,34 @@ import org.hibernate.annotations.Where; ...@@ -6,32 +6,34 @@ import org.hibernate.annotations.Where;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Lob; import javax.persistence.Lob;
import javax.persistence.Table;
/** /**
* @author Jason Song(song_s@ctrip.com) * @author Jason Song(song_s@ctrip.com)
*/ */
@Entity @Entity
@Table(name = "Release")
@SQLDelete(sql = "Update Release set isDeleted = 1 where id = ?") @SQLDelete(sql = "Update Release set isDeleted = 1 where id = ?")
@Where(clause = "isDeleted = 0") @Where(clause = "isDeleted = 0")
public class Release extends BaseEntity { public class Release extends BaseEntity {
@Column(nullable = false) @Column(name = "Name", nullable = false)
private String name; private String name;
@Column(nullable = false) @Column(name = "AppId", nullable = false)
private String appId; private String appId;
@Column(nullable = false) @Column(name = "ClusterName", nullable = false)
private String clusterName; private String clusterName;
@Column @Column(name = "NamespaceName", nullable = false)
private String namespaceName; private String namespaceName;
@Column(nullable = false) @Column(name = "Configurations", nullable = false)
@Lob @Lob
private String configurations; private String configurations;
@Column(nullable = false) @Column(name = "Comment", nullable = false)
private String comment; private String comment;
public String getAppId() { public String getAppId() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment