From c551164c89f70e664b498c3a09e615928261e01a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 01 七月 2023 18:33:42 +0800
Subject: [PATCH] 合并主线
---
sql/2.6.8升级2.6.9.sql | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git "a/sql/2.6.8\345\215\207\347\272\2472.6.9.sql" "b/sql/2.6.8\345\215\207\347\272\2472.6.9.sql"
index f27eebd..a398cb8 100644
--- "a/sql/2.6.8\345\215\207\347\272\2472.6.9.sql"
+++ "b/sql/2.6.8\345\215\207\347\272\2472.6.9.sql"
@@ -38,7 +38,7 @@
change geoCoordSys geo_coord_sys varchar(50) not null;
alter table device
- change treeType tree_type varchar(50) not null;
+ drop column treeType;
alter table device
change mediaServerId media_server_id varchar(50) default 'auto' null;
@@ -57,6 +57,10 @@
alter table device
change online on_line varchar(50) null;
+
+alter table device
+ add COLUMN switch_primary_sub_stream bool default false comment '寮�鍚富瀛愮爜娴佸垏鎹㈢殑寮�鍏筹紙0-涓嶅紑鍚紝1-寮�鍚級鐜板湪宸茬煡鏀寔璁惧涓� 澶у崕銆乀P鈥斺�擫INK鍏ㄧ郴璁惧'
+
alter table device_alarm
change deviceId device_id varchar(50) not null;
@@ -180,10 +184,6 @@
change createTime create_time varchar(50) null;
alter table gb_stream
- add constraint gb_stream_pk
- primary key (gbStreamId);
-
-alter table gb_stream
change gbStreamId gb_stream_id int auto_increment;
alter table gb_stream
@@ -203,6 +203,12 @@
alter table media_server
change hookIp hook_ip varchar(50) not null;
+
+alter table media_server
+ add send_rtp_port_range varchar(50) not null;
+
+alter table media_server
+ add column send_rtp_port_range varchar(50) default null;
alter table media_server
change sdpIp sdp_ip varchar(50) not null;
@@ -301,7 +307,7 @@
change updateTime update_time varchar(50) null;
alter table parent_platform
- change treeType tree_type varchar(50) not null;
+ drop column treeType;
alter table parent_platform
change asMessageChannel as_message_channel bool default false;
@@ -411,9 +417,8 @@
alter table stream_push
change self self bool default false;
-alter table wvp_stream_push
+alter table stream_push
drop column serverId;
-
alter table user
--
Gitblit v1.8.0