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

Fixed a conflict in 'ChangeLog'

Browse Source 
Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-12-03 16:27:43 -05:00
commit ee8d34d094
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -22636,3 +22636,10 @@
parts of the URL provided to the 'url' parameter. parts of the URL provided to the 'url' parameter.
2021-12-03 Fred Gleason <fredg@paravelsystems.com> 2021-12-03 Fred Gleason <fredg@paravelsystems.com>
* Added a 'ListCart()' method to the 'rivwebpyapi' API. * Added a 'ListCart()' method to the 'rivwebpyapi' API.
2021-12-03 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in 'RDCart::xml()' that caused a SQL error
to be generated.
2021-12-03 Fred Gleason <fredg@paravelsystems.com>
* Fixed a SQL escaping bug in 'lib/export_resultsrecon.cpp'.
* Fixed a SQL escaping bug in 'lib/rdlibrarymodel.cpp'.
* Fixed a SQL escaping bug in 'rdlibrary/rdlibrary.cpp'.

2
lib/export_resultsrecon.cpp
View File

@ -54,7 +54,7 @@ bool RDReport::ExportResultsReport(const QString &filename,
"`ELR_LINES`.`ARTIST`,"+ // 06 "`ELR_LINES`.`ARTIST`,"+ // 06
"`ELR_LINES`.`EXT_START_TIME` "+ // 07 "`ELR_LINES`.`EXT_START_TIME` "+ // 07
"from `ELR_LINES` left join `CART` "+ "from `ELR_LINES` left join `CART` "+
"on `ELR_LINES`.`CART_NUMBER`=`CART.NUMBER` where "+ "on `ELR_LINES`.`CART_NUMBER`=`CART`.`NUMBER` where "+
"`SERVICE_NAME`='"+RDEscapeString(mixtable)+"' "+ "`SERVICE_NAME`='"+RDEscapeString(mixtable)+"' "+
"order by `EVENT_DATETIME`"; "order by `EVENT_DATETIME`";
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);

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);

2
lib/rdlibrarymodel.cpp
View File

@ -437,7 +437,7 @@ QModelIndex RDLibraryModel::addCart(unsigned cartnum)
QString sql=sqlFields()+ QString sql=sqlFields()+
"where "+ "where "+
QString::asprintf("CART.NUMBER=%u",cartnum); QString::asprintf("`CART`.`NUMBER`=%u",cartnum);
RDSqlQuery *q=new RDSqlQuery(sql); RDSqlQuery *q=new RDSqlQuery(sql);
if(q->first()) { if(q->first()) {
updateRow(offset,q); updateRow(offset,q);

2
rdlibrary/rdlibrary.cpp
View File

@ -691,7 +691,7 @@ void MainWidget::notificationReceivedData(RDNotification *notify)
unsigned cartnum=notify->id().toUInt(); unsigned cartnum=notify->id().toUInt();
switch(notify->action()) { switch(notify->action()) {
case RDNotification::AddAction: case RDNotification::AddAction:
and_fields.push_back(QString::asprintf("CART.NUMBER=%u",cartnum)); and_fields.push_back(QString::asprintf("`CART`.`NUMBER`=%u",cartnum));
sql=QString("select ")+ sql=QString("select ")+
"`CART`.`NUMBER` "+ // 00 "`CART`.`NUMBER` "+ // 00
"from `CART` "+ "from `CART` "+