diff --git a/ChangeLog b/ChangeLog index 627cce4f..b2267daa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21475,3 +21475,5 @@ * Fixed regression in 'RDAudioPorts' that caused SQL errors. 2021-04-19 Fred Gleason * Fixed regression in 'RDStation' that caused SQL errors. +2021-04-19 Fred Gleason + * Fixed various regressions in rdadmin(1) that caused SQL errors. diff --git a/lib/rdcatch_conf.cpp b/lib/rdcatch_conf.cpp index de1ddc59..f4610856 100644 --- a/lib/rdcatch_conf.cpp +++ b/lib/rdcatch_conf.cpp @@ -68,7 +68,7 @@ void RDCatchConf::SetRow(const QString ¶m,const QString &value) const QString sql; sql=QString("update `RDCATCH` set `")+ - param+"`='"+RDEscapeString(value)+"\" where "+ + param+"`='"+RDEscapeString(value)+"' where "+ "`STATION`='"+RDEscapeString(air_station)+"'"; RDSqlQuery::apply(sql); } diff --git a/lib/rdstation.cpp b/lib/rdstation.cpp index ffee6713..dbd20c44 100644 --- a/lib/rdstation.cpp +++ b/lib/rdstation.cpp @@ -1864,7 +1864,7 @@ void RDStation::remove(const QString &name) { QString sql; - sql=QString("delete from `DECKS where ")+ + sql=QString("delete from `DECKS` where ")+ "`STATION_NAME`='"+RDEscapeString(name)+"'"; RDSqlQuery::apply(sql); diff --git a/rdadmin/edit_gpi.cpp b/rdadmin/edit_gpi.cpp index c1063818..c6945ad3 100644 --- a/rdadmin/edit_gpi.cpp +++ b/rdadmin/edit_gpi.cpp @@ -188,7 +188,7 @@ int EditGpi::exec(RDMatrix::GpioType type,int id) QString sql=QString("select ")+ edit_table+".`NUMBER`,"+ // 00 edit_table+".`MACRO_CART`,"+ // 01 - "`CART.TITLE` "+ // 02 + "`CART`.`TITLE` "+ // 02 "from "+edit_table+" "+ "left join `CART` "+ "on "+edit_table+".`MACRO_CART`=`CART`.`NUMBER` where "+ diff --git a/rdadmin/edit_matrix.cpp b/rdadmin/edit_matrix.cpp index a0a32687..3a34502b 100644 --- a/rdadmin/edit_matrix.cpp +++ b/rdadmin/edit_matrix.cpp @@ -1378,14 +1378,14 @@ void EditMatrix::WriteGpioTable(RDMatrix::GpioType type) if(!RDMatrix::controlActive(edit_matrix->type(), RDMatrix::DynamicGpioControl)) { for(int i=0;ifirst()) { - sql=QString("insert into `")+tablename+ - "` set `STATION_NAME`='"+RDEscapeString(edit_stationname)+"',"+ + sql=QString("insert into ")+tablename+ + " set `STATION_NAME`='"+RDEscapeString(edit_stationname)+"',"+ QString().sprintf("`MATRIX`=%d,`NUMBER`=%d,`MACRO_CART`=0", edit_matrix_number,i+1); RDSqlQuery::apply(sql); @@ -1396,8 +1396,8 @@ void EditMatrix::WriteGpioTable(RDMatrix::GpioType type) // // Purge Stale Entries // - sql=QString("delete from `")+tablename+ - "` where (`STATION_NAME`='"+RDEscapeString(edit_stationname)+ + sql=QString("delete from ")+tablename+ + " where (`STATION_NAME`='"+RDEscapeString(edit_stationname)+ QString().sprintf("')&&(`MATRIX`=%d)&&(`NUMBER`>%d)", edit_matrix_number,line_quan); RDSqlQuery::apply(sql);