From 05c35a208ce98b6270a5d139d66fb682d6b64449 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Tue, 27 Apr 2021 12:21:26 -0400 Subject: [PATCH] 2021-04-27 Fred Gleason * Fixed a regression in 'RDLogModel' that threw SQL errors. Signed-off-by: Fred Gleason --- ChangeLog | 2 ++ lib/rdlogmodel.cpp | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 933f5ba5..93761934 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21629,3 +21629,5 @@ * Added a note on Apache configuration on Ubuntu to 'INSTALL'. 2021-04-27 Fred Gleason * Fixed a regression in 'RDLog::create()' that threw SQL errors. +2021-04-27 Fred Gleason + * Fixed a regression in 'RDLogModel' that threw SQL errors. diff --git a/lib/rdlogmodel.cpp b/lib/rdlogmodel.cpp index 69e43876..b2551421 100644 --- a/lib/rdlogmodel.cpp +++ b/lib/rdlogmodel.cpp @@ -1019,7 +1019,10 @@ int RDLogModel::LoadLines(const QString &logname,int id_offset,bool track_ptrs) // Load the group color table // std::map group_colors; - sql="select NAME,COLOR from GROUPS"; + sql=QString("select ")+ + "`NAME`,"+ // 00 + "`COLOR` "+ // 01 + "from `GROUPS`"; q=new RDSqlQuery(sql); while(q->next()) { group_colors[q->value(0).toString()]=QColor(q->value(1).toString());