Dmitriev Roman 3 месяцев назад
Родитель
Сommit
707d96e8b5

+ 5 - 5
docs/databases/mysql/en/create_db.sql

@@ -165,7 +165,7 @@ CREATE TABLE `dhcp_log` (
   `id` bigint(20) UNSIGNED NOT NULL,
   `id` bigint(20) UNSIGNED NOT NULL,
   `mac` varchar(17) NOT NULL,
   `mac` varchar(17) NOT NULL,
   `ip_int` bigint(20) UNSIGNED NOT NULL,
   `ip_int` bigint(20) UNSIGNED NOT NULL,
-  `ip` varchar(15) NOT NULL,
+  `ip` varchar(15) DEFAULT NULL,
   `action` varchar(10) NOT NULL,
   `action` varchar(10) NOT NULL,
   `ts` timestamp NOT NULL DEFAULT current_timestamp(),
   `ts` timestamp NOT NULL DEFAULT current_timestamp(),
   `auth_id` bigint(20) UNSIGNED NOT NULL,
   `auth_id` bigint(20) UNSIGNED NOT NULL,
@@ -178,7 +178,7 @@ CREATE TABLE `dhcp_log` (
 CREATE TABLE `dhcp_queue` (
 CREATE TABLE `dhcp_queue` (
   `id` bigint(20) UNSIGNED NOT NULL,
   `id` bigint(20) UNSIGNED NOT NULL,
   `mac` varchar(17) NOT NULL,
   `mac` varchar(17) NOT NULL,
-  `ip` varchar(15) NOT NULL,
+  `ip` varchar(15) DEFAULT NULL,
   `action` varchar(10) NOT NULL,
   `action` varchar(10) NOT NULL,
   `ts` timestamp NOT NULL DEFAULT current_timestamp(),
   `ts` timestamp NOT NULL DEFAULT current_timestamp(),
   `dhcp_hostname` varchar(250) DEFAULT NULL
   `dhcp_hostname` varchar(250) DEFAULT NULL
@@ -244,7 +244,7 @@ CREATE TABLE `mac_history` (
   `ts` timestamp NOT NULL DEFAULT current_timestamp(),
   `ts` timestamp NOT NULL DEFAULT current_timestamp(),
   `device_id` bigint(20) UNSIGNED DEFAULT NULL,
   `device_id` bigint(20) UNSIGNED DEFAULT NULL,
   `port_id` bigint(20) UNSIGNED DEFAULT NULL,
   `port_id` bigint(20) UNSIGNED DEFAULT NULL,
-  `ip` varchar(16) NOT NULL DEFAULT '',
+  `ip` varchar(15) DEFAULT NULL,
   `auth_id` bigint(20) UNSIGNED DEFAULT NULL,
   `auth_id` bigint(20) UNSIGNED DEFAULT NULL,
   `dhcp_hostname` varchar(250) DEFAULT NULL
   `dhcp_hostname` varchar(250) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -285,7 +285,7 @@ CREATE TABLE `remote_syslog` (
   `id` bigint(20) UNSIGNED NOT NULL,
   `id` bigint(20) UNSIGNED NOT NULL,
   `ts` timestamp NOT NULL DEFAULT current_timestamp(),
   `ts` timestamp NOT NULL DEFAULT current_timestamp(),
   `device_id` bigint(20) UNSIGNED NOT NULL,
   `device_id` bigint(20) UNSIGNED NOT NULL,
-  `ip` varchar(15) NOT NULL,
+  `ip` varchar(15) DEFAULT NULL,
   `message` text NOT NULL
   `message` text NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci KEY_BLOCK_SIZE=8 ROW_FORMAT=COMPRESSED;
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci KEY_BLOCK_SIZE=8 ROW_FORMAT=COMPRESSED;
 
 
@@ -343,7 +343,7 @@ CREATE TABLE `user_auth` (
   `id` int(11) NOT NULL,
   `id` int(11) NOT NULL,
   `user_id` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `user_id` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `ou_id` int(11) DEFAULT NULL,
   `ou_id` int(11) DEFAULT NULL,
-  `ip` varchar(18) NOT NULL DEFAULT '',
+  `ip` varchar(18) DEFAULT NULL,
   `ip_int` bigint(10) UNSIGNED NOT NULL DEFAULT 0,
   `ip_int` bigint(10) UNSIGNED NOT NULL DEFAULT 0,
   `save_traf` tinyint(1) NOT NULL DEFAULT 0,
   `save_traf` tinyint(1) NOT NULL DEFAULT 0,
   `enabled` tinyint(1) NOT NULL DEFAULT 0,
   `enabled` tinyint(1) NOT NULL DEFAULT 0,

+ 5 - 5
docs/databases/mysql/ru/create_db.sql

@@ -165,7 +165,7 @@ CREATE TABLE `dhcp_log` (
   `id` bigint(20) UNSIGNED NOT NULL,
   `id` bigint(20) UNSIGNED NOT NULL,
   `mac` varchar(17) NOT NULL,
   `mac` varchar(17) NOT NULL,
   `ip_int` bigint(20) UNSIGNED NOT NULL,
   `ip_int` bigint(20) UNSIGNED NOT NULL,
-  `ip` varchar(15) NOT NULL,
+  `ip` varchar(15) DEFAULT NULL,
   `action` varchar(10) NOT NULL,
   `action` varchar(10) NOT NULL,
   `ts` timestamp NOT NULL DEFAULT current_timestamp(),
   `ts` timestamp NOT NULL DEFAULT current_timestamp(),
   `auth_id` bigint(20) UNSIGNED NOT NULL,
   `auth_id` bigint(20) UNSIGNED NOT NULL,
@@ -178,7 +178,7 @@ CREATE TABLE `dhcp_log` (
 CREATE TABLE `dhcp_queue` (
 CREATE TABLE `dhcp_queue` (
   `id` bigint(20) UNSIGNED NOT NULL,
   `id` bigint(20) UNSIGNED NOT NULL,
   `mac` varchar(17) NOT NULL,
   `mac` varchar(17) NOT NULL,
-  `ip` varchar(15) NOT NULL,
+  `ip` varchar(15) DEFAULT NULL,
   `action` varchar(10) NOT NULL,
   `action` varchar(10) NOT NULL,
   `ts` timestamp NOT NULL DEFAULT current_timestamp(),
   `ts` timestamp NOT NULL DEFAULT current_timestamp(),
   `dhcp_hostname` varchar(250) DEFAULT NULL
   `dhcp_hostname` varchar(250) DEFAULT NULL
@@ -244,7 +244,7 @@ CREATE TABLE `mac_history` (
   `ts` timestamp NOT NULL DEFAULT current_timestamp(),
   `ts` timestamp NOT NULL DEFAULT current_timestamp(),
   `device_id` bigint(20) UNSIGNED DEFAULT NULL,
   `device_id` bigint(20) UNSIGNED DEFAULT NULL,
   `port_id` bigint(20) UNSIGNED DEFAULT NULL,
   `port_id` bigint(20) UNSIGNED DEFAULT NULL,
-  `ip` varchar(16) NOT NULL DEFAULT '',
+  `ip` varchar(15) DEFAULT NULL,
   `auth_id` bigint(20) UNSIGNED DEFAULT NULL,
   `auth_id` bigint(20) UNSIGNED DEFAULT NULL,
   `dhcp_hostname` varchar(250) DEFAULT NULL
   `dhcp_hostname` varchar(250) DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -285,7 +285,7 @@ CREATE TABLE `remote_syslog` (
   `id` bigint(20) UNSIGNED NOT NULL,
   `id` bigint(20) UNSIGNED NOT NULL,
   `ts` timestamp NOT NULL DEFAULT current_timestamp(),
   `ts` timestamp NOT NULL DEFAULT current_timestamp(),
   `device_id` bigint(20) UNSIGNED NOT NULL,
   `device_id` bigint(20) UNSIGNED NOT NULL,
-  `ip` varchar(15) NOT NULL,
+  `ip` varchar(15) DEFAULT NULL,
   `message` text NOT NULL
   `message` text NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci KEY_BLOCK_SIZE=8 ROW_FORMAT=COMPRESSED;
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci KEY_BLOCK_SIZE=8 ROW_FORMAT=COMPRESSED;
 
 
@@ -343,7 +343,7 @@ CREATE TABLE `user_auth` (
   `id` int(11) NOT NULL,
   `id` int(11) NOT NULL,
   `user_id` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `user_id` bigint(20) UNSIGNED NOT NULL DEFAULT 0,
   `ou_id` int(11) DEFAULT NULL,
   `ou_id` int(11) DEFAULT NULL,
-  `ip` varchar(18) NOT NULL DEFAULT '',
+  `ip` varchar(18) DEFAULT NULL,
   `ip_int` bigint(10) UNSIGNED NOT NULL DEFAULT 0,
   `ip_int` bigint(10) UNSIGNED NOT NULL DEFAULT 0,
   `save_traf` tinyint(1) NOT NULL DEFAULT 0,
   `save_traf` tinyint(1) NOT NULL DEFAULT 0,
   `enabled` tinyint(1) NOT NULL DEFAULT 0,
   `enabled` tinyint(1) NOT NULL DEFAULT 0,

+ 8 - 0
scripts/updates/3-0-1/migration.msql

@@ -105,3 +105,11 @@ ALTER TABLE `user_stats` ADD COLUMN `step` int(11) NOT NULL DEFAULT 3600;
 
 
 ALTER TABLE `user_stats_full` MODIFY COLUMN `pkt_in` int(11) NOT NULL DEFAULT 0;
 ALTER TABLE `user_stats_full` MODIFY COLUMN `pkt_in` int(11) NOT NULL DEFAULT 0;
 ALTER TABLE `user_stats_full` MODIFY COLUMN `pkt_out` int(11) NOT NULL DEFAULT 0;
 ALTER TABLE `user_stats_full` MODIFY COLUMN `pkt_out` int(11) NOT NULL DEFAULT 0;
+
+--- set default value for ip to NULL
+
+ALTER TABLE `dhcp_log` MODIFY COLUMN `ip` varchar(15) NULL DEFAULT NULL;
+ALTER TABLE `dhcp_queue` MODIFY COLUMN `ip` varchar(15) NULL DEFAULT NULL;
+ALTER TABLE `mac_history` MODIFY COLUMN `ip` varchar(16) NULL DEFAULT NULL;
+ALTER TABLE `remote_syslog` MODIFY COLUMN `ip` varchar(15) NULL DEFAULT NULL;
+ALTER TABLE `user_auth` MODIFY COLUMN `ip` varchar(18) NULL DEFAULT NULL;