diff --git a/ChangeLog b/ChangeLog index 1d01d1d9..bcfcc03c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21236,3 +21236,8 @@ operation of the progress dialog during log generation. 2021-03-08 Fred Gleason * Fixed a regression in 'lib/rdconfig.cpp' that broke the build. +2021-03-08 Fred Gleason + * Commented out code to initialize the 'NEXUS_STATIONS' table + in rddbmgr(8). + * Fixed a bug in 'CheckSchedCodeRules()' in rddbmgr(8) that + would throw a SQL error when no schedule codes were defined. diff --git a/utils/rddbmgr/check.cpp b/utils/rddbmgr/check.cpp index 5c3377ae..3069d63f 100644 --- a/utils/rddbmgr/check.cpp +++ b/utils/rddbmgr/check.cpp @@ -1027,6 +1027,19 @@ void MainObject::CheckSchedCodeRules(bool prompt_user) const QString sql; RDSqlQuery *q; + // + // Check that we have at least one schedule code + // + sql=QString("select ")+ + "CODE "+ // 00 + "from SCHED_CODES"; + q=new RDSqlQuery(sql); + if(!q->first()) { + delete q; + return; + } + delete q; + // // Check for orphaned rules // diff --git a/utils/rddbmgr/updateschema.cpp b/utils/rddbmgr/updateschema.cpp index f20255f4..456e0fb8 100644 --- a/utils/rddbmgr/updateschema.cpp +++ b/utils/rddbmgr/updateschema.cpp @@ -9805,15 +9805,15 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) return false; } - q=new RDSqlQuery("select NAME from SERVICES",false); - while(q->next()) { - sql=QString("insert into NEXUS_STATIONS set ")+ - "RD_SERVICE=\""+RDEscapeString(q->value(0).toString())+"\""; - if(!RDSqlQuery::apply(sql,err_msg)) { - return false; - } - } - delete q; + // q=new RDSqlQuery("select NAME from SERVICES",false); + // while(q->next()) { + // sql=QString("insert into NEXUS_STATIONS set ")+ + // "RD_SERVICE=\""+RDEscapeString(q->value(0).toString())+"\""; + // if(!RDSqlQuery::apply(sql,err_msg)) { + // return false; + // } + // } + // delete q; sql=QString("insert into IMPORT_TEMPLATES set ")+ "NAME='MusicMaster Nexus',"+