Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-12 14:47:44 +02:00
Code Issues Projects Releases Wiki Activity

2021-04-23 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Escaped all SQL identifiers in 'utils/rdmarkerset/'.
	* Replaced " with ' delimiters in all SQL literal strings in
	'utils/rdmarkerset/'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-04-23 12:54:54 -04:00
parent 2ac1051ecd
commit ac82d7356a
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -21583,3 +21583,7 @@
* Escaped all SQL identifiers in 'utils/rdmaint/'. * Escaped all SQL identifiers in 'utils/rdmaint/'.
* Replaced " with ' delimiters in all SQL literal strings in * Replaced " with ' delimiters in all SQL literal strings in
'utils/rdmaint/'. 'utils/rdmaint/'.
2021-04-23 Fred Gleason <fredg@paravelsystems.com>
* Escaped all SQL identifiers in 'utils/rdmarkerset/'.
* Replaced " with ' delimiters in all SQL literal strings in
'utils/rdmarkerset/'.

15
utils/rdmarkerset/rdmarkerset.cpp
View File

@ -140,7 +140,7 @@ MainObject::MainObject(QObject *parent)
// Validate Groups // Validate Groups
// //
if(set_all_groups) { if(set_all_groups) {
QString sql="select NAME from GROUPS order by NAME"; QString sql="select `NAME` from `GROUPS` order by `NAME`";
QSqlQuery *q=new QSqlQuery(sql); QSqlQuery *q=new QSqlQuery(sql);
while(q->next()) { while(q->next()) {
set_group_names.push_back(q->value(0).toString()); set_group_names.push_back(q->value(0).toString());
@ -188,11 +188,14 @@ void MainObject::ProcessGroup(const QString &group_name)
QString sql; QString sql;
QSqlQuery *q; QSqlQuery *q;
sql=QString("select CUTS.CUT_NAME,CART.TITLE,CUTS.DESCRIPTION ")+ sql=QString("select ")+
"from CART left join CUTS "+ "`CUTS`.`CUT_NAME`,"+ // 00
"on CART.NUMBER=CUTS.CART_NUMBER where (CART.GROUP_NAME=\""+ "`CART`.`TITLE`,"+ // 01
RDEscapeString(group_name)+"\")&&"+ "`CUTS`.`DESCRIPTION` "+ // 02
QString().sprintf("(CART.TYPE!=%d)",RDCart::Macro); "from `CART` left join `CUTS` "+
"on `CART`.`NUMBER`=`CUTS`.`CART_NUMBER` where (`CART`.`GROUP_NAME`='"+
RDEscapeString(group_name)+"')&&"+
QString().sprintf("(`CART`.`TYPE`!=%d)",RDCart::Macro);
q=new QSqlQuery(sql); q=new QSqlQuery(sql);
while(q->next()) { while(q->next()) {
if(set_auto_trim<0) { if(set_auto_trim<0) {