From ac207dce7796f2887e8ae10115747fd45bfc84d3 Mon Sep 17 00:00:00 2001 From: Dmitrijs Goloscapovs Date: Wed, 1 Mar 2023 11:52:22 -0500 Subject: [PATCH] .......... [ZBX-22363] fixed dbschema and dbpatch for testing .......... [ZBX-22363] fixed (cherry picked from commit 634b7593b6b4d8317109a9ad358100e933d544c8) --- create/src/schema.tmpl | 10 +++++----- src/libs/zbxdbupgrade/dbupgrade_5010.c | 20 ++++---------------- src/libs/zbxdbupgrade/dbupgrade_5050.c | 5 +---- ui/include/schema.inc.php | 10 +++++----- 4 files changed, 15 insertions(+), 30 deletions(-) diff --git a/create/src/schema.tmpl b/create/src/schema.tmpl index 5c19cd55e63..eccd25493a9 100644 --- a/create/src/schema.tmpl +++ b/create/src/schema.tmpl @@ -232,7 +232,7 @@ FIELD |formula |t_varchar(255) |'' |NOT NULL |0 FIELD |logtimefmt |t_varchar(64) |'' |NOT NULL |ZBX_PROXY FIELD |templateid |t_id | |NULL |0 |2|items |itemid FIELD |valuemapid |t_id | |NULL |0 |3|valuemap | |RESTRICT -FIELD |params |t_text |'' |NOT NULL |ZBX_PROXY +FIELD |params |t_shorttext |'' |NOT NULL |ZBX_PROXY FIELD |ipmi_sensor |t_varchar(128) |'' |NOT NULL |ZBX_PROXY FIELD |authtype |t_integer |'0' |NOT NULL |ZBX_PROXY FIELD |username |t_varchar(64) |'' |NOT NULL |ZBX_PROXY @@ -241,7 +241,7 @@ FIELD |publickey |t_varchar(64) |'' |NOT NULL |ZBX_PROXY FIELD |privatekey |t_varchar(64) |'' |NOT NULL |ZBX_PROXY FIELD |flags |t_integer |'0' |NOT NULL |ZBX_PROXY FIELD |interfaceid |t_id | |NULL |ZBX_PROXY |4|interface | |RESTRICT -FIELD |description |t_text |'' |NOT NULL |0 +FIELD |description |t_shorttext |'' |NOT NULL |0 FIELD |inventory_link |t_integer |'0' |NOT NULL |ZBX_PROXY FIELD |lifetime |t_varchar(255) |'30d' |NOT NULL |0 FIELD |evaltype |t_integer |'0' |NOT NULL |0 @@ -250,12 +250,12 @@ FIELD |master_itemid |t_id | |NULL |ZBX_PROXY |5|items |itemid FIELD |timeout |t_varchar(255) |'3s' |NOT NULL |ZBX_PROXY FIELD |url |t_varchar(2048)|'' |NOT NULL |ZBX_PROXY FIELD |query_fields |t_varchar(2048)|'' |NOT NULL |ZBX_PROXY -FIELD |posts |t_text |'' |NOT NULL |ZBX_PROXY +FIELD |posts |t_shorttext |'' |NOT NULL |ZBX_PROXY FIELD |status_codes |t_varchar(255) |'200' |NOT NULL |ZBX_PROXY FIELD |follow_redirects|t_integer |'1' |NOT NULL |ZBX_PROXY FIELD |post_type |t_integer |'0' |NOT NULL |ZBX_PROXY FIELD |http_proxy |t_varchar(255) |'' |NOT NULL |ZBX_PROXY,ZBX_NODATA -FIELD |headers |t_text |'' |NOT NULL |ZBX_PROXY +FIELD |headers |t_shorttext |'' |NOT NULL |ZBX_PROXY FIELD |retrieve_mode |t_integer |'0' |NOT NULL |ZBX_PROXY FIELD |request_method |t_integer |'0' |NOT NULL |ZBX_PROXY FIELD |output_format |t_integer |'0' |NOT NULL |ZBX_PROXY @@ -1472,7 +1472,7 @@ FIELD |item_preprocid |t_id | |NOT NULL |0 FIELD |itemid |t_id | |NOT NULL |ZBX_PROXY |1|items FIELD |step |t_integer |'0' |NOT NULL |ZBX_PROXY FIELD |type |t_integer |'0' |NOT NULL |ZBX_PROXY -FIELD |params |t_text |'' |NOT NULL |ZBX_PROXY +FIELD |params |t_shorttext |'' |NOT NULL |ZBX_PROXY FIELD |error_handler |t_integer |'0' |NOT NULL |ZBX_PROXY FIELD |error_handler_params|t_varchar(255)|'' |NOT NULL |ZBX_PROXY INDEX |1 |itemid,step diff --git a/src/libs/zbxdbupgrade/dbupgrade_5010.c b/src/libs/zbxdbupgrade/dbupgrade_5010.c index 113ec0c42ba..20f4be08418 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_5010.c +++ b/src/libs/zbxdbupgrade/dbupgrade_5010.c @@ -264,34 +264,22 @@ static int DBpatch_5010028(void) static int DBpatch_5010029(void) { - const ZBX_FIELD old_field = {"params", "", NULL, NULL, 0, ZBX_TYPE_SHORTTEXT, ZBX_NOTNULL, 0}; - const ZBX_FIELD field = {"params", "", NULL, NULL, 0, ZBX_TYPE_TEXT, ZBX_NOTNULL, 0}; - - return DBmodify_field_type("items", &field, &old_field); + return SUCCEED; } static int DBpatch_5010030(void) { - const ZBX_FIELD old_field = {"description", "", NULL, NULL, 0, ZBX_TYPE_SHORTTEXT, ZBX_NOTNULL, 0}; - const ZBX_FIELD field = {"description", "", NULL, NULL, 0, ZBX_TYPE_TEXT, ZBX_NOTNULL, 0}; - - return DBmodify_field_type("items", &field, &old_field); + return SUCCEED; } static int DBpatch_5010031(void) { - const ZBX_FIELD old_field = {"posts", "", NULL, NULL, 0, ZBX_TYPE_SHORTTEXT, ZBX_NOTNULL, 0}; - const ZBX_FIELD field = {"posts", "", NULL, NULL, 0, ZBX_TYPE_TEXT, ZBX_NOTNULL, 0}; - - return DBmodify_field_type("items", &field, &old_field); + return SUCCEED; } static int DBpatch_5010032(void) { - const ZBX_FIELD old_field = {"headers", "", NULL, NULL, 0, ZBX_TYPE_SHORTTEXT, ZBX_NOTNULL, 0}; - const ZBX_FIELD field = {"headers", "", NULL, NULL, 0, ZBX_TYPE_TEXT, ZBX_NOTNULL, 0}; - - return DBmodify_field_type("items", &field, &old_field); + return SUCCEED; } static int DBpatch_5010033(void) diff --git a/src/libs/zbxdbupgrade/dbupgrade_5050.c b/src/libs/zbxdbupgrade/dbupgrade_5050.c index 2ca9f6e81cd..1ccac79f123 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_5050.c +++ b/src/libs/zbxdbupgrade/dbupgrade_5050.c @@ -720,10 +720,7 @@ static int DBpatch_5050068(void) static int DBpatch_5050070(void) { - const ZBX_FIELD old_field = {"params", "", NULL, NULL, 0, ZBX_TYPE_SHORTTEXT, ZBX_NOTNULL, 0}; - const ZBX_FIELD field = {"params", "", NULL, NULL, 0, ZBX_TYPE_TEXT, ZBX_NOTNULL, 0}; - - return DBmodify_field_type("item_preproc", &field, &old_field); + return SUCCEED; } static int DBpatch_5050071(void) diff --git a/ui/include/schema.inc.php b/ui/include/schema.inc.php index 3be543d96a7..d0b861d1cb8 100644 --- a/ui/include/schema.inc.php +++ b/ui/include/schema.inc.php @@ -1025,7 +1025,7 @@ return [ ], 'params' => [ 'null' => false, - 'type' => DB::FIELD_TYPE_NCLOB, + 'type' => DB::FIELD_TYPE_TEXT, 'default' => '' ], 'ipmi_sensor' => [ @@ -1079,7 +1079,7 @@ return [ ], 'description' => [ 'null' => false, - 'type' => DB::FIELD_TYPE_NCLOB, + 'type' => DB::FIELD_TYPE_TEXT, 'default' => '' ], 'inventory_link' => [ @@ -1133,7 +1133,7 @@ return [ ], 'posts' => [ 'null' => false, - 'type' => DB::FIELD_TYPE_NCLOB, + 'type' => DB::FIELD_TYPE_TEXT, 'default' => '' ], 'status_codes' => [ @@ -1162,7 +1162,7 @@ return [ ], 'headers' => [ 'null' => false, - 'type' => DB::FIELD_TYPE_NCLOB, + 'type' => DB::FIELD_TYPE_TEXT, 'default' => '' ], 'retrieve_mode' => [ @@ -6832,7 +6832,7 @@ return [ ], 'params' => [ 'null' => false, - 'type' => DB::FIELD_TYPE_NCLOB, + 'type' => DB::FIELD_TYPE_TEXT, 'default' => '' ], 'error_handler' => [ -- 2.30.2