From 6baf94b64ec77aa98c53ba7afda93d571c4876c4 Mon Sep 17 00:00:00 2001
From: Patrick Linstruth <patrick@deltecent.com>
Date: Tue, 23 Oct 2018 07:25:15 -0700
Subject: [PATCH] Incremented database version to 298

---
 ChangeLog                      |  1 +
 lib/dbversion.h                |  2 +-
 utils/rddbmgr/revertschema.cpp | 18 ++++++++++++++++++
 utils/rddbmgr/schemamap.cpp    |  2 +-
 utils/rddbmgr/updateschema.cpp | 28 ++++++++++++++++------------
 5 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index efd3799c..78b2fc56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17854,3 +17854,4 @@
 2018-10-22 Patrick Linstruth <patrick@deltecent.com>
 	* Changed `RDLOGEDIT.INPUT_CARD` and `RDLOGEDIT.OUTPUT_CARD`
 	defaults to 0 to match RDLIBRARY defaults
+	* Incremented the database version to 298.
diff --git a/lib/dbversion.h b/lib/dbversion.h
index a58c434e..6e69779d 100644
--- a/lib/dbversion.h
+++ b/lib/dbversion.h
@@ -24,7 +24,7 @@
 /*
  * Current Database Version
  */
-#define RD_VERSION_DATABASE 297
+#define RD_VERSION_DATABASE 298
 
 
 #endif  // DBVERSION_H
diff --git a/utils/rddbmgr/revertschema.cpp b/utils/rddbmgr/revertschema.cpp
index b1d8c19b..c72c6ddf 100644
--- a/utils/rddbmgr/revertschema.cpp
+++ b/utils/rddbmgr/revertschema.cpp
@@ -40,6 +40,24 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg)
 
   // NEW SCHEMA REVERSIONS GO HERE...
 
+  //
+  // Revert 298
+  //
+  if((cur_schema==298)&&(set_schema<cur_schema)) {
+    sql=QString("alter table RDLOGEDIT ")+
+      "modify column INPUT_CARD int(11) default -1";
+    if(!RDSqlQuery::apply(sql,err_msg)) {
+      return false;
+    }
+
+    sql=QString("alter table RDLOGEDIT ")+
+      "modify column OUTPUT_CARD int(11) default -1";
+    if(!RDSqlQuery::apply(sql,err_msg)) {
+      return false;
+    }
+
+    WriteSchemaVersion(--cur_schema);
+  }
 
   //
   // Maintainer's Note:
diff --git a/utils/rddbmgr/schemamap.cpp b/utils/rddbmgr/schemamap.cpp
index 8f6a42f8..d661e9f9 100644
--- a/utils/rddbmgr/schemamap.cpp
+++ b/utils/rddbmgr/schemamap.cpp
@@ -140,7 +140,7 @@ void MainObject::InitializeSchemaMap() {
   global_version_map["2.17"]=268;
   global_version_map["2.18"]=272;
   global_version_map["2.19"]=275;
-  global_version_map["3.0"]=297;
+  global_version_map["3.0"]=298;
 }
 
 
diff --git a/utils/rddbmgr/updateschema.cpp b/utils/rddbmgr/updateschema.cpp
index 4f16b8c3..eb426eeb 100644
--- a/utils/rddbmgr/updateschema.cpp
+++ b/utils/rddbmgr/updateschema.cpp
@@ -9161,18 +9161,6 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg)
       return false;
     }
 
-    sql=QString("alter table RDLOGEDIT ")+
-      "modify column INPUT_CARD int(11) default 0";
-    if(!RDSqlQuery::apply(sql,err_msg)) {
-      return false;
-    }
-
-    sql=QString("alter table RDLOGEDIT ")+
-      "modify column OUTPUT_CARD int(11) default 0";
-    if(!RDSqlQuery::apply(sql,err_msg)) {
-      return false;
-    }
-
     sql=QString("alter table RDLOGEDIT ")+
       "modify column STATION varchar(64) not null";
     if(!RDSqlQuery::apply(sql,err_msg)) {
@@ -9753,6 +9741,22 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg)
     WriteSchemaVersion(++cur_schema);
   }
 
+  if((cur_schema<298)&&(set_schema>cur_schema)) {
+    sql=QString("alter table RDLOGEDIT ")+
+      "modify column INPUT_CARD int(11) default 0";
+    if(!RDSqlQuery::apply(sql,err_msg)) {
+      return false;
+    }
+
+    sql=QString("alter table RDLOGEDIT ")+
+      "modify column OUTPUT_CARD int(11) default 0";
+    if(!RDSqlQuery::apply(sql,err_msg)) {
+      return false;
+    }
+
+    WriteSchemaVersion(++cur_schema);
+  }
+
   //
   // Maintainer's Note:
   //