tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

schema/mysql: allow no null var names 

fixes #11518
This commit is contained in:
Thomas Gelf 2016-04-05 23:53:10 +02:00
parent 242090efdd
commit 9db04c35ef
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
schema/mysql-migrations/upgrade_92.sql Normal file
View File

@ -0,0 +1,27 @@
DELETE FROM director_datalist_entry WHERE entry_name IS NULL;
ALTER TABLE director_datalist_entry
MODIFY entry_name VARCHAR(255) NOT NULL;
DELETE FROM icinga_command_var WHERE varname IS NULL;
ALTER TABLE icinga_command_var
MODIFY varname VARCHAR(255) NOT NULL;
DELETE FROM icinga_host_var WHERE varname IS NULL;
ALTER TABLE icinga_host_var
MODIFY varname VARCHAR(255) NOT NULL;
DELETE FROM icinga_service_var WHERE varname IS NULL;
ALTER TABLE icinga_service_var
MODIFY varname VARCHAR(255) NOT NULL;
DELETE FROM icinga_user_var WHERE varname IS NULL;
ALTER TABLE icinga_user_var
MODIFY varname VARCHAR(255) NOT NULL;
DELETE FROM icinga_notification_var WHERE varname IS NULL;
ALTER TABLE icinga_notification_var
MODIFY varname VARCHAR(255) NOT NULL;
INSERT INTO director_schema_migration
(schema_version, migration_time)
VALUES (92, NOW());

14
schema/mysql.sql
View File

@ -105,7 +105,7 @@ CREATE TABLE director_datalist (
CREATE TABLE director_datalist_entry (
list_id INT(10) UNSIGNED NOT NULL,
entry_name VARCHAR(255) DEFAULT NULL,
entry_name VARCHAR(255) NOT NULL,
entry_value TEXT DEFAULT NULL,
format enum ('string', 'expression', 'json'),
PRIMARY KEY (list_id, entry_name),
@ -319,7 +319,7 @@ CREATE TABLE icinga_command_field (
CREATE TABLE icinga_command_var (
command_id INT(10) UNSIGNED NOT NULL,
varname VARCHAR(255) DEFAULT NULL,
varname VARCHAR(255) NOT NULL,
varvalue TEXT DEFAULT NULL,
format ENUM('string', 'expression', 'json') NOT NULL DEFAULT 'string',
PRIMARY KEY (command_id, varname),
@ -482,7 +482,7 @@ CREATE TABLE icinga_host_field (
CREATE TABLE icinga_host_var (
host_id INT(10) UNSIGNED NOT NULL,
varname VARCHAR(255) DEFAULT NULL,
varname VARCHAR(255) NOT NULL,
varvalue TEXT DEFAULT NULL,
format enum ('string', 'json', 'expression'), -- immer string vorerst
PRIMARY KEY (host_id, varname),
@ -577,7 +577,7 @@ CREATE TABLE icinga_service_inheritance (
CREATE TABLE icinga_service_var (
service_id INT(10) UNSIGNED NOT NULL,
varname VARCHAR(255) DEFAULT NULL,
varname VARCHAR(255) NOT NULL,
varvalue TEXT DEFAULT NULL,
format enum ('string', 'json', 'expression'),
PRIMARY KEY (service_id, varname),
@ -825,7 +825,7 @@ CREATE TABLE icinga_user_types_set (
CREATE TABLE icinga_user_var (
user_id INT(10) UNSIGNED NOT NULL,
varname VARCHAR(255) DEFAULT NULL,
varname VARCHAR(255) NOT NULL,
varvalue TEXT DEFAULT NULL,
format ENUM('string', 'json', 'expression') NOT NULL DEFAULT 'string',
PRIMARY KEY (user_id, varname),
@ -958,7 +958,7 @@ CREATE TABLE icinga_notification (
CREATE TABLE icinga_notification_var (
notification_id INT(10) UNSIGNED NOT NULL,
varname VARCHAR(255) DEFAULT NULL,
varname VARCHAR(255) NOT NULL,
varvalue TEXT DEFAULT NULL,
format enum ('string', 'json', 'expression'),
PRIMARY KEY (notification_id, varname),
@ -1260,4 +1260,4 @@ CREATE TABLE sync_run (
INSERT INTO director_schema_migration
SET migration_time = NOW(),
schema_version = 91;
schema_version = 92;