From: Victor Kirhenshtein <victor@netxms.org>
Date: Tue, 20 Sep 2016 11:39:54 +0000 (+0300)
Subject: fix in DB upgrade procedure and schema init script
X-Git-Tag: 2.1-M1~41
X-Git-Url: http://git.netxms.org/public/netxms.git/commitdiff_plain/17b6b6a41d17006c5bf68fd7cd41fb42dbc3829c?hp=2f812b47a478528e0b3133ab2b24a414a37b04ff

fix in DB upgrade procedure and schema init script
---

diff --git a/sql/schema.in b/sql/schema.in
index 8bfba2885..e37a3dcc7 100644
--- a/sql/schema.in
+++ b/sql/schema.in
@@ -1765,8 +1765,8 @@ CREATE TABLE graphs
   owner_id integer not null,
   flags integer not null,
   name varchar(255) not null,
-  config SQL_TEXT not null,
-  filters SQL_TEXT not null,
+  config SQL_TEXT null,
+  filters SQL_TEXT null,
   PRIMARY KEY(graph_id)
 ) TABLE_TYPE;
 
diff --git a/src/server/tools/nxdbmgr/upgrade.cpp b/src/server/tools/nxdbmgr/upgrade.cpp
index ed8c1aedd..e0fc34729 100644
--- a/src/server/tools/nxdbmgr/upgrade.cpp
+++ b/src/server/tools/nxdbmgr/upgrade.cpp
@@ -1977,6 +1977,7 @@ static BOOL H_UpgradeFromV383(int currVersion, int newVersion)
    static TCHAR batch[] =
       _T("ALTER TABLE graphs ADD flags integer\n")
       _T("ALTER TABLE graphs ADD filters $SQL:TEXT\n")
+      _T("UPDATE graphs SET flags=0\n")
       _T("<END>");
    CHK_EXEC(SQLBatch(batch));
    CHK_EXEC(SetSchemaVersion(384));