Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-08 16:37:46 +02:00
Code Issues Projects Releases Wiki Activity

2021-09-11 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in rddbmgr(8) that generated a SQL error when checking
	for orphaned scheduler code rules when no Clocks existed in the
	database.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-09-11 12:55:37 -04:00
parent 3f114d3c86
commit a559ec2bc0
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -22397,3 +22397,7 @@
* Fixed a bug in rdlogmanager(1) that could cause segfaults when
changing the contents of the 'PRE-IMPORT CARTS' or 'POST-IMPORT CARTS'
lists in the 'Editing Event' dialog in rdlogmanager(1).
2021-09-11 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rddbmgr(8) that generated a SQL error when checking
for orphaned scheduler code rules when no Clocks existed in the
database.

19
utils/rddbmgr/check.cpp
View File

@ -1089,6 +1089,7 @@ void MainObject::CheckSchedCodeRules(bool prompt_user) const
//
// Check for orphaned rules
//
int clock_quan=0;
sql=QString("select ")+
"`NAME` "+ // 00
"from `CLOCKS` order by `NAME`";
@ -1096,13 +1097,16 @@ void MainObject::CheckSchedCodeRules(bool prompt_user) const
QString where_sql="";
while(q->next()) {
where_sql+="(`CLOCK_NAME`!='"+RDEscapeString(q->value(0).toString())+"')&&";
clock_quan++;
}
where_sql=where_sql.left(where_sql.length()-2);
delete q;
if(clock_quan>0) {
where_sql=QString("where ")+where_sql.left(where_sql.length()-2);
}
sql=QString("select ")+
"`ID` " // 00
"from `RULE_LINES` where "+
"from `RULE_LINES` "+
where_sql;
q=new RDSqlQuery(sql);
if(q->first()) {
@ -1111,12 +1115,15 @@ void MainObject::CheckSchedCodeRules(bool prompt_user) const
fflush(stdout);
}
if((!prompt_user)||UserResponse()) {
sql=QString("delete from RULE_LINES where ")+
where_sql;
RDSqlQuery::apply(sql);
sql=QString("delete from `RULE_LINES` where ")+
QString::asprintf("`ID`=%u || ",q->value(0).toUInt());
while(q->next()) {
sql+=QString::asprintf("`ID`=%u || ",q->value(0).toUInt());
}
sql=sql.left(sql.length()-4);
}
RDSqlQuery::apply(sql);
}
// printf("FIXUP SQL: %s\n",sql.toUtf8().constData());
//
// Check for missing rules