From c65d06d67bc731613212f28c5647feb79966e567 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Sat, 2 Oct 2021 12:49:19 -0400 Subject: [PATCH] 2021-10-02 Fred Gleason * Fixed a regression in 'RDLibraryModel' that threw SQL errors when attempting to the model when using MySQL 8.x. Signed-off-by: Fred Gleason --- ChangeLog | 3 +++ lib/rdlibrarymodel.cpp | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0469fa7f..bdb89988 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22484,3 +22484,6 @@ * Changed the default QStyle to 'Windows'. 2021-10-02 Fred Gleason * Fixed a compile time warning in 'web/webget/webget.cpp'. +2021-10-02 Fred Gleason + * Fixed a regression in 'RDLibraryModel' that threw SQL errors + when attempting to the model when using MySQL 8.x. diff --git a/lib/rdlibrarymodel.cpp b/lib/rdlibrarymodel.cpp index 15eee331..d182574d 100644 --- a/lib/rdlibrarymodel.cpp +++ b/lib/rdlibrarymodel.cpp @@ -802,7 +802,8 @@ QString sql=QString("select distinct ")+ "`CUTS`.`TALK_START_POINT`,"+ // 27 "`CUTS`.`TALK_END_POINT`,"+ // 28 "`CUTS`.`DESCRIPTION`,"+ // 29 - "`CART`.`NOTES` "+ // 30 + "`CART`.`NOTES`,"+ // 30 + "`CUTS`.`PLAY_ORDER` "+ // 31 "from `CART` "+ "left join `GROUPS` on `CART`.`GROUP_NAME`=`GROUPS`.`NAME` "+ "left join `CUTS` on `CART`.`NUMBER`=`CUTS`.`CART_NUMBER` "+