From 4c7a4806778daf737bd269a25be3f37c38f89e46 Mon Sep 17 00:00:00 2001
From: yhjun1026 <460342015@qq.com>
Date: Wed, 28 Aug 2024 16:56:52 +0800
Subject: [PATCH] feat(dbgpts): fix dbgpts update blocking service problem

---
 assets/schema/dbgpt.sql                            | 6 +++---
 assets/schema/upgrade/v0_6_0/upgrade_to_v0.6.0.sql | 6 +++---
 dbgpt/serve/dbgpts/hub/config.py                   | 2 +-
 dbgpt/serve/dbgpts/my/config.py                    | 2 +-
 dbgpt/serve/dbgpts/my/models/models.py             | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/assets/schema/dbgpt.sql b/assets/schema/dbgpt.sql
index aa9cfbbda..0b3609b03 100644
--- a/assets/schema/dbgpt.sql
+++ b/assets/schema/dbgpt.sql
@@ -467,7 +467,7 @@ CREATE TABLE `user_recent_apps` (
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='User recently used apps';
 
 -- dbgpt.dbgpt_serve_dbgpts_my definition
-CREATE TABLE `dbgpts_my` (
+CREATE TABLE `dbgpt_serve_dbgpts_my` (
   `id` int NOT NULL AUTO_INCREMENT COMMENT 'autoincrement id',
   `name` varchar(255)  NOT NULL COMMENT 'plugin name',
   `user_code` varchar(255)  DEFAULT NULL COMMENT 'user code',
@@ -481,12 +481,12 @@ CREATE TABLE `dbgpts_my` (
   `gmt_created` TIMESTAMP DEFAULT CURRENT_TIMESTAMP COMMENT 'plugin install time',
   `gmt_modified` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'update time',
   PRIMARY KEY (`id`),
-  UNIQUE KEY `name` (`name`, `user_code`),
+  UNIQUE KEY `name` (`name`, `user_name`),
   KEY `ix_my_plugin_sys_code` (`sys_code`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 -- dbgpt.dbgpt_serve_dbgpts_hub definition
-CREATE TABLE `dbgpts_hub` (
+CREATE TABLE `dbgpt_serve_dbgpts_hub` (
   `id` int NOT NULL AUTO_INCREMENT COMMENT 'autoincrement id',
   `name` varchar(255) NOT NULL COMMENT 'plugin name',
   `description` varchar(255)  NULL COMMENT 'plugin description',
diff --git a/assets/schema/upgrade/v0_6_0/upgrade_to_v0.6.0.sql b/assets/schema/upgrade/v0_6_0/upgrade_to_v0.6.0.sql
index ebdd9ac94..f20a396a7 100644
--- a/assets/schema/upgrade/v0_6_0/upgrade_to_v0.6.0.sql
+++ b/assets/schema/upgrade/v0_6_0/upgrade_to_v0.6.0.sql
@@ -117,7 +117,7 @@ CREATE TABLE `dbgpt_serve_variables` (
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 -- dbgpt.dbgpt_serve_dbgpts_my definition
-CREATE TABLE `dbgpts_my` (
+CREATE TABLE `dbgpt_serve_dbgpts_my` (
   `id` int NOT NULL AUTO_INCREMENT COMMENT 'autoincrement id',
   `name` varchar(255)  NOT NULL COMMENT 'plugin name',
   `user_name` varchar(255)  DEFAULT NULL COMMENT 'user name',
@@ -130,12 +130,12 @@ CREATE TABLE `dbgpts_my` (
   `gmt_created` TIMESTAMP DEFAULT CURRENT_TIMESTAMP COMMENT 'plugin install time',
   `gmt_modified` TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT 'update time',
   PRIMARY KEY (`id`),
-  UNIQUE KEY `name` (`name`, `user_code`),
+  UNIQUE KEY `name` (`name`, `user_name`),
   KEY `ix_my_plugin_sys_code` (`sys_code`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 -- dbgpt.dbgpt_serve_dbgpts_hub definition
-CREATE TABLE `dbgpts_hub` (
+CREATE TABLE `dbgpt_serve_dbgpts_hub` (
   `id` int NOT NULL AUTO_INCREMENT COMMENT 'autoincrement id',
   `name` varchar(255) NOT NULL COMMENT 'plugin name',
   `description` varchar(255)  NULL COMMENT 'plugin description',
diff --git a/dbgpt/serve/dbgpts/hub/config.py b/dbgpt/serve/dbgpts/hub/config.py
index 1e19fe3b7..6918b2ba3 100644
--- a/dbgpt/serve/dbgpts/hub/config.py
+++ b/dbgpt/serve/dbgpts/hub/config.py
@@ -9,7 +9,7 @@ SERVE_APP_NAME_HUMP = "dbgpt_serve_DbgptsHub"
 SERVE_CONFIG_KEY_PREFIX = "dbgpt.serve.dbgpts_hub."
 SERVE_SERVICE_COMPONENT_NAME = f"{SERVE_APP_NAME}_service"
 # Database table name
-SERVER_APP_TABLE_NAME = "dbgpts_hub"
+SERVER_APP_TABLE_NAME = SERVE_APP_NAME
 
 
 @dataclass
diff --git a/dbgpt/serve/dbgpts/my/config.py b/dbgpt/serve/dbgpts/my/config.py
index 722fe33a0..528d43550 100644
--- a/dbgpt/serve/dbgpts/my/config.py
+++ b/dbgpt/serve/dbgpts/my/config.py
@@ -9,7 +9,7 @@ SERVE_APP_NAME_HUMP = "dbgpt_serve_DbgptsMy"
 SERVE_CONFIG_KEY_PREFIX = "dbgpt.serve.dbgpts_my."
 SERVE_SERVICE_COMPONENT_NAME = f"{SERVE_APP_NAME}_service"
 # Database table name
-SERVER_APP_TABLE_NAME = "dbgpts_my"
+SERVER_APP_TABLE_NAME = SERVE_APP_NAME
 
 
 @dataclass
diff --git a/dbgpt/serve/dbgpts/my/models/models.py b/dbgpt/serve/dbgpts/my/models/models.py
index 69e094418..f37bafdf4 100644
--- a/dbgpt/serve/dbgpts/my/models/models.py
+++ b/dbgpt/serve/dbgpts/my/models/models.py
@@ -34,7 +34,7 @@ class ServeEntity(Model):
         onupdate=datetime.utcnow,
         comment="Record update time",
     )
-    UniqueConstraint("user_code", "name", name="uk_name")
+    UniqueConstraint("user_name", "name", name="uk_name")
 
 
 class ServeDao(BaseDao[ServeEntity, ServeRequest, ServerResponse]):