From 76fd9affd06327f6fc6c8fecb57dabd1337b9266 Mon Sep 17 00:00:00 2001 From: Fred Gleason <fredg@paraelsystems.com> Date: Tue, 10 Jul 2018 11:14:03 -0400 Subject: [PATCH] 2018-07-10 Fred Gleason <fredg@paravelsystems.com> * Cleaned up SQL quieries to ensure UTF-8 compatibility in caed(8). --- ChangeLog | 2 ++ cae/cae_jack.cpp | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c4077984..03fe76d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17115,3 +17115,5 @@ 2018-07-10 Fred Gleason <fredg@paravelsystems.com> * Added a 'STACK_LINES' table to the database. * Incremented the database version to 293. +2018-07-10 Fred Gleason <fredg@paravelsystems.com> + * Cleaned up SQL quieries to ensure UTF-8 compatibility in caed(8). diff --git a/cae/cae_jack.cpp b/cae/cae_jack.cpp index 910f6246..f940e23f 100644 --- a/cae/cae_jack.cpp +++ b/cae/cae_jack.cpp @@ -430,7 +430,10 @@ void MainObject::jackRecordTimerData(int stream) void MainObject::jackClientStartData() { #ifdef JACK - QString sql=QString("select DESCRIPTION,COMMAND_LINE from JACK_CLIENTS where ")+ + QString sql=QString("select ")+ + "DESCRIPTION,"+ // 00 + "COMMAND_LINE "+ // 01 + "from JACK_CLIENTS where "+ "STATION_NAME=\""+RDEscapeString(rd_config->stationName())+"\""; RDSqlQuery *q=new RDSqlQuery(sql); while(q->next()) {