Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-29 16:50:13 +01:00
Code Issues Projects Releases Wiki Activity

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

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

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-04-19 21:02:10 -04:00
parent 01c15d8dbd
commit 40337a341f
16 changed files with 308 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rdlogmanager/schedrulesmodel.cpp
View File

@@ -192,8 +192,8 @@ void SchedRulesModel::updateModel()
RDSqlQuery *q=NULL;
QString sql=sqlFields()+"where "+
"RULE_LINES.CLOCK_NAME=\""+RDEscapeString(d_clock_name)+"\" "+
"order by RULE_LINES.CODE ";
"`RULE_LINES`.`CLOCK_NAME`=\""+RDEscapeString(d_clock_name)+"\" "+
"order by `RULE_LINES`.`CODE` ";
beginResetModel();
d_texts.clear();
d_ids.clear();
@@ -212,7 +212,7 @@ void SchedRulesModel::updateRowLine(int line)
{
if(line<d_texts.size()) {
QString sql=sqlFields()+
QString().sprintf("where RULE_LINES.ID=%u",d_ids.at(line));
QString().sprintf("where `RULE_LINES`.`ID`=%u",d_ids.at(line));
RDSqlQuery *q=new RDSqlQuery(sql);
if(q->first()) {
updateRow(line,q);
@@ -256,16 +256,16 @@ void SchedRulesModel::updateRow(int row,RDSqlQuery *q)
QString SchedRulesModel::sqlFields() const
{
QString sql=QString("select ")+
"RULE_LINES.ID,"+ // 00
"SCHED_CODES.CODE,"+ // 01
"RULE_LINES.MAX_ROW,"+ // 02
"RULE_LINES.MIN_WAIT,"+ // 03
"RULE_LINES.NOT_AFTER,"+ // 04
"RULE_LINES.OR_AFTER,"+ // 05
"RULE_LINES.OR_AFTER_II,"+ // 06
"SCHED_CODES.DESCRIPTION "+ // 07
"from SCHED_CODES left join RULE_LINES "+
"on SCHED_CODES.CODE=RULE_LINES.CODE ";
"`RULE_LINES`.`ID`,"+ // 00
"`SCHED_CODES`.`CODE`,"+ // 01
"`RULE_LINES`.`MAX_ROW`,"+ // 02
"`RULE_LINES`.`MIN_WAIT`,"+ // 03
"`RULE_LINES`.`NOT_AFTER`,"+ // 04
"`RULE_LINES`.`OR_AFTER`,"+ // 05
"`RULE_LINES`.`OR_AFTER_II`,"+ // 06
"`SCHED_CODES`.`DESCRIPTION` "+ // 07
"from `SCHED_CODES` left join `RULE_LINES` "+
"on `SCHED_CODES`.`CODE`=`RULE_LINES`.`CODE` ";
return sql;
}