From bfbbebfc58071329b41d7512c7436da40d635c7a Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 28 Sep 2017 14:28:05 +0200 Subject: [PATCH] Revert "schema: fix table order" This reverts commit 13018112813887f7fc9d3ac2462c98ffe2a6b185. --- schema/mysql.sql | 68 ++++++++++++++++++++--------------------- schema/pgsql.sql | 79 ++++++++++++++++++++++++------------------------ 2 files changed, 73 insertions(+), 74 deletions(-) diff --git a/schema/mysql.sql b/schema/mysql.sql index 0bd84bc0..3cfe8de6 100644 --- a/schema/mysql.sql +++ b/schema/mysql.sql @@ -422,6 +422,23 @@ CREATE TABLE icinga_endpoint_inheritance ( ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +CREATE TABLE icinga_host_template_choice ( + id INT(10) UNSIGNED AUTO_INCREMENT NOT NULL, + object_name VARCHAR(64) NOT NULL, + description TEXT DEFAULT NULL, + min_required SMALLINT UNSIGNED NOT NULL DEFAULT 0, + max_allowed SMALLINT UNSIGNED NOT NULL DEFAULT 1, + required_template_id INT(10) UNSIGNED DEFAULT NULL, + allowed_roles VARCHAR(255) DEFAULT NULL, + CONSTRAINT host_template_choice_required_template + FOREIGN KEY required_template (required_template_id) + REFERENCES icinga_host (id) + ON DELETE RESTRICT + ON UPDATE CASCADE, + PRIMARY KEY (id), + UNIQUE KEY (object_name) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + CREATE TABLE icinga_host ( id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, object_name VARCHAR(255) NOT NULL, @@ -545,23 +562,6 @@ CREATE TABLE icinga_host_var ( ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -CREATE TABLE icinga_host_template_choice ( - id INT(10) UNSIGNED AUTO_INCREMENT NOT NULL, - object_name VARCHAR(64) NOT NULL, - description TEXT DEFAULT NULL, - min_required SMALLINT UNSIGNED NOT NULL DEFAULT 0, - max_allowed SMALLINT UNSIGNED NOT NULL DEFAULT 1, - required_template_id INT(10) UNSIGNED DEFAULT NULL, - allowed_roles VARCHAR(255) DEFAULT NULL, - CONSTRAINT host_template_choice_required_template - FOREIGN KEY required_template (required_template_id) - REFERENCES icinga_host (id) - ON DELETE RESTRICT - ON UPDATE CASCADE, - PRIMARY KEY (id), - UNIQUE KEY (object_name) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - CREATE TABLE icinga_service_set ( id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, object_name VARCHAR(128) NOT NULL, @@ -578,6 +578,23 @@ CREATE TABLE icinga_service_set ( ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +CREATE TABLE icinga_service_template_choice ( + id INT(10) UNSIGNED AUTO_INCREMENT NOT NULL, + object_name VARCHAR(64) NOT NULL, + description TEXT DEFAULT NULL, + min_required SMALLINT UNSIGNED NOT NULL DEFAULT 0, + max_allowed SMALLINT UNSIGNED NOT NULL DEFAULT 1, + required_template_id INT(10) UNSIGNED DEFAULT NULL, + allowed_roles VARCHAR(255) DEFAULT NULL, + CONSTRAINT service_template_choice_required_template + FOREIGN KEY required_template (required_template_id) + REFERENCES icinga_service (id) + ON DELETE RESTRICT + ON UPDATE CASCADE, + PRIMARY KEY (id), + UNIQUE KEY (object_name) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + CREATE TABLE icinga_service ( id INT(10) UNSIGNED NOT NULL AUTO_INCREMENT, object_name VARCHAR(255) NOT NULL, @@ -709,23 +726,6 @@ CREATE TABLE icinga_service_field ( ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -CREATE TABLE icinga_service_template_choice ( - id INT(10) UNSIGNED AUTO_INCREMENT NOT NULL, - object_name VARCHAR(64) NOT NULL, - description TEXT DEFAULT NULL, - min_required SMALLINT UNSIGNED NOT NULL DEFAULT 0, - max_allowed SMALLINT UNSIGNED NOT NULL DEFAULT 1, - required_template_id INT(10) UNSIGNED DEFAULT NULL, - allowed_roles VARCHAR(255) DEFAULT NULL, - CONSTRAINT service_template_choice_required_template - FOREIGN KEY required_template (required_template_id) - REFERENCES icinga_service (id) - ON DELETE RESTRICT - ON UPDATE CASCADE, - PRIMARY KEY (id), - UNIQUE KEY (object_name) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; - CREATE TABLE icinga_host_service ( host_id INT(10) UNSIGNED NOT NULL, service_id INT(10) UNSIGNED NOT NULL, diff --git a/schema/pgsql.sql b/schema/pgsql.sql index ae2ebb31..5eb2233a 100644 --- a/schema/pgsql.sql +++ b/schema/pgsql.sql @@ -545,6 +545,25 @@ CREATE INDEX endpoint_inheritance_endpoint ON icinga_endpoint_inheritance (endpo CREATE INDEX endpoint_inheritance_endpoint_parent ON icinga_endpoint_inheritance (parent_endpoint_id); +CREATE TABLE icinga_host_template_choice ( + id serial, + object_name character varying(64) NOT NULL, + description text DEFAULT NULL, + min_required smallint NOT NULL DEFAULT 0, + max_allowed smallint NOT NULL DEFAULT 1, + required_template_id integer DEFAULT NULL, + allowed_roles character varying(255) DEFAULT NULL, + CONSTRAINT host_template_choice_required_template + FOREIGN KEY (required_template_id) + REFERENCES icinga_host (id) + ON DELETE RESTRICT + ON UPDATE CASCADE, + PRIMARY KEY (id) +); + +CREATE UNIQUE INDEX host_template_choice_object_name ON icinga_host_template_choice (object_name); +CREATE INDEX host_template_choice_required_template ON icinga_host_template_choice (required_template_id); + CREATE TABLE icinga_host ( id serial, object_name character varying(255) NOT NULL, @@ -689,26 +708,6 @@ CREATE INDEX host_var_host ON icinga_host_var (host_id); CREATE INDEX host_var_checksum ON icinga_host_var (checksum); -CREATE TABLE icinga_host_template_choice ( - id serial, - object_name character varying(64) NOT NULL, - description text DEFAULT NULL, - min_required smallint NOT NULL DEFAULT 0, - max_allowed smallint NOT NULL DEFAULT 1, - required_template_id integer DEFAULT NULL, - allowed_roles character varying(255) DEFAULT NULL, - CONSTRAINT host_template_choice_required_template - FOREIGN KEY (required_template_id) - REFERENCES icinga_host (id) - ON DELETE RESTRICT - ON UPDATE CASCADE, - PRIMARY KEY (id) -); - -CREATE UNIQUE INDEX host_template_choice_object_name ON icinga_host_template_choice (object_name); -CREATE INDEX host_template_choice_required_template ON icinga_host_template_choice (required_template_id); - - CREATE TABLE icinga_service_set ( id serial, host_id integer DEFAULT NULL, @@ -728,6 +727,26 @@ CREATE UNIQUE INDEX service_set_name ON icinga_service_set (object_name, host_id CREATE INDEX service_set_host ON icinga_service_set (host_id); +CREATE TABLE icinga_service_template_choice ( + id serial, + object_name character varying(64) NOT NULL, + description text DEFAULT NULL, + min_required smallint NOT NULL DEFAULT 0, + max_allowed smallint NOT NULL DEFAULT 1, + required_template_id integer DEFAULT NULL, + allowed_roles character varying(255) DEFAULT NULL, + CONSTRAINT service_template_choice_required_template + FOREIGN KEY (required_template_id) + REFERENCES icinga_service (id) + ON DELETE RESTRICT + ON UPDATE CASCADE, + PRIMARY KEY (id) +); + +CREATE UNIQUE INDEX service_template_choice_object_name ON icinga_service_template_choice (object_name); +CREATE INDEX service_template_choice_required_template ON icinga_service_template_choice (required_template_id); + + CREATE TABLE icinga_service ( id serial, object_name character varying(255) NOT NULL, @@ -880,26 +899,6 @@ CREATE INDEX service_field_datafield ON icinga_service_field (datafield_id); COMMENT ON COLUMN icinga_service_field.service_id IS 'Makes only sense for templates'; -CREATE TABLE icinga_service_template_choice ( - id serial, - object_name character varying(64) NOT NULL, - description text DEFAULT NULL, - min_required smallint NOT NULL DEFAULT 0, - max_allowed smallint NOT NULL DEFAULT 1, - required_template_id integer DEFAULT NULL, - allowed_roles character varying(255) DEFAULT NULL, - CONSTRAINT service_template_choice_required_template - FOREIGN KEY (required_template_id) - REFERENCES icinga_service (id) - ON DELETE RESTRICT - ON UPDATE CASCADE, - PRIMARY KEY (id) -); - -CREATE UNIQUE INDEX service_template_choice_object_name ON icinga_service_template_choice (object_name); -CREATE INDEX service_template_choice_required_template ON icinga_service_template_choice (required_template_id); - - CREATE TABLE icinga_host_service ( host_id integer NOT NULL, service_id integer NOT NULL,