From 17b6b6a41d17006c5bf68fd7cd41fb42dbc3829c Mon Sep 17 00:00:00 2001 From: Victor Kirhenshtein Date: Tue, 20 Sep 2016 14:39:54 +0300 Subject: [PATCH 1/1] fix in DB upgrade procedure and schema init script --- sql/schema.in | 4 ++-- src/server/tools/nxdbmgr/upgrade.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) 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(""); CHK_EXEC(SQLBatch(batch)); CHK_EXEC(SetSchemaVersion(384)); -- 2.20.1