[Multi-Database Support] Optimize table case sensitivity

CHANGES.md

@@ -12,6 +12,7 @@ Apollo 2.2.0
 * [[Multi-Database Support] Without Reliance on globally_quoted_identifiers Variable](https://github.com/apolloconfig/apollo/pull/4749)
 * [[Multi-Database Support] Without Reliance on boolean integer compare](https://github.com/apolloconfig/apollo/pull/4757)
 * [[Multi-Database Support] package postgre h2 dependency](https://github.com/apolloconfig/apollo/pull/4757)
+* [[Multi-Database Support] Optimize table case](https://github.com/apolloconfig/apollo/pull/4768)
 
 ------------------
 All issues and pull requests are [here](https://github.com/apolloconfig/apollo/milestone/13?closed=1)

apollo-adminservice/src/test/resources/application.properties

@@ -17,7 +17,7 @@ spring.cloud.consul.enabled=false
 spring.cloud.zookeeper.enabled=false
 spring.cloud.discovery.enabled=false
 
-spring.datasource.url = jdbc:h2:mem:~/apolloconfigdb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1;BUILTIN_ALIAS_OVERRIDE=TRUE
+spring.datasource.url = jdbc:h2:mem:~/apolloconfigdb;mode=mysql;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=-1;BUILTIN_ALIAS_OVERRIDE=TRUE;DATABASE_TO_UPPER=FALSE
 
 spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
 spring.jpa.hibernate.globally_quoted_identifiers=false

apollo-adminservice/src/test/resources/controller/cleanup.sql

@@ -13,11 +13,11 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-DELETE FROM Item;
+DELETE FROM "Item";
 DELETE FROM "Namespace";
 DELETE FROM "AppNamespace";
-DELETE FROM Cluster;
-DELETE FROM App;
-DELETE FROM NamespaceLock;
-DELETE FROM ServerConfig;
+DELETE FROM "Cluster";
+DELETE FROM "App";
+DELETE FROM "NamespaceLock";
+DELETE FROM "ServerConfig";
 

apollo-adminservice/src/test/resources/controller/test-itemset.sql

@@ -13,9 +13,9 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('someAppId','someAppName','someOwnerName','someOwnerName@ctrip.com');
+INSERT INTO "App" (AppId, Name, OwnerName, OwnerEmail) VALUES ('someAppId','someAppName','someOwnerName','someOwnerName@ctrip.com');
 
-INSERT INTO Cluster (AppId, Name) VALUES ('someAppId', 'default');
+INSERT INTO "Cluster" (AppId, Name) VALUES ('someAppId', 'default');
 
 INSERT INTO "AppNamespace" (AppId, Name) VALUES ('someAppId', 'application');
 

apollo-adminservice/src/test/resources/controller/test-release.sql

@@ -13,14 +13,14 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('someAppId','someAppName','someOwnerName','someOwnerName@ctrip.com');
+INSERT INTO "App" (AppId, Name, OwnerName, OwnerEmail) VALUES ('someAppId','someAppName','someOwnerName','someOwnerName@ctrip.com');
 
-INSERT INTO Cluster (AppId, Name) VALUES ('someAppId', 'default');
+INSERT INTO "Cluster" (AppId, Name) VALUES ('someAppId', 'default');
 
 INSERT INTO "AppNamespace" (AppId, Name) VALUES ('someAppId', 'application');
 
 INSERT INTO "Namespace" (Id, AppId, ClusterName, NamespaceName) VALUES (100, 'someAppId', 'default', 'application');
 
-INSERT INTO Item (NamespaceId, "Key", "Type", "Value", Comment) VALUES (100, 'k1', '0', 'v1', 'comment1');
-INSERT INTO Item (NamespaceId, "Key", "Type", "Value", Comment) VALUES (100, 'k2', '0', 'v2', 'comment1');
-INSERT INTO Item (NamespaceId, "Key", "Type", "Value", Comment) VALUES (100, 'k3', '0', 'v3', 'comment1');
+INSERT INTO "Item" (NamespaceId, "Key", "Type", "Value", Comment) VALUES (100, 'k1', '0', 'v1', 'comment1');
+INSERT INTO "Item" (NamespaceId, "Key", "Type", "Value", Comment) VALUES (100, 'k2', '0', 'v2', 'comment1');
+INSERT INTO "Item" (NamespaceId, "Key", "Type", "Value", Comment) VALUES (100, 'k3', '0', 'v3', 'comment1');

apollo-adminservice/src/test/resources/controller/test-server-config.sql

@@ -13,6 +13,6 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-INSERT INTO `ServerConfig` ("Key",  "Cluster",  "Value")
+INSERT INTO "ServerConfig" ("Key",  "Cluster",  "Value")
 VALUES
 	('name', 'default', 'kl');

apollo-adminservice/src/test/resources/data.sql

@@ -13,36 +13,36 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003171','apollo-config-service','刘一鸣','liuym@ctrip.com');
-INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003172','apollo-admin-service','宋顺','song_s@ctrip.com');
-INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003173','apollo-portal','张乐','zhanglea@ctrip.com');
-INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('fxhermesproducer','fx-hermes-producer','梁锦华','jhliang@ctrip.com');
+INSERT INTO "App" (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003171','apollo-config-service','刘一鸣','liuym@ctrip.com');
+INSERT INTO "App" (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003172','apollo-admin-service','宋顺','song_s@ctrip.com');
+INSERT INTO "App" (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003173','apollo-portal','张乐','zhanglea@ctrip.com');
+INSERT INTO "App" (AppId, Name, OwnerName, OwnerEmail) VALUES ('fxhermesproducer','fx-hermes-producer','梁锦华','jhliang@ctrip.com');
 
-INSERT INTO Cluster (AppId, Name) VALUES ('100003171', 'default');
-INSERT INTO Cluster (AppId, Name) VALUES ('100003171', 'cluster1');
-INSERT INTO Cluster (AppId, Name) VALUES ('100003172', 'default');
-INSERT INTO Cluster (AppId, Name) VALUES ('100003172', 'cluster2');
-INSERT INTO Cluster (AppId, Name) VALUES ('100003173', 'default');
-INSERT INTO Cluster (AppId, Name) VALUES ('100003173', 'cluster3');
-INSERT INTO Cluster (AppId, Name) VALUES ('fxhermesproducer', 'default');
+INSERT INTO "Cluster" (AppId, Name) VALUES ('100003171', 'default');
+INSERT INTO "Cluster" (AppId, Name) VALUES ('100003171', 'cluster1');
+INSERT INTO "Cluster" (AppId, Name) VALUES ('100003172', 'default');
+INSERT INTO "Cluster" (AppId, Name) VALUES ('100003172', 'cluster2');
+INSERT INTO "Cluster" (AppId, Name) VALUES ('100003173', 'default');
+INSERT INTO "Cluster" (AppId, Name) VALUES ('100003173', 'cluster3');
+INSERT INTO "Cluster" (AppId, Name) VALUES ('fxhermesproducer', 'default');
 
 INSERT INTO "AppNamespace" (AppId, Name) VALUES ('100003171', 'application');
 INSERT INTO "AppNamespace" (AppId, Name) VALUES ('100003171', 'fx.apollo.config');
 INSERT INTO "AppNamespace" (AppId, Name) VALUES ('100003172', 'application');
 INSERT INTO "AppNamespace" (AppId, Name) VALUES ('100003172', 'fx.apollo.admin');
 INSERT INTO "AppNamespace" (AppId, Name) VALUES ('100003173', 'application');
 INSERT INTO "AppNamespace" (AppId, Name) VALUES ('100003173', 'fx.apollo.portal');
-INSERT INTO "AppNamespace" (AppID, Name) VALUES ('fxhermesproducer', 'fx.hermes.producer');
+INSERT INTO "AppNamespace" (AppId, Name) VALUES ('fxhermesproducer', 'fx.hermes.producer');
 
 INSERT INTO "Namespace" (Id, AppId, ClusterName, NamespaceName) VALUES (1, '100003171', 'default', 'application');
 INSERT INTO "Namespace" (Id, AppId, ClusterName, NamespaceName) VALUES (5, '100003171', 'cluster1', 'application');
 INSERT INTO "Namespace" (Id, AppId, ClusterName, NamespaceName) VALUES (2, 'fxhermesproducer', 'default', 'fx.hermes.producer');
 INSERT INTO "Namespace" (Id, AppId, ClusterName, NamespaceName) VALUES (3, '100003172', 'default', 'application');
 INSERT INTO "Namespace" (Id, AppId, ClusterName, NamespaceName) VALUES (4, '100003173', 'default', 'application');
 
-INSERT INTO Item (NamespaceId, "Key", "Value", Comment) VALUES (1, 'k1', 'v1', 'comment1');
-INSERT INTO Item (NamespaceId, "Key", "Value", Comment) VALUES (1, 'k2', 'v2', 'comment2');
-INSERT INTO Item (NamespaceId, "Key", "Value", Comment) VALUES (2, 'k3', 'v3', 'comment3');
-INSERT INTO Item (NamespaceId, "Key", "Value", Comment, LineNum) VALUES (5, 'k1', 'v4', 'comment4',1);
+INSERT INTO "Item" (NamespaceId, "Key", "Value", Comment) VALUES (1, 'k1', 'v1', 'comment1');
+INSERT INTO "Item" (NamespaceId, "Key", "Value", Comment) VALUES (1, 'k2', 'v2', 'comment2');
+INSERT INTO "Item" (NamespaceId, "Key", "Value", Comment) VALUES (2, 'k3', 'v3', 'comment3');
+INSERT INTO "Item" (NamespaceId, "Key", "Value", Comment, LineNum) VALUES (5, 'k1', 'v4', 'comment4',1);
 
 INSERT INTO "Release" (ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES ('TEST-RELEASE-KEY', 'REV1','First Release','100003171', 'default', 'application', '{"k1":"v1"}');

apollo-adminservice/src/test/resources/filter/test-access-control-disabled.sql

@@ -13,7 +13,7 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-INSERT INTO `ServerConfig` ("Key",  "Cluster",  "Value")
+INSERT INTO "ServerConfig" ("Key",  "Cluster",  "Value")
 VALUES
 	('admin-service.access.tokens', 'default', 'someToken,anotherToken'),
 	('admin-service.access.control.enabled', 'default', 'false');

apollo-adminservice/src/test/resources/filter/test-access-control-enabled-no-token.sql

@@ -13,6 +13,6 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-INSERT INTO `ServerConfig` ("Key",  "Cluster",  "Value")
+INSERT INTO "ServerConfig" ("Key",  "Cluster",  "Value")
 VALUES
 	('admin-service.access.control.enabled', 'default', 'true');

apollo-adminservice/src/test/resources/filter/test-access-control-enabled.sql

@@ -13,7 +13,7 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-INSERT INTO `ServerConfig` ("Key",  "Cluster",  "Value")
+INSERT INTO "ServerConfig" ("Key",  "Cluster",  "Value")
 VALUES
 	('admin-service.access.tokens', 'default', 'someToken,anotherToken'),
 	('admin-service.access.control.enabled', 'default', 'true');

apollo-adminservice/src/test/resources/import.sql

@@ -13,25 +13,25 @@
 -- See the License for the specific language governing permissions and
 -- limitations under the License.
 --
-ALTER TABLE APP ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL;
-ALTER TABLE APP ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL;
-ALTER TABLE APP ALTER COLUMN ORGNAME VARCHAR(255) NULL;
-ALTER TABLE APP ALTER COLUMN ORGID VARCHAR(255) NULL;
+ALTER TABLE "App" ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL;
+ALTER TABLE "App" ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL;
+ALTER TABLE "App" ALTER COLUMN OrgName VARCHAR(255) NULL;
+ALTER TABLE "App" ALTER COLUMN OrgId VARCHAR(255) NULL;
 ALTER TABLE "AppNamespace" ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL;
 ALTER TABLE "AppNamespace" ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL;
 ALTER TABLE "AppNamespace" ALTER COLUMN Format VARCHAR(255) NULL;
-ALTER TABLE Cluster ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL;
-ALTER TABLE Cluster ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL;
-ALTER TABLE Cluster ALTER COLUMN ParentClusterId BIGINT DEFAULT 0;
+ALTER TABLE "Cluster" ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL;
+ALTER TABLE "Cluster" ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL;
+ALTER TABLE "Cluster" ALTER COLUMN ParentClusterId BIGINT DEFAULT 0;
 ALTER TABLE "Namespace" ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL;
 ALTER TABLE "Namespace" ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL;
-ALTER TABLE Item ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL;
-ALTER TABLE Item ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL;
+ALTER TABLE "Item" ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL;
+ALTER TABLE "Item" ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL;
 ALTER TABLE "Release" ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL;
 ALTER TABLE "Release" ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL;
-ALTER TABLE ServerConfig ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL;
-ALTER TABLE ServerConfig ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL;
-ALTER TABLE ServerConfig ALTER COLUMN COMMENT VARCHAR(255) NULL;
-ALTER TABLE Audit ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL;
-ALTER TABLE Audit ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL;
+ALTER TABLE "ServerConfig" ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL;
+ALTER TABLE "ServerConfig" ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL;
+ALTER TABLE "ServerConfig" ALTER COLUMN Comment VARCHAR(255) NULL;
+ALTER TABLE "Audit" ALTER COLUMN DataChange_CreatedBy VARCHAR(255) NULL;
+ALTER TABLE "Audit" ALTER COLUMN DataChange_CreatedTime TIMESTAMP NULL;
 CREATE ALIAS IF NOT EXISTS UNIX_TIMESTAMP FOR "com.ctrip.framework.apollo.common.jpa.H2Function.unixTimestamp";

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/AccessKey.java

@@ -25,18 +25,18 @@
 import javax.persistence.Table;
 
 @Entity
-@Table(name = "AccessKey")
+@Table(name = "`AccessKey`")
 @SQLDelete(sql = "Update AccessKey set IsDeleted = true, DeletedAt = ROUND(UNIX_TIMESTAMP(NOW(4))*1000) where Id = ?")
-@Where(clause = "isDeleted = false")
+@Where(clause = "IsDeleted = false")
 public class AccessKey extends BaseEntity {
 
-  @Column(name = "appId", nullable = false)
+  @Column(name = "AppId", nullable = false)
   private String appId;
 
   @Column(name = "Secret", nullable = false)
   private String secret;
 
-  @Column(name = "isEnabled", columnDefinition = "Bit default '0'")
+  @Column(name = "IsEnabled", columnDefinition = "Bit default '0'")
   private boolean enabled;
 
   public String getAppId() {

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Audit.java

@@ -26,9 +26,9 @@
 import javax.persistence.Table;
 
 @Entity
-@Table(name = "Audit")
+@Table(name = "`Audit`")
 @SQLDelete(sql = "Update Audit set IsDeleted = true, DeletedAt = ROUND(UNIX_TIMESTAMP(NOW(4))*1000) where Id = ?")
-@Where(clause = "isDeleted = false")
+@Where(clause = "IsDeleted = false")
 public class Audit extends BaseEntity {
 
   public enum OP {

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Cluster.java

@@ -29,9 +29,9 @@
  * @author Jason Song(song_s@ctrip.com)
  */
 @Entity
-@Table(name = "Cluster")
+@Table(name = "`Cluster`")
 @SQLDelete(sql = "Update Cluster set IsDeleted = true, DeletedAt = ROUND(UNIX_TIMESTAMP(NOW(4))*1000) where Id = ?")
-@Where(clause = "isDeleted = false")
+@Where(clause = "IsDeleted = false")
 public class Cluster extends BaseEntity implements Comparable<Cluster> {
 
   @Column(name = "Name", nullable = false)

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Commit.java

@@ -27,9 +27,9 @@
 import javax.persistence.Table;
 
 @Entity
-@Table(name = "Commit")
+@Table(name = "`Commit`")
 @SQLDelete(sql = "Update Commit set IsDeleted = true, DeletedAt = ROUND(UNIX_TIMESTAMP(NOW(4))*1000) where Id = ?")
-@Where(clause = "isDeleted = false")
+@Where(clause = "IsDeleted = false")
 public class Commit extends BaseEntity {
 
   @Lob

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/GrayReleaseRule.java

@@ -26,12 +26,12 @@
 import javax.persistence.Table;
 
 @Entity
-@Table(name = "GrayReleaseRule")
+@Table(name = "`GrayReleaseRule`")
 @SQLDelete(sql = "Update GrayReleaseRule set IsDeleted = true, DeletedAt = ROUND(UNIX_TIMESTAMP(NOW(4))*1000) where Id = ?")
-@Where(clause = "isDeleted = false")
+@Where(clause = "IsDeleted = false")
 public class GrayReleaseRule extends BaseEntity{
 
-  @Column(name = "appId", nullable = false)
+  @Column(name = "AppId", nullable = false)
   private String appId;
 
   @Column(name = "ClusterName", nullable = false)
@@ -46,7 +46,7 @@ public class GrayReleaseRule extends BaseEntity{
   @Column(name = "Rules")
   private String rules;
 
-  @Column(name = "releaseId", nullable = false)
+  @Column(name = "ReleaseId", nullable = false)
   private Long releaseId;
 
   @Column(name = "BranchStatus", nullable = false)

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Instance.java

@@ -32,7 +32,7 @@
  * @author Jason Song(song_s@ctrip.com)
  */
 @Entity
-@Table(name = "Instance")
+@Table(name = "`Instance`")
 public class Instance {
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/InstanceConfig.java

@@ -33,7 +33,7 @@
  * @author Jason Song(song_s@ctrip.com)
  */
 @Entity
-@Table(name = "InstanceConfig")
+@Table(name = "`InstanceConfig`")
 public class InstanceConfig {
   @Id
   @GeneratedValue(strategy = GenerationType.IDENTITY)

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Item.java

@@ -27,9 +27,9 @@
 import javax.persistence.Table;
 
 @Entity
-@Table(name = "Item")
+@Table(name = "`Item`")
 @SQLDelete(sql = "Update Item set IsDeleted = true, DeletedAt = ROUND(UNIX_TIMESTAMP(NOW(4))*1000) where Id = ?")
-@Where(clause = "isDeleted = false")
+@Where(clause = "IsDeleted = false")
 public class Item extends BaseEntity {
 
   @Column(name = "NamespaceId", nullable = false)
@@ -45,7 +45,7 @@ public class Item extends BaseEntity {
   @Lob
   private String value;
 
-  @Column(name = "comment")
+  @Column(name = "Comment")
   private String comment;
 
   @Column(name = "LineNum")

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Namespace.java

@@ -28,10 +28,10 @@
 @Entity
 @Table(name = "`Namespace`")
 @SQLDelete(sql = "Update Namespace set IsDeleted = true, DeletedAt = ROUND(UNIX_TIMESTAMP(NOW(4))*1000) where Id = ?")
-@Where(clause = "isDeleted = false")
+@Where(clause = "IsDeleted = false")
 public class Namespace extends BaseEntity {
 
-  @Column(name = "appId", nullable = false)
+  @Column(name = "AppId", nullable = false)
   private String appId;
 
   @Column(name = "ClusterName", nullable = false)

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/NamespaceLock.java

@@ -25,8 +25,8 @@
 import javax.persistence.Table;
 
 @Entity
-@Table(name = "NamespaceLock")
-@Where(clause = "isDeleted = false")
+@Table(name = "`NamespaceLock`")
+@Where(clause = "IsDeleted = false")
 public class NamespaceLock extends BaseEntity{
 
   @Column(name = "NamespaceId")

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Privilege.java

@@ -26,9 +26,9 @@
 import javax.persistence.Table;
 
 @Entity
-@Table(name = "Privilege")
+@Table(name = "`Privilege`")
 @SQLDelete(sql = "Update Privilege set IsDeleted = true, DeletedAt = ROUND(UNIX_TIMESTAMP(NOW(4))*1000) where Id = ?")
-@Where(clause = "isDeleted = false")
+@Where(clause = "IsDeleted = false")
 public class Privilege extends BaseEntity {
 
   @Column(name = "Name", nullable = false)

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/Release.java

@@ -32,7 +32,7 @@
 @Entity
 @Table(name = "`Release`")
 @SQLDelete(sql = "Update Release set IsDeleted = true, DeletedAt = ROUND(UNIX_TIMESTAMP(NOW(4))*1000) where Id = ?")
-@Where(clause = "isDeleted = false")
+@Where(clause = "IsDeleted = false")
 public class Release extends BaseEntity {
   @Column(name = "ReleaseKey", nullable = false)
   private String releaseKey;

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/ReleaseHistory.java

@@ -29,9 +29,9 @@
  * @author Jason Song(song_s@ctrip.com)
  */
 @Entity
-@Table(name = "ReleaseHistory")
+@Table(name = "`ReleaseHistory`")
 @SQLDelete(sql = "Update ReleaseHistory set IsDeleted = true, DeletedAt = ROUND(UNIX_TIMESTAMP(NOW(4))*1000) where Id = ?")
-@Where(clause = "isDeleted = false")
+@Where(clause = "IsDeleted = false")
 public class ReleaseHistory extends BaseEntity {
   @Column(name = "AppId", nullable = false)
   private String appId;

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/ServerConfig.java

@@ -29,9 +29,9 @@
  * @author Jason Song(song_s@ctrip.com)
  */
 @Entity
-@Table(name = "ServerConfig")
+@Table(name = "`ServerConfig`")
 @SQLDelete(sql = "Update ServerConfig set IsDeleted = true, DeletedAt = ROUND(UNIX_TIMESTAMP(NOW(4))*1000) where Id = ?")
-@Where(clause = "isDeleted = false")
+@Where(clause = "IsDeleted = false")
 public class ServerConfig extends BaseEntity {
   @Column(name = "`Key`", nullable = false)
   private String key;

apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/entity/ServiceRegistry.java

@@ -35,7 +35,7 @@
  * persist {@link ServiceInstance}
  */
 @Entity
-@Table(name = "ServiceRegistry")
+@Table(name = "`ServiceRegistry`")
 public class ServiceRegistry {
 
   @Id