Removed NOT NULL constraint from column dci_summary_tables.menu_path

diff --git a/include/netxmsdb.h b/include/netxmsdb.h
index a35c612..3238440 100644 (file)
--- a/include/netxmsdb.h
+++ b/include/netxmsdb.h
@@ -23,6 +23,6 @@
 #ifndef _netxmsdb_h
 #define _netxmsdb_h
 
-#define DB_FORMAT_VERSION   414
+#define DB_FORMAT_VERSION   415
 
 #endif

diff --git a/sql/schema.in b/sql/schema.in
index f9fdf9a..8bfba28 100644 (file)
--- a/sql/schema.in
+++ b/sql/schema.in
@@ -2367,7 +2367,7 @@ CREATE TABLE dci_summary_tables
 (
   id integer not null,
   guid varchar(36) not null,
-  menu_path varchar(255) not null,
+  menu_path varchar(255) null,
   title varchar(127) null,
   node_filter SQL_TEXT null,
   flags integer not null,

diff --git a/src/server/tools/nxdbmgr/upgrade.cpp b/src/server/tools/nxdbmgr/upgrade.cpp
index b6569cf..ed8c1ae 100644 (file)
--- a/src/server/tools/nxdbmgr/upgrade.cpp
+++ b/src/server/tools/nxdbmgr/upgrade.cpp
@@ -721,6 +721,16 @@ static bool SetSchemaVersion(int version)
    return SQLQuery(query);
 }
 
+/**
+ * Upgrade from V414 to V415
+ */
+static BOOL H_UpgradeFromV414(int currVersion, int newVersion)
+{
+   CHK_EXEC(RemoveNotNullConstraint(_T("dci_summary_tables"), _T("menu_path")));
+   CHK_EXEC(SetSchemaVersion(415));
+   return TRUE;
+}
+
 /**
  * Upgrade from V413 to V414
  */
@@ -10547,6 +10557,7 @@ static struct
    { 411, 412, H_UpgradeFromV411 },
    { 412, 413, H_UpgradeFromV412 },
    { 413, 414, H_UpgradeFromV413 },
+   { 414, 415, H_UpgradeFromV414 },
    { 0, 0, NULL }
 };