diff options
| -rw-r--r-- | create/src/schema.tmpl | 2 | ||||
| -rw-r--r-- | src/libs/zbxdbupgrade/dbupgrade_5050.c | 48 | ||||
| -rw-r--r-- | ui/include/defines.inc.php | 2 |
3 files changed, 50 insertions, 2 deletions
diff --git a/create/src/schema.tmpl b/create/src/schema.tmpl index ba3b86b4792..27fb842f1d2 100644 --- a/create/src/schema.tmpl +++ b/create/src/schema.tmpl @@ -1937,4 +1937,4 @@ FIELD |dbversionid |t_id | |NOT NULL |0 FIELD |mandatory |t_integer |'0' |NOT NULL | FIELD |optional |t_integer |'0' |NOT NULL | -ROW |1 |5050143 |5050143 +ROW |1 |5050147 |5050147 diff --git a/src/libs/zbxdbupgrade/dbupgrade_5050.c b/src/libs/zbxdbupgrade/dbupgrade_5050.c index 71d1875708c..a87703bb39e 100644 --- a/src/libs/zbxdbupgrade/dbupgrade_5050.c +++ b/src/libs/zbxdbupgrade/dbupgrade_5050.c @@ -1895,6 +1895,50 @@ static int DBpatch_5050143(void) return DBmodify_field_type("alerts", &field, &old_field); } +static int DBpatch_5050144(void) +{ + if (0 == (program_type & ZBX_PROGRAM_TYPE_SERVER)) + return SUCCEED; + + if (ZBX_DB_OK > DBexecute("delete from profiles where idx='web.charts.filter.search_type'")) + return FAIL; + + return SUCCEED; +} + +static int DBpatch_5050145(void) +{ + if (0 == (program_type & ZBX_PROGRAM_TYPE_SERVER)) + return SUCCEED; + + if (ZBX_DB_OK > DBexecute("delete from profiles where idx='web.charts.filter.graphids'")) + return FAIL; + + return SUCCEED; +} + +static int DBpatch_5050146(void) +{ + if (0 == (program_type & ZBX_PROGRAM_TYPE_SERVER)) + return SUCCEED; + + if (ZBX_DB_OK > DBexecute("delete from profiles where idx='web.charts.filter.graph_patterns'")) + return FAIL; + + return SUCCEED; +} + +static int DBpatch_5050147(void) +{ + if (0 == (program_type & ZBX_PROGRAM_TYPE_SERVER)) + return SUCCEED; + + if (ZBX_DB_OK > DBexecute("delete from profiles where idx='web.favorite.graphids' and source='graphid'")) + return FAIL; + + return SUCCEED; +} + #endif DBPATCH_START(5050) @@ -2032,5 +2076,9 @@ DBPATCH_ADD(5050140, 0, 1) DBPATCH_ADD(5050141, 0, 1) DBPATCH_ADD(5050142, 0, 1) DBPATCH_ADD(5050143, 0, 1) +DBPATCH_ADD(5050144, 0, 1) +DBPATCH_ADD(5050145, 0, 1) +DBPATCH_ADD(5050146, 0, 1) +DBPATCH_ADD(5050147, 0, 1) DBPATCH_END() diff --git a/ui/include/defines.inc.php b/ui/include/defines.inc.php index 0a25e9640c6..9affb002a08 100644 --- a/ui/include/defines.inc.php +++ b/ui/include/defines.inc.php @@ -22,7 +22,7 @@ define('ZABBIX_VERSION', '6.0.0rc1'); define('ZABBIX_API_VERSION', '6.0.0'); define('ZABBIX_EXPORT_VERSION', '6.0'); -define('ZABBIX_DB_VERSION', 5050143); +define('ZABBIX_DB_VERSION', 5050147); define('DB_VERSION_SUPPORTED', 0); define('DB_VERSION_LOWER_THAN_MINIMUM', 1); |