提供pg风格建表sql并适配代码

xiao0yy · Jul 25, 2018 · 62ffab4 · 62ffab4
1 parent 03825fa
commit 62ffab4
Show file tree

Hide file tree

Showing 53 changed files with 938 additions and 276 deletions.
diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Audit.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Audit.java
@@ -7,28 +7,30 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 @Entity
-@Table(name = "Audit")
-@SQLDelete(sql = "Update Audit set isDeleted = 1 where id = ?")
-@Where(clause = "isDeleted = 0")
+@Table(name = "audit")
+@SQLDelete(sql = "UPDATE audit SET deleted = TRUE WHERE id = ?")
+@Where(clause = "NOT deleted")
+@SequenceGenerator(name = "sequence", sequenceName = "audit_id_seq", allocationSize = 1)
 public class Audit extends BaseEntity {
 
   public enum OP {
     INSERT, UPDATE, DELETE
   }
 
-  @Column(name = "EntityName", nullable = false)
+  @Column(name = "entity_name", nullable = false)
   private String entityName;
 
-  @Column(name = "EntityId")
+  @Column(name = "entity_id")
   private Long entityId;
 
-  @Column(name = "OpName", nullable = false)
+  @Column(name = "op_name", nullable = false)
   private String opName;
 
-  @Column(name = "Comment")
+  @Column(name = "comment")
   private String comment;
 
   public String getComment() {

diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Cluster.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Cluster.java
@@ -7,24 +7,26 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 /**
  * @author Jason Song([email protected])
  */
 @Entity
-@Table(name = "Cluster")
-@SQLDelete(sql = "Update Cluster set isDeleted = 1 where id = ?")
-@Where(clause = "isDeleted = 0")
+@Table(name = "cluster")
+@SQLDelete(sql = "UPDATE cluster SET deleted = TRUE WHERE id = ?")
+@Where(clause = "NOT deleted")
+@SequenceGenerator(name = "sequence", sequenceName = "cluster_id_seq", allocationSize = 1)
 public class Cluster extends BaseEntity implements Comparable<Cluster> {
 
-  @Column(name = "Name", nullable = false)
+  @Column(name = "cluster_name", nullable = false)
   private String name;
 
-  @Column(name = "AppId", nullable = false)
+  @Column(name = "app_id", nullable = false)
   private String appId;
 
-  @Column(name = "ParentClusterId", nullable = false)
+  @Column(name = "parent_cluster_id", nullable = false)
   private long parentClusterId;
 
   public String getAppId() {

diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Commit.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Commit.java
@@ -7,29 +7,29 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Lob;
+import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 @Entity
-@Table(name = "Commit")
-@SQLDelete(sql = "Update Commit set isDeleted = 1 where id = ?")
-@Where(clause = "isDeleted = 0")
+@Table(name = "commit")
+@SQLDelete(sql = "UPDATE commit SET deleted = TRUE WHERE id = ?")
+@Where(clause = "NOT deleted")
+@SequenceGenerator(name = "sequence", sequenceName = "commit_id_seq", allocationSize = 1)
 public class Commit extends BaseEntity {
 
-  @Lob
-  @Column(name = "ChangeSets", nullable = false)
+  @Column(name = "change_sets", nullable = false)
   private String changeSets;
 
-  @Column(name = "AppId", nullable = false)
+  @Column(name = "app_id", nullable = false)
   private String appId;
 
-  @Column(name = "ClusterName", nullable = false)
+  @Column(name = "cluster_name", nullable = false)
   private String clusterName;
 
-  @Column(name = "NamespaceName", nullable = false)
+  @Column(name = "namespace_name", nullable = false)
   private String namespaceName;
 
-  @Column(name = "Comment")
+  @Column(name = "comment")
   private String comment;
 
   public String getChangeSets() {

diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/GrayReleaseRule.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/GrayReleaseRule.java
@@ -7,33 +7,35 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 @Entity
-@Table(name = "GrayReleaseRule")
-@SQLDelete(sql = "Update GrayReleaseRule set isDeleted = 1 where id = ?")
-@Where(clause = "isDeleted = 0")
+@Table(name = "gray_release_rule")
+@SQLDelete(sql = "UPDATE gray_release_rule SET deleted = TRUE WHERE id = ?")
+@Where(clause = "NOT deleted")
+@SequenceGenerator(name = "sequence", sequenceName = "gray_release_rule_id_seq", allocationSize = 1)
 public class GrayReleaseRule extends BaseEntity{
 
-  @Column(name = "appId", nullable = false)
+  @Column(name = "app_id", nullable = false)
   private String appId;
 
-  @Column(name = "ClusterName", nullable = false)
+  @Column(name = "cluster_name", nullable = false)
   private String clusterName;
 
-  @Column(name = "NamespaceName", nullable = false)
+  @Column(name = "namespace_name", nullable = false)
   private String namespaceName;
 
-  @Column(name = "BranchName", nullable = false)
+  @Column(name = "branch_name", nullable = false)
   private String branchName;
 
-  @Column(name = "Rules")
+  @Column(name = "rules")
   private String rules;
 
-  @Column(name = "releaseId", nullable = false)
+  @Column(name = "release_id", nullable = false)
   private Long releaseId;
 
-  @Column(name = "BranchStatus", nullable = false)
+  @Column(name = "branch_status", nullable = false)
   private int branchStatus;
 
   public String getAppId() {

diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Instance.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Instance.java
@@ -9,35 +9,38 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.PrePersist;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.GenerationType;
 import javax.persistence.Table;
 
 /**
  * @author Jason Song([email protected])
  */
 @Entity
-@Table(name = "Instance")
+@Table(name = "instance")
+@SequenceGenerator(name = "sequence", sequenceName = "instance_id_seq", allocationSize = 1)
 public class Instance {
   @Id
-  @GeneratedValue
-  @Column(name = "Id")
+  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sequence")
+  @Column(name = "id")
   private long id;
 
-  @Column(name = "AppId", nullable = false)
+  @Column(name = "app_id", nullable = false)
   private String appId;
 
-  @Column(name = "ClusterName", nullable = false)
+  @Column(name = "cluster_name", nullable = false)
   private String clusterName;
 
-  @Column(name = "DataCenter", nullable = false)
+  @Column(name = "data_center", nullable = false)
   private String dataCenter;
 
-  @Column(name = "Ip", nullable = false)
+  @Column(name = "ip", nullable = false)
   private String ip;
 
-  @Column(name = "DataChange_CreatedTime", nullable = false)
+  @Column(name = "created_time", nullable = false)
   private Date dataChangeCreatedTime;
 
-  @Column(name = "DataChange_LastTime")
+  @Column(name = "last_modified_time")
   private Date dataChangeLastModifiedTime;
 
   @PrePersist

diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/InstanceConfig.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/InstanceConfig.java
@@ -10,41 +10,44 @@
 import javax.persistence.Id;
 import javax.persistence.PrePersist;
 import javax.persistence.PreUpdate;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.GenerationType;
 import javax.persistence.Table;
 
 /**
  * @author Jason Song([email protected])
  */
 @Entity
-@Table(name = "InstanceConfig")
+@Table(name = "instance_config")
+@SequenceGenerator(name = "sequence", sequenceName = "instance_config_id_seq", allocationSize = 1)
 public class InstanceConfig {
   @Id
-  @GeneratedValue
-  @Column(name = "Id")
+  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "sequence")
+  @Column(name = "id")
   private long id;
 
-  @Column(name = "InstanceId")
+  @Column(name = "instance_id")
   private long instanceId;
 
-  @Column(name = "ConfigAppId", nullable = false)
+  @Column(name = "config_app_id", nullable = false)
   private String configAppId;
 
-  @Column(name = "ConfigClusterName", nullable = false)
+  @Column(name = "config_cluster_name", nullable = false)
   private String configClusterName;
 
-  @Column(name = "ConfigNamespaceName", nullable = false)
+  @Column(name = "config_namespace_name", nullable = false)
   private String configNamespaceName;
 
-  @Column(name = "ReleaseKey", nullable = false)
+  @Column(name = "release_key", nullable = false)
   private String releaseKey;
 
-  @Column(name = "ReleaseDeliveryTime", nullable = false)
+  @Column(name = "release_delivery_time", nullable = false)
   private Date releaseDeliveryTime;
 
-  @Column(name = "DataChange_CreatedTime", nullable = false)
+  @Column(name = "created_time", nullable = false)
   private Date dataChangeCreatedTime;
 
-  @Column(name = "DataChange_LastTime")
+  @Column(name = "last_modified_time")
   private Date dataChangeLastModifiedTime;
 
   @PrePersist

diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Item.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Item.java
@@ -7,29 +7,29 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.Lob;
+import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 @Entity
-@Table(name = "Item")
-@SQLDelete(sql = "Update Item set isDeleted = 1 where id = ?")
-@Where(clause = "isDeleted = 0")
+@Table(name = "item")
+@SQLDelete(sql = "UPDATE item SET deleted = TRUE WHERE id = ?")
+@Where(clause = "NOT deleted")
+@SequenceGenerator(name = "sequence", sequenceName = "item_id_seq", allocationSize = 1)
 public class Item extends BaseEntity {
 
-  @Column(name = "NamespaceId", nullable = false)
+  @Column(name = "namespace_id", nullable = false)
   private long namespaceId;
 
   @Column(name = "key", nullable = false)
   private String key;
 
   @Column(name = "value")
-  @Lob
   private String value;
 
   @Column(name = "comment")
   private String comment;
 
-  @Column(name = "LineNum")
+  @Column(name = "line_num")
   private Integer lineNum;
 
   public String getComment() {

diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Namespace.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Namespace.java
@@ -7,21 +7,23 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 @Entity
-@Table(name = "Namespace")
-@SQLDelete(sql = "Update Namespace set isDeleted = 1 where id = ?")
-@Where(clause = "isDeleted = 0")
+@Table(name = "namespace")
+@SQLDelete(sql = "UPDATE namespace SET deleted = TRUE WHERE id = ?")
+@Where(clause = "NOT deleted")
+@SequenceGenerator(name = "sequence", sequenceName = "namespace_id_seq", allocationSize = 1)
 public class Namespace extends BaseEntity {
 
-  @Column(name = "appId", nullable = false)
+  @Column(name = "app_id", nullable = false)
   private String appId;
 
-  @Column(name = "ClusterName", nullable = false)
+  @Column(name = "cluster_name", nullable = false)
   private String clusterName;
 
-  @Column(name = "NamespaceName", nullable = false)
+  @Column(name = "namespace_name", nullable = false)
   private String namespaceName;
 
   public Namespace(){

diff --git a/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/NamespaceLock.java b/apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/NamespaceLock.java
@@ -6,14 +6,16 @@
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
 @Entity
-@Table(name = "NamespaceLock")
-@Where(clause = "isDeleted = 0")
+@Table(name = "namespace_lock")
+@Where(clause = "NOT deleted")
+@SequenceGenerator(name = "sequence", sequenceName = "namespace_lock_id_seq", allocationSize = 1)
 public class NamespaceLock extends BaseEntity{
 
-  @Column(name = "NamespaceId")
+  @Column(name = "namespace_id")
   private long namespaceId;
 
   public long getNamespaceId() {