From b41d35ff40392734a9fd71fc7ea3faccd9acb2ff Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Thu, 8 Nov 2018 11:59:18 -0500 Subject: [PATCH] 2018-11-08 Fred Gleason * Fixed a regression in rddbmgr(8) that attempted to drop the 'RDAIRPLAY.INSTANCE' field when processing schema update 284. --- ChangeLog | 3 +++ utils/rddbmgr/revertschema.cpp | 5 ----- utils/rddbmgr/updateschema.cpp | 4 ---- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index def24f9f..218c7c4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17990,3 +17990,6 @@ * Fixed buffer overflow bugs in the rd_trimaudio(7) rivcwebapi call. 2018-11-07 Fred Gleason * Modified rd_deleteaudio(7) in the rivwebcapi to process UTF-8. +2018-11-08 Fred Gleason + * Fixed a regression in rddbmgr(8) that attempted to drop the + 'RDAIRPLAY.INSTANCE' field when processing schema update 284. diff --git a/utils/rddbmgr/revertschema.cpp b/utils/rddbmgr/revertschema.cpp index 86ae8832..33abfea7 100644 --- a/utils/rddbmgr/revertschema.cpp +++ b/utils/rddbmgr/revertschema.cpp @@ -2687,11 +2687,6 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) // Revert 284 // if((cur_schema==284)&&(set_schema=0;i--) { sql=QString("alter table RDAIRPLAY add column ")+ QString().sprintf("STOP_RML%d char(255) after INSTANCE",i); diff --git a/utils/rddbmgr/updateschema.cpp b/utils/rddbmgr/updateschema.cpp index b2934b47..9ca2289b 100644 --- a/utils/rddbmgr/updateschema.cpp +++ b/utils/rddbmgr/updateschema.cpp @@ -7008,10 +7008,6 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<284)&&(set_schema>cur_schema)) { - sql=QString("alter table RDAIRPLAY drop column INSTANCE"); - if(!RDSqlQuery::apply(sql,err_msg)) { - return false; - } for(int i=0;i<10;i++) { sql=QString("alter table RDAIRPLAY ")+ QString().sprintf("drop column CARD%d",i);