From 8df00a8db5d4ee6b961db119f71e9a00bb32c8d9 Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Thu, 20 Mar 2025 10:51:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsql=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 数据库/2.7.3/更新-mysql-2.7.1升级到2.7.3.sql |  6 ++-
 数据库/2.7.3/更新-mysql-2.7.3.sql            | 41 ++++++++++++--------
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/数据库/2.7.3/更新-mysql-2.7.1升级到2.7.3.sql b/数据库/2.7.3/更新-mysql-2.7.1升级到2.7.3.sql
index 36b92b390..e5c83a89c 100644
--- a/数据库/2.7.3/更新-mysql-2.7.1升级到2.7.3.sql
+++ b/数据库/2.7.3/更新-mysql-2.7.1升级到2.7.3.sql
@@ -1,3 +1,4 @@
+
 drop table if exists wvp_resources_tree;
 drop table if exists wvp_platform_catalog;
 drop table if exists wvp_platform_gb_stream;
@@ -388,7 +389,7 @@ create table IF NOT EXISTS wvp_record_plan_item
 );
 
 
-
+DELIMITER //  -- 重定义分隔符避免分号冲突
 CREATE PROCEDURE `wvp_20250111`()
 BEGIN
 
@@ -418,7 +419,8 @@ BEGIN
         alter table wvp_cloud_record add server_id character varying(50);
         update wvp_cloud_record set server_id = serverId;
     END IF;
-END;
+END;//
 call wvp_20250111();
 DROP PROCEDURE wvp_20250111;
+DELIMITER ;
 
diff --git a/数据库/2.7.3/更新-mysql-2.7.3.sql b/数据库/2.7.3/更新-mysql-2.7.3.sql
index 63dc4ddee..515fb9844 100644
--- a/数据库/2.7.3/更新-mysql-2.7.3.sql
+++ b/数据库/2.7.3/更新-mysql-2.7.3.sql
@@ -1,6 +1,7 @@
 /*
 * 20240528
 */
+DELIMITER //  -- 重定义分隔符避免分号冲突
 CREATE PROCEDURE `wvp_20240528`()
 BEGIN
     IF NOT EXISTS (SELECT column_name FROM information_schema.columns
@@ -39,9 +40,10 @@ BEGIN
     THEN
         alter table wvp_media_server add ws_flv_ssl_port integer;
     END IF;
-END;
+END; //
 call wvp_20240528();
 DROP PROCEDURE wvp_20240528;
+DELIMITER ;
 
 create table IF NOT EXISTS wvp_user_api_key (
                                   id serial primary key ,
@@ -58,6 +60,7 @@ create table IF NOT EXISTS wvp_user_api_key (
 /*
 * 20241222
 */
+DELIMITER //  -- 重定义分隔符避免分号冲突
 CREATE PROCEDURE `wvp_20241222`()
 BEGIN
     IF EXISTS (SELECT column_name FROM information_schema.STATISTICS
@@ -116,13 +119,14 @@ BEGIN
         set wdc.data_type = 3, wdc.data_device_id = ct.stream_proxy_id where wdc.stream_proxy_id is not null;
         alter table wvp_device_channel drop stream_proxy_id;
     END IF;
-END;
+END; //
 call wvp_20241222();
 DROP PROCEDURE wvp_20241222;
-
+DELIMITER ;
 /*
 * 20241231
 */
+DELIMITER //
 CREATE PROCEDURE `wvp_20241231`()
 BEGIN
     IF not EXISTS (SELECT column_name FROM information_schema.columns
@@ -130,14 +134,14 @@ BEGIN
     THEN
         alter table wvp_stream_proxy add relates_media_server_id character varying(50);
     END IF;
-END;
+END; //
 call wvp_20241231();
 DROP PROCEDURE wvp_20241231;
-
-
+DELIMITER ;
 /*
 * 20250111
 */
+DELIMITER //  -- 重定义分隔符避免分号冲突
 CREATE PROCEDURE `wvp_20250111`()
 BEGIN
     IF EXISTS (SELECT column_name FROM information_schema.STATISTICS
@@ -157,14 +161,15 @@ BEGIN
     THEN
         alter table wvp_cloud_record modify file_path varchar(500) null;
     END IF;
-END;
+END; //
 call wvp_20250111();
 DROP PROCEDURE wvp_20250111;
-
+DELIMITER ;
 
 /*
 * 20250211
 */
+DELIMITER //  -- 重定义分隔符避免分号冲突
 CREATE PROCEDURE `wvp_20250211`()
 BEGIN
     IF EXISTS (SELECT column_name FROM information_schema.STATISTICS
@@ -184,14 +189,15 @@ BEGIN
     THEN
         alter table wvp_device add position_capability integer;
     END IF;
-END;
+END; //
 call wvp_20250211();
 DROP PROCEDURE wvp_20250211;
-
+DELIMITER ;
 
 /**
   * 20250312
  */
+DELIMITER //  -- 重定义分隔符避免分号冲突
 CREATE PROCEDURE `wvp_20250312`()
 BEGIN
     DECLARE serverId VARCHAR(32) DEFAULT '你的服务ID';
@@ -228,37 +234,38 @@ BEGIN
     THEN
         alter table wvp_platform add server_id character varying(50);
     END IF;
-END;
+END; //
 call wvp_20250312();
 DROP PROCEDURE wvp_20250312;
-
+DELIMITER ;
 
 /*
 * 20250319
 */
+DELIMITER //  -- 重定义分隔符避免分号冲突
 CREATE PROCEDURE `wvp_20250319`()
 BEGIN
-    IF NOT EXISTS (SELECT column_name FROM information_schema.STATISTICS
+    IF NOT EXISTS (SELECT column_name FROM information_schema.columns
                WHERE TABLE_SCHEMA = (SELECT DATABASE()) and  table_name = 'wvp_device_channel' and column_name = 'gps_speed')
     THEN
         alter table wvp_device_channel add gps_speed double precision;
     END IF;
 
-    IF NOT EXISTS (SELECT column_name FROM information_schema.STATISTICS
+    IF NOT EXISTS (SELECT column_name FROM information_schema.columns
                    WHERE TABLE_SCHEMA = (SELECT DATABASE()) and  table_name = 'wvp_device_channel' and column_name = 'gps_altitude')
     THEN
         alter table wvp_device_channel add gps_altitude double precision;
     END IF;
 
-    IF NOT EXISTS (SELECT column_name FROM information_schema.STATISTICS
+    IF NOT EXISTS (SELECT column_name FROM information_schema.columns
                    WHERE TABLE_SCHEMA = (SELECT DATABASE()) and  table_name = 'wvp_device_channel' and column_name = 'gps_direction')
     THEN
         alter table wvp_device_channel add gps_direction double precision;
     END IF;
-END;
+END; //
 call wvp_20250319();
 DROP PROCEDURE wvp_20250319;
-
+DELIMITER ;