瀏覽代碼

fix mysql init db structure

Roman Dmitriev 2 年之前
父節點
當前提交
4e274e76e8
共有 2 個文件被更改,包括 5 次插入4 次删除
  1. 2 3
      docs/mysql/mysql.sql
  2. 3 1
      updates/2-4-12/mysql-devices-patch.sql

+ 2 - 3
docs/mysql/mysql.sql

@@ -201,7 +201,6 @@ INSERT INTO `Customers` (`id`, `Login`, `password`, `api_key`, `readonly`) VALUE
 --
 --
 -- Структура таблицы `devices`
 -- Структура таблицы `devices`
 --
 --
-
 CREATE TABLE `devices` (
 CREATE TABLE `devices` (
   `id` int(11) NOT NULL,
   `id` int(11) NOT NULL,
   `device_type` int(11) NOT NULL DEFAULT 1,
   `device_type` int(11) NOT NULL DEFAULT 1,
@@ -211,8 +210,8 @@ CREATE TABLE `devices` (
   `device_name` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `device_name` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `building_id` int(11) NOT NULL DEFAULT 1,
   `building_id` int(11) NOT NULL DEFAULT 1,
   `ip` varchar(15) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `ip` varchar(15) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `login` varchar(50) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'admin',
-  `password` varchar(250) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `login` varchar(50) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `password` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `protocol` int(11) NOT NULL DEFAULT 0,
   `protocol` int(11) NOT NULL DEFAULT 0,
   `control_port` int(11) NOT NULL DEFAULT 23,
   `control_port` int(11) NOT NULL DEFAULT 23,
   `port_count` int(11) NOT NULL DEFAULT 0,
   `port_count` int(11) NOT NULL DEFAULT 0,

+ 3 - 1
updates/2-4-12/mysql-devices-patch.sql

@@ -1,4 +1,6 @@
-ALTER TABLE `devices` ADD `login` VARCHAR(50) NOT NULL DEFAULT 'admin' AFTER `ip`, ADD `password` VARCHAR(250) DEFAULT NULL AFTER `login`, ADD `protocol` INT NOT NULL DEFAULT '0' AFTER `password`, ADD `control_port` INT NOT NULL DEFAULT '23' AFTER `protocol`;
+ALTER TABLE `connections` ADD `last_found` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP AFTER `auth_id`;
+UPDATE `connections` as C set last_found=(SELECT last_found FROM User_auth AS U WHERE U.last_found>0 and U.id=C.`auth_id`);
+ALTER TABLE `devices` ADD `login` VARCHAR(50) NULL DEFAULT NULL AFTER `ip`, ADD `password` VARCHAR(255) NULL DEFAULT NULL AFTER `login`, ADD `protocol` INT NOT NULL DEFAULT '1' AFTER `password`, ADD `control_port` INT NOT NULL DEFAULT '23' AFTER `protocol`;
 INSERT INTO `device_types` (`id`, `name`) VALUES ('6', 'Маршрутизатор');
 INSERT INTO `device_types` (`id`, `name`) VALUES ('6', 'Маршрутизатор');
 UPDATE `device_types` SET `id` = '0' WHERE `device_types`.`id` = 6;
 UPDATE `device_types` SET `id` = '0' WHERE `device_types`.`id` = 6;
 ALTER TABLE `device_types` CHANGE `name` `name.russian` VARCHAR(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL;
 ALTER TABLE `device_types` CHANGE `name` `name.russian` VARCHAR(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL;