tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-31 01:34:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

schema: command argument_name should not be null

Browse Source 
fixes #11554
fixes #11918
This commit is contained in:
Thomas Gelf 2016-08-26 07:02:15 +00:00
parent b6d59b9aca
commit fbf4400ad2
4 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
schema/mysql-migrations/upgrade_103.sql Normal file
View File

@ -0,0 +1,12 @@
UPDATE icinga_command_argument
SET
argument_name = '(no key)',
skip_key = 'y'
WHERE argument_name IS NULL;
ALTER TABLE icinga_command_argument
MODIFY argument_name VARCHAR(64) COLLATE utf8_bin NOT NULL COMMENT '-x, --host';
INSERT INTO director_schema_migration
(schema_version, migration_time)
VALUES (103, NOW());

4
schema/mysql.sql
View File

@ -311,7 +311,7 @@ CREATE TABLE icinga_command_inheritance (
CREATE TABLE icinga_command_argument ( CREATE TABLE icinga_command_argument (
id INT(10) UNSIGNED AUTO_INCREMENT NOT NULL, id INT(10) UNSIGNED AUTO_INCREMENT NOT NULL,
command_id INT(10) UNSIGNED NOT NULL, command_id INT(10) UNSIGNED NOT NULL,
argument_name VARCHAR(64) COLLATE utf8_bin DEFAULT NULL COMMENT '-x, --host', argument_name VARCHAR(64) COLLATE utf8_bin NOT NULL COMMENT '-x, --host',
argument_value TEXT DEFAULT NULL, argument_value TEXT DEFAULT NULL,
argument_format ENUM('string', 'expression', 'json') NULL DEFAULT NULL, argument_format ENUM('string', 'expression', 'json') NULL DEFAULT NULL,
key_string VARCHAR(64) DEFAULT NULL COMMENT 'Overrides name', key_string VARCHAR(64) DEFAULT NULL COMMENT 'Overrides name',
@ -1312,4 +1312,4 @@ CREATE TABLE sync_run (
INSERT INTO director_schema_migration INSERT INTO director_schema_migration
SET migration_time = NOW(), SET migration_time = NOW(),
schema_version = 102; schema_version = 103;

11
schema/pgsql-migrations/upgrade_103.sql Normal file
View File

@ -0,0 +1,11 @@
UPDATE icinga_command_argument
SET
argument_name = '(no key)',
skip_key = 'y'
WHERE argument_name is null;
ALTER TABLE icinga_command_argument ALTER COLUMN argument_name SET NOT NULL;
INSERT INTO director_schema_migration
(schema_version, migration_time)
VALUES (103, NOW());

4
schema/pgsql.sql
View File

@ -416,7 +416,7 @@ CREATE INDEX command_inheritance_command_parent ON icinga_command_inheritance (p
CREATE TABLE icinga_command_argument ( CREATE TABLE icinga_command_argument (
id serial, id serial,
command_id integer NOT NULL, command_id integer NOT NULL,
argument_name character varying(64) DEFAULT NULL, argument_name character varying(64) NOT NULL,
argument_value text DEFAULT NULL, argument_value text DEFAULT NULL,
argument_format enum_property_format DEFAULT NULL, argument_format enum_property_format DEFAULT NULL,
key_string character varying(64) DEFAULT NULL, key_string character varying(64) DEFAULT NULL,
@ -1532,4 +1532,4 @@ CREATE UNIQUE INDEX notification_inheritance ON icinga_notification_inheritance
INSERT INTO director_schema_migration INSERT INTO director_schema_migration
(schema_version, migration_time) (schema_version, migration_time)
VALUES (102, NOW()); VALUES (103, NOW());