Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-20 23:03:04 +02:00
Code Issues Projects Releases Wiki Activity

2021-12-03 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in 'RDCart::xml()' that caused a SQL error
	to be generated.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-12-03 16:14:48 -05:00
parent 60b794bddf
commit b7059f300c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -22590,3 +22590,6 @@
* Fixed a regression in rdadmin(1) that caused IP address settings * Fixed a regression in rdadmin(1) that caused IP address settings
to fail to be saved when creating a new 'Logitek vGuest' matrix to fail to be saved when creating a new 'Logitek vGuest' matrix
entry. entry.
2021-12-03 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in 'RDCart::xml()' that caused a SQL error
to be generated.

5
lib/rdcart.cpp
View File

@ -1029,9 +1029,10 @@ QString RDCart::xml(bool include_cuts,bool absolute,
RDSettings *settings,int cutnum) const RDSettings *settings,int cutnum) const
{ {
QString sql=RDCart::xmlSql(include_cuts)+ QString sql=RDCart::xmlSql(include_cuts)+
QString::asprintf(" where (`CART.NUMBER`=%u)",cart_number); QString::asprintf(" where (`CART`.`NUMBER`=%u)",cart_number);
if(cutnum>=0) { if(cutnum>=0) {
sql+=QString("&&(`CUT_NAME`=\"")+RDCut::cutName(cart_number,cutnum)+"\")"; sql+=QString("&&(`CUTS`.`CUT_NAME`=\"")+
RDCut::cutName(cart_number,cutnum)+"\")";
} }
RDSqlQuery *q=new RDSqlQuery(sql); RDSqlQuery *q=new RDSqlQuery(sql);
QString xml=RDCart::xml(q,include_cuts,absolute,settings); QString xml=RDCart::xml(q,include_cuts,absolute,settings);