From 36d4d0cd6da2988cade8a5521ae56f4ab23cd068 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Tue, 13 Dec 2022 14:04:06 -0500 Subject: [PATCH] 2022-12-13 Fred Gleason * Cleaned up filtering SQL in 'RDFeedListModel'. Signed-off-by: Fred Gleason --- ChangeLog | 2 ++ lib/rdfeedlistmodel.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c2973706..7d660980 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23795,3 +23795,5 @@ * Purged vestigal code from rdlogedit(1). 2022-12-13 Fred Gleason * Cleaned up filtering SQL in 'RDLogListModel'. +2022-12-13 Fred Gleason + * Cleaned up filtering SQL in 'RDFeedListModel'. diff --git a/lib/rdfeedlistmodel.cpp b/lib/rdfeedlistmodel.cpp index 7cc4d9be..506ea8c4 100644 --- a/lib/rdfeedlistmodel.cpp +++ b/lib/rdfeedlistmodel.cpp @@ -425,18 +425,18 @@ void RDFeedListModel::changeUser() if(d_is_admin) { sql=QString("select ")+ - "`KEY_NAME` "+ // 00 + "`FEEDS`.`KEY_NAME` "+ // 00 "from `FEEDS`"; } else { sql=QString("select ")+ - "`KEY_NAME` "+ // 00 + "`FEED_PERMS`.`KEY_NAME` "+ // 00 "from `FEED_PERMS` where "+ - "`USER_NAME`='"+RDEscapeString(rda->user()->name())+"'"; + "`FEED_PERMS`.`USER_NAME`='"+RDEscapeString(rda->user()->name())+"'"; } q=new RDSqlQuery(sql); while(q->next()) { - filter_sql+="(`KEY_NAME`='"+RDEscapeString(q->value(0).toString())+"')||"; + filter_sql+="(`FEEDS`.`KEY_NAME`='"+RDEscapeString(q->value(0).toString())+"')||"; } delete q; filter_sql=filter_sql.left(filter_sql.length()-2);