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/pgsql: allow no null var names

This commit is contained in:
Thomas Gelf 2016-05-20 23:20:19 +02:00
parent 9c31a51a18
commit 0e9a1392e5
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/pgsql-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 ALTER COLUMN entry_name DROP DEFAULT;
ALTER TABLE director_datalist_entry ALTER COLUMN entry_name SET NOT NULL;
DELETE FROM icinga_command_var WHERE varname IS NULL;
ALTER TABLE icinga_command_var ALTER COLUMN varname DROP DEFAULT;
ALTER TABLE icinga_command_var ALTER COLUMN varname SET NOT NULL;
DELETE FROM icinga_host_var WHERE varname IS NULL;
ALTER TABLE icinga_host_var ALTER COLUMN varname DROP DEFAULT;
ALTER TABLE icinga_host_var ALTER COLUMN varname SET NOT NULL;
DELETE FROM icinga_service_var WHERE varname IS NULL;
ALTER TABLE icinga_service_var ALTER COLUMN varname DROP DEFAULT;
ALTER TABLE icinga_service_var ALTER COLUMN varname SET NOT NULL;
DELETE FROM icinga_user_var WHERE varname IS NULL;
ALTER TABLE icinga_user_var ALTER COLUMN varname DROP DEFAULT;
ALTER TABLE icinga_user_var ALTER COLUMN varname SET NOT NULL;
DELETE FROM icinga_notification_var WHERE varname IS NULL;
ALTER TABLE icinga_notification_var ALTER COLUMN varname DROP DEFAULT;
ALTER TABLE icinga_notification_var ALTER COLUMN varname SET NOT NULL;
INSERT INTO director_schema_migration
(schema_version, migration_time)
VALUES (92, NOW());

14
schema/pgsql.sql
View File

@ -158,7 +158,7 @@ CREATE UNIQUE INDEX datalist_list_name ON director_datalist (list_name);
CREATE TABLE director_datalist_entry ( CREATE TABLE director_datalist_entry (
list_id integer NOT NULL, list_id integer NOT NULL,
entry_name character varying(255) DEFAULT NULL, entry_name character varying(255) NOT NULL,
entry_value text DEFAULT NULL, entry_value text DEFAULT NULL,
format enum_property_format, format enum_property_format,
PRIMARY KEY (list_id, entry_name), PRIMARY KEY (list_id, entry_name),
@ -414,7 +414,7 @@ CREATE TABLE icinga_command_field (
CREATE TABLE icinga_command_var ( CREATE TABLE icinga_command_var (
command_id integer NOT NULL, command_id integer NOT NULL,
varname character varying(255) DEFAULT NULL, varname character varying(255) NOT NULL,
varvalue text DEFAULT NULL, varvalue text DEFAULT NULL,
format enum_property_format NOT NULL DEFAULT 'string', format enum_property_format NOT NULL DEFAULT 'string',
PRIMARY KEY (command_id, varname), PRIMARY KEY (command_id, varname),
@ -609,7 +609,7 @@ COMMENT ON COLUMN icinga_host_field.host_id IS 'Makes only sense for templates';
CREATE TABLE icinga_host_var ( CREATE TABLE icinga_host_var (
host_id integer NOT NULL, host_id integer NOT NULL,
varname character varying(255) DEFAULT NULL, varname character varying(255) NOT NULL,
varvalue text DEFAULT NULL, varvalue text DEFAULT NULL,
format enum_property_format, -- immer string vorerst format enum_property_format, -- immer string vorerst
PRIMARY KEY (host_id, varname), PRIMARY KEY (host_id, varname),
@ -718,7 +718,7 @@ CREATE INDEX service_inheritance_service_parent ON icinga_service_inheritance (p
CREATE TABLE icinga_service_var ( CREATE TABLE icinga_service_var (
service_id integer NOT NULL, service_id integer NOT NULL,
varname character varying(255) DEFAULT NULL, varname character varying(255) NOT NULL,
varvalue text DEFAULT NULL, varvalue text DEFAULT NULL,
format enum_property_format, format enum_property_format,
PRIMARY KEY (service_id, varname), PRIMARY KEY (service_id, varname),
@ -1000,7 +1000,7 @@ COMMENT ON COLUMN icinga_user_types_set.merge_behaviour IS 'override: = [], exte
CREATE TABLE icinga_user_var ( CREATE TABLE icinga_user_var (
user_id integer NOT NULL, user_id integer NOT NULL,
varname character varying(255) DEFAULT NULL, varname character varying(255) NOT NULL,
varvalue text DEFAULT NULL, varvalue text DEFAULT NULL,
format enum_property_format NOT NULL DEFAULT 'string', format enum_property_format NOT NULL DEFAULT 'string',
PRIMARY KEY (user_id, varname), PRIMARY KEY (user_id, varname),
@ -1437,7 +1437,7 @@ COMMENT ON COLUMN icinga_notification_types_set.merge_behaviour IS 'override: =
CREATE TABLE icinga_notification_var ( CREATE TABLE icinga_notification_var (
notification_id integer NOT NULL, notification_id integer NOT NULL,
varname VARCHAR(255) DEFAULT NULL, varname VARCHAR(255) NOT NULL,
varvalue TEXT DEFAULT NULL, varvalue TEXT DEFAULT NULL,
format enum_property_format, format enum_property_format,
PRIMARY KEY (notification_id, varname), PRIMARY KEY (notification_id, varname),
@ -1473,4 +1473,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 (91, NOW()); VALUES (92, NOW());