Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-11 17:13:47 +02:00
Code Issues Projects Releases Wiki Activity

lib/rdreport.cpp Reverted date checks on SELECT statements

Browse Source 
Checking is probably not needed and even if it did find an invalid date it would
likely not return valid SQL e.g this is just one paraphrased example from the
code:

SELECT x FROM y WHERE EVENT_DATETIME<="NULL 00:00:00"

I've reverted back the two select changes for the daypart code and put a TODO
note there as a marker.
This commit is contained in:
Wayne Merricks
2016-06-04 19:21:15 +01:00
parent 1cf11af447
commit e1c9caa987
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lib/rdreport.cpp
View File

@@ -346,20 +346,22 @@ bool RDReport::generateReport(const QDate &startdate,const QDate &enddate,
for(int i=0;i<(startdate.daysTo(enddate)+1);i++) { for(int i=0;i<(startdate.daysTo(enddate)+1);i++) {
QDate date=startdate.addDays(i); QDate date=startdate.addDays(i);
if(startTime()<endTime()) { if(startTime()<endTime()) {
//TODO Do we need to escape on Select Statement?
daypart_sql+=QString("((EVENT_DATETIME>=\"")+ daypart_sql+=QString("((EVENT_DATETIME>=\"")+
RDCheckDateTime(date,"yyyy-MM-dd")+ date.toString("yyyy-MM-dd")+
" "+RDCheckDateTime(startTime(),"hh:mm:ss")+"\")&&"+ " "+startTime().toString("hh:mm:ss")+"\")&&"+
"(EVENT_DATETIME<\""+RDCheckDateTime(date,"yyyy-MM-dd")+ "(EVENT_DATETIME<\""+date.toString("yyyy-MM-dd")+
" "+RDCheckDateTime(endTime(),"hh:mm:ss")+"\"))||"; " "+endTime().toString("hh:mm:ss")+"\"))||";
} }
else { else {
daypart_sql+=QString("((EVENT_DATETIME<=\"")+ daypart_sql+=QString("((EVENT_DATETIME<=\"")+
RDCheckDateTime(date,"yyyy-MM-dd")+ date.toString("yyyy-MM-dd")+
" "+RDCheckDateTime(endTime(),"hh:mm:ss")+"\")&&"+ " "+endTime().toString("hh:mm:ss")+"\")&&"+
"(EVENT_DATETIME>\""+RDCheckDateTime(date,"yyyy-MM-dd")+" 00:00:00))||"+ "(EVENT_DATETIME>\""+date.toString("yyyy-MM-dd")+" 00:00:00))||"+
"((EVENT_DATETIME>=\""+RDCheckDateTime(date,"yyyy-MM-dd")+ "((EVENT_DATETIME>=\""+
" "+RDCheckDateTime(startTime(),"hh:mm:ss")+"\")&&"+ date.toString("yyyy-MM-dd")+
"(EVENT_DATETIME<\""+RDCheckDateTime(date,"yyyy-MM-dd")+" 23:59:59))||"; " "+startTime().toString("hh:mm:ss")+"\")&&"+
"(EVENT_DATETIME<\""+date.toString("yyyy-MM-dd")+" 23:59:59))||";
} }
} }
@@ -533,9 +535,10 @@ bool RDReport::generateReport(const QDate &startdate,const QDate &enddate,
// Daypart Filter // Daypart Filter
// //
if(daypart_sql.isEmpty()) { if(daypart_sql.isEmpty()) {
sql+=QString("(EVENT_DATETIME>=\"")+RDCheckDateTime(startdate,"yyyy-MM-dd")+ //TODO Do we need to escape on Select statement?
sql+=QString("(EVENT_DATETIME>=\"")+startdate.toString("yyyy-MM-dd")+
" 00:00:00\")&&"+ " 00:00:00\")&&"+
"(EVENT_DATETIME<=\""+RDCheckDateTime(enddate,"yyyy-MM-dd")+ "(EVENT_DATETIME<=\""+enddate.toString("yyyy-MM-dd")+
" 23:59:59\")&&"; " 23:59:59\")&&";
} }
else { else {