Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-20 15:02:27 +02:00
Code Issues Projects Releases Wiki Activity

2021-10-02 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in 'RDLibraryModel' that threw SQL errors
	when attempting to the model when using MySQL 8.x.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-10-02 12:49:19 -04:00
parent 9e1ed40a9f
commit c65d06d67b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -22484,3 +22484,6 @@
* Changed the default QStyle to 'Windows'. * Changed the default QStyle to 'Windows'.
2021-10-02 Fred Gleason <fredg@paravelsystems.com> 2021-10-02 Fred Gleason <fredg@paravelsystems.com>
* Fixed a compile time warning in 'web/webget/webget.cpp'. * Fixed a compile time warning in 'web/webget/webget.cpp'.
2021-10-02 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in 'RDLibraryModel' that threw SQL errors
when attempting to the model when using MySQL 8.x.

3
lib/rdlibrarymodel.cpp
View File

@ -802,7 +802,8 @@ QString sql=QString("select distinct ")+
"`CUTS`.`TALK_START_POINT`,"+ // 27 "`CUTS`.`TALK_START_POINT`,"+ // 27
"`CUTS`.`TALK_END_POINT`,"+ // 28 "`CUTS`.`TALK_END_POINT`,"+ // 28
"`CUTS`.`DESCRIPTION`,"+ // 29 "`CUTS`.`DESCRIPTION`,"+ // 29
"`CART`.`NOTES` "+ // 30 "`CART`.`NOTES`,"+ // 30
"`CUTS`.`PLAY_ORDER` "+ // 31
"from `CART` "+ "from `CART` "+
"left join `GROUPS` on `CART`.`GROUP_NAME`=`GROUPS`.`NAME` "+ "left join `GROUPS` on `CART`.`GROUP_NAME`=`GROUPS`.`NAME` "+
"left join `CUTS` on `CART`.`NUMBER`=`CUTS`.`CART_NUMBER` "+ "left join `CUTS` on `CART`.`NUMBER`=`CUTS`.`CART_NUMBER` "+