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

Fixes for invalid NULL sql on date/times

Browse Source 
Most files are simple swaps to get rid of extra " as a NULL return will give
invalid SQL if used as follows UPDATE x SET y="NULL";

See github issue 121 for more info.

Extra changes have been made to the following files:
* lib/rdcartslot.cpp
- Added a QDateTime variable to prevent EVENT_DATETIME becoming
  "2016-06-09" "NULL" as it was checked separately for date and time
* lib/rdcut.cpp
- Reworked START_DATETIME and END_DATETIME to save the SQL ifs.  I believe this
  makes it easier to read and understand.
- The >QDate(1900,1,1) and < 8000 is probably not needed but I left it there
  just in case.
* lib/rdescape_string.cpp
- Reworked to add extra " if the date is not NULL see issue 121
* lib/rdfeed.cpp && lib/rdpodcast.cpp
- Had to add a SetRow for QDateTime as with the string conversion the existing
  SetRow would add an extra set of "
* lib/rdsound_panel.cpp && rdairplay/log_traffic.cpp
        && utils/rddgimport/rddgimport.cpp
- Added a QString to contain EVENT_DATETIME to prevent double checks of date
  and time separately (similar to lib/rdcartslot.cpp)
* rdcatchd/rdcatchd.cpp
- Reverted the changes.  The RML here is not touching the DB so is fine, plus
  with the RDCheckDateTime changes you'd have extra " unless it was NULL
* tests/sas_switch_torture.cpp && sas_torture.cpp
- Included missing rdescape_string.h
This commit is contained in:
Wayne Merricks
2016-06-09 00:01:38 +01:00
parent 9f52968a02
commit f1175cd2f2
21 changed files with 131 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/rdpodcast.cpp
View File

@@ -209,7 +209,7 @@ QDateTime RDPodcast::originDateTime() const
void RDPodcast::setOriginDateTime(const QDateTime &datetime) const
{
SetRow("ORIGIN_DATETIME",RDCheckDateTime(datetime,"yyyy-MM-dd hh:mm:ss"));
SetRow("ORIGIN_DATETIME",datetime,"yyyy-MM-dd hh:mm:ss");
}
@@ -222,7 +222,7 @@ QDateTime RDPodcast::effectiveDateTime() const
void RDPodcast::setEffectiveDateTime(const QDateTime &datetime) const
{
SetRow("EFFECTIVE_DATETIME",RDCheckDateTime(datetime,"yyyy-MM-dd hh:mm:ss"));
SetRow("EFFECTIVE_DATETIME",datetime,"yyyy-MM-dd hh:mm:ss");
}
@@ -398,3 +398,18 @@ void RDPodcast::SetRow(const QString &param,const QString &value) const
q=new RDSqlQuery(sql);
delete q;
}
void RDPodcast::SetRow(const QString &param,const QDateTime &value,
const QString &format) const
{
RDSqlQuery *q;
QString sql;
sql=QString().sprintf("UPDATE PODCASTS SET %s=%s WHERE ID=%u",
(const char *)param,
(const char *)RDCheckDateTime(value, format),
podcast_id);
q=new RDSqlQuery(sql);
delete q;
}