diff --git a/ChangeLog b/ChangeLog index da1cb64a..be392070 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22590,3 +22590,6 @@ * Fixed a regression in rdadmin(1) that caused IP address settings to fail to be saved when creating a new 'Logitek vGuest' matrix entry. +2021-12-03 Fred Gleason + * Fixed a regression in 'RDCart::xml()' that caused a SQL error + to be generated. diff --git a/lib/rdcart.cpp b/lib/rdcart.cpp index 5dacc70f..900e26ba 100644 --- a/lib/rdcart.cpp +++ b/lib/rdcart.cpp @@ -1029,9 +1029,10 @@ QString RDCart::xml(bool include_cuts,bool absolute, RDSettings *settings,int cutnum) const { 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) { - sql+=QString("&&(`CUT_NAME`=\"")+RDCut::cutName(cart_number,cutnum)+"\")"; + sql+=QString("&&(`CUTS`.`CUT_NAME`=\"")+ + RDCut::cutName(cart_number,cutnum)+"\")"; } RDSqlQuery *q=new RDSqlQuery(sql); QString xml=RDCart::xml(q,include_cuts,absolute,settings);