tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 07:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove not required column type from configScope table

Browse Source
This commit is contained in:
Sukhwinder Dhillon 2022-05-19 09:52:16 +02:00
parent f9ee442274
commit 9eea738540
5 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etc/schema/mysql-upgrades/2.11.0.sql
View File

@ -18,11 +18,10 @@ ALTER TABLE `icingaweb_user_preference`
CREATE TABLE `icingaweb_config_scope`( CREATE TABLE `icingaweb_config_scope`(
`id` int(10) unsigned NOT NULL AUTO_INCREMENT, `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`module` varchar(254) NOT NULL DEFAULT 'default', `module` varchar(254) NOT NULL DEFAULT 'default',
`type` varchar(64) NOT NULL,
`name` varchar(254) COLLATE utf8mb4_unicode_ci NOT NULL, `name` varchar(254) COLLATE utf8mb4_unicode_ci NOT NULL,
`hash` binary(20) NOT NULL COMMENT 'sha1(all option tuples)', `hash` binary(20) NOT NULL COMMENT 'sha1(all option tuples)',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE KEY `idx_module_type_name` (`module`, `type`, `name`) UNIQUE KEY `idx_module_name` (`module`, `name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE TABLE `icingaweb_config_option`( CREATE TABLE `icingaweb_config_option`(

3
etc/schema/mysql.schema.sql
View File

@ -56,11 +56,10 @@ CREATE TABLE `icingaweb_rememberme`(
CREATE TABLE `icingaweb_config_scope`( CREATE TABLE `icingaweb_config_scope`(
`id` int(10) unsigned NOT NULL AUTO_INCREMENT, `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`module` varchar(254) NOT NULL DEFAULT 'default', `module` varchar(254) NOT NULL DEFAULT 'default',
`type` varchar(64) NOT NULL,
`name` varchar(254) COLLATE utf8mb4_unicode_ci NOT NULL, `name` varchar(254) COLLATE utf8mb4_unicode_ci NOT NULL,
`hash` binary(20) NOT NULL COMMENT 'sha1(all option tuples)', `hash` binary(20) NOT NULL COMMENT 'sha1(all option tuples)',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE KEY `idx_module_type_name` (`module`, `type`, `name`) UNIQUE KEY `idx_module_name` (`module`, `name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
CREATE TABLE `icingaweb_config_option`( CREATE TABLE `icingaweb_config_option`(

4
etc/schema/pgsql-upgrades/2.11.0.sql
View File

@ -4,7 +4,6 @@ CREATE DOMAIN bytea20 AS bytea CONSTRAINT exactly_20_bytes_long CHECK ( VALUE IS
CREATE TABLE "icingaweb_config_scope" ( CREATE TABLE "icingaweb_config_scope" (
"id" serial, "id" serial,
"module" character varying(254) NOT NULL DEFAULT 'default', "module" character varying(254) NOT NULL DEFAULT 'default',
"type" character varying(64) NOT NULL,
"name" citext NOT NULL, "name" citext NOT NULL,
"hash" bytea20 NOT NULL "hash" bytea20 NOT NULL
); );
@ -17,11 +16,10 @@ ALTER TABLE ONLY "icingaweb_config_scope"
"id" "id"
); );
CREATE UNIQUE INDEX idx_module_type_name CREATE UNIQUE INDEX idx_module_name
ON "icingaweb_config_scope" ON "icingaweb_config_scope"
USING btree ( USING btree (
lower((module)::text), lower((module)::text),
lower((type)::text),
lower((name)::text) lower((name)::text)
); );

4
etc/schema/pgsql.schema.sql
View File

@ -124,7 +124,6 @@ ALTER TABLE ONLY "icingaweb_rememberme"
CREATE TABLE "icingaweb_config_scope" ( CREATE TABLE "icingaweb_config_scope" (
"id" serial, "id" serial,
"module" character varying(254) NOT NULL DEFAULT 'default', "module" character varying(254) NOT NULL DEFAULT 'default',
"type" character varying(64) NOT NULL,
"name" citext NOT NULL, "name" citext NOT NULL,
"hash" bytea20 NOT NULL "hash" bytea20 NOT NULL
); );
@ -137,11 +136,10 @@ ALTER TABLE ONLY "icingaweb_config_scope"
"id" "id"
); );
CREATE UNIQUE INDEX idx_module_type_name CREATE UNIQUE INDEX idx_module_name
ON "icingaweb_config_scope" ON "icingaweb_config_scope"
USING btree ( USING btree (
lower((module)::text), lower((module)::text),
lower((type)::text),
lower((name)::text) lower((name)::text)
); );

2
library/Icinga/Model/ConfigScope.php
View File

@ -29,7 +29,6 @@ class ConfigScope extends Model
{ {
return [ return [
'module', 'module',
'type',
'name', 'name',
'hash' 'hash'
]; ];
@ -39,7 +38,6 @@ class ConfigScope extends Model
{ {
return [ return [
'module' => t('Config Scope Module'), 'module' => t('Config Scope Module'),
'type' => t('Config Scope Type'),
'name' => t('Config Scope Name'), 'name' => t('Config Scope Name'),
'hash' => t('Config Scope Hash') 'hash' => t('Config Scope Hash')
]; ];