diff --git a/ChangeLog b/ChangeLog index 8e159721..ab30225f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21559,3 +21559,7 @@ * Escaped all SQL identifiers in 'utils/rddbconfig/'. * Replaced " with ' delimiters in all SQL literal strings in 'utils/rddbconfig/'. +2021-04-22 Fred Gleason + * Escaped all SQL identifiers in 'utils/rddbmgr/'. + * Replaced " with ' delimiters in all SQL literal strings in + 'utils/rddbmgr/'. diff --git a/utils/rddbmgr/check.cpp b/utils/rddbmgr/check.cpp index 3069d63f..5593707b 100644 --- a/utils/rddbmgr/check.cpp +++ b/utils/rddbmgr/check.cpp @@ -158,32 +158,32 @@ void MainObject::CheckTableAttributes() // Per-table Attributes // sql=QString("select ")+ - "TABLE_NAME,"+ // 00 - "ENGINE,"+ // 01 - "TABLE_COLLATION "+ // 02 - "from information_schema.TABLES where "+ - "TABLE_SCHEMA='"+RDEscapeString(db_mysql_database)+"'"; + "`TABLE_NAME`,"+ // 00 + "`ENGINE`,"+ // 01 + "`TABLE_COLLATION` "+ // 02 + "from `information_schema`.`TABLES` where "+ + "`TABLE_SCHEMA`='"+RDEscapeString(db_mysql_database)+"'"; q=new RDSqlQuery(sql,false); while(q->next()) { QStringList f0=q->value(2).toString().split("_"); QString charset=f0.at(0); if(q->value(1).toString().toLower()!=db_mysql_engine.toLower()) { printf(" Table \"%s\" uses engine type %s, should be %s. Fix? (y/N) ", - (const char *)q->value(0).toString().toUtf8(), - (const char *)q->value(1).toString().toUtf8(), - (const char *)db_mysql_engine.toUtf8()); + q->value(0).toString().toUtf8().constData(), + q->value(1).toString().toUtf8().constData(), + db_mysql_engine.toUtf8().constData()); fflush(NULL); if(UserResponse()) { sql=QString("alter table `")+q->value(0).toString()+"` "+ - "ENGINE="+db_mysql_engine; + "`ENGINE`="+db_mysql_engine; RDSqlQuery::apply(sql); } } if(q->value(2).toString().toLower()!="utf8mb4_general_ci") { printf(" Table \"%s\" uses charset/collation %s/%s, should be utf8mb4/utf8mb4_general_ci. Fix? (y/N) ", - (const char *)q->value(0).toString().toUtf8(), - (const char *)charset.toUtf8(), - (const char *)q->value(2).toString().toUtf8()); + q->value(0).toString().toUtf8().constData(), + charset.toUtf8().constData(), + q->value(2).toString().toUtf8().constData()); fflush(NULL); if(UserResponse()) { RewriteTable(q->value(0).toString(), @@ -198,18 +198,18 @@ void MainObject::CheckTableAttributes() // Database Attributes // sql=QString("select ")+ - "SCHEMA_NAME,"+ // 00 - "DEFAULT_CHARACTER_SET_NAME,"+ // 01 - "DEFAULT_COLLATION_NAME "+ // 02 - "from information_schema.SCHEMATA"; + "`SCHEMA_NAME`,"+ // 00 + "`DEFAULT_CHARACTER_SET_NAME`,"+ // 01 + "`DEFAULT_COLLATION_NAME` "+ // 02 + "from `information_schema`.`SCHEMATA`"; q=new RDSqlQuery(sql); while(q->next()) { if(q->value(0).toString()==db_mysql_database) { if((q->value(1).toString().toLower()!="utf8mb4")|| (q->value(2).toString().toLower()!="utf8mb4_general_ci")) { printf(" Database uses default charset/collation %s/%s, should be utf8mb4/utf8mb4_general_ci. Fix? (y/N) ", - (const char *)q->value(1).toString().toUtf8(), - (const char *)q->value(2).toString().toUtf8()); + q->value(1).toString().toUtf8().constData(), + q->value(2).toString().toUtf8().constData()); fflush(NULL); if(UserResponse()) { sql=QString("alter database `")+db_mysql_database+"` "+ @@ -397,10 +397,12 @@ void MainObject::RelinkAudio(const QString &srcdir) const // // Check against audio cuts // - sql=QString("select CUTS.CUT_NAME,CART.TITLE from ")+ - "CUTS left join CART "+ - "on CUTS.CART_NUMBER=CART.NUMBER where "+ - "CUTS.SHA1_HASH=\""+RDEscapeString(hash)+"\""; + sql=QString("select ")+ + "`CUTS`.`CUT_NAME`,"+ // 00 + "`CART`.`TITLE` "+ // 01 + "from `CUTS` left join `CART` "+ + "on `CUTS`.`CART_NUMBER`=`CART`.`NUMBER` where "+ + "`CUTS`.`SHA1_HASH`='"+RDEscapeString(hash)+"'"; q=new RDSqlQuery(sql); while(q->next()) { RelinkCut(filename,q->value(0).toString(),q->value(1).toString(), @@ -411,13 +413,13 @@ void MainObject::RelinkAudio(const QString &srcdir) const // Check against RSS posts // sql=QString("select ")+ - "FEEDS.KEY_NAME,"+ // 00 - "PODCASTS.ID,"+ // 01 - "PODCASTS.ITEM_TITLE,"+ // 02 - "PODCASTS.AUDIO_FILENAME "+ // 03 - "from PODCASTS left join FEEDS "+ - "on FEEDS.ID=PODCASTS.FEED_ID where "+ - "PODCASTS.SHA1_HASH=\""+RDEscapeString(hash)+"\""; + "`FEEDS`.`KEY_NAME`,"+ // 00 + "`PODCASTS`.`ID`,"+ // 01 + "`PODCASTS`.`ITEM_TITLE`,"+ // 02 + "`PODCASTS`.`AUDIO_FILENAME` "+ // 03 + "from `PODCASTS` left join `FEEDS` "+ + "on `FEEDS`.`ID`=`PODCASTS`.`FEED_ID` where "+ + "`PODCASTS`.`SHA1_HASH`='"+RDEscapeString(hash)+"'"; q=new RDSqlQuery(sql); while(q->next()) { RelinkCast(filename,q->value(0).toString(),q->value(1).toUInt(), @@ -558,14 +560,20 @@ void MainObject::RelinkCast(const QString &src_filename,const QString &keyname, void MainObject::CheckOrphanedTracks() const { - QString sql="select NUMBER,TITLE,OWNER from CART where OWNER!=\"\""; + QString sql=QString("select ")+ + "`NUMBER`,"+ // 00 + "`TITLE`,"+ // 01 + "`OWNER` "+ // 02 + "from `CART` where "+ + "(`OWNER`!='')&&"+ + "(`OWNER` is not null)"; QSqlQuery *q=new QSqlQuery(sql); QSqlQuery *q1; while(q->next()) { - sql=QString("select LINE_ID from LOG_LINES where ")+ - "LOG_NAME=\""+RDEscapeString(q->value(2).toString())+"\" && "+ - QString().sprintf("CART_NUMBER=%u",q->value(0).toUInt()); + sql=QString("select `LINE_ID` from `LOG_LINES` where ")+ + "`LOG_NAME`='"+RDEscapeString(q->value(2).toString())+"' && "+ + QString().sprintf("`CART_NUMBER`=%u",q->value(0).toUInt()); q1=new QSqlQuery(sql); if(!q1->first()) { printf(" Found orphaned track %u - \"%s\". Delete? (y/N) ", @@ -594,12 +602,16 @@ void MainObject::CheckCutCounts() const QSqlQuery *q; QSqlQuery *q1; - sql="select NUMBER,CUT_QUANTITY,TITLE from CART"; + sql=QString("select ")+ + "`NUMBER`,"+ // 00 + "`CUT_QUANTITY`,"+ // 01 + "`TITLE` "+ // 02 + "from `CART`"; q=new QSqlQuery(sql); while(q->next()) { - sql=QString().sprintf("select CUT_NAME from CUTS \ - where (CART_NUMBER=%u)&&(LENGTH>0)", - q->value(0).toUInt()); + sql=QString("select `CUT_NAME` from `CUTS` where ")+ + QString().sprintf("(`CART_NUMBER`=%u)&&",q->value(0).toUInt())+ + "(`LENGTH`>0)"; q1=new QSqlQuery(sql); if(q1->size()!=q->value(1).toInt()) { printf(" Cart %u [%s] has invalid cut count, fix (y/N)?", @@ -623,10 +635,10 @@ void MainObject::CheckPendingCarts() const QSqlQuery *q; QDateTime now(QDate::currentDate(),QTime::currentTime()); - sql=QString("select NUMBER from CART where ")+ - "(PENDING_STATION is not null)&&"+ - "(PENDING_DATETIME<\""+now.addDays(-1). - toString("yyyy-MM-dd hh:mm:ss")+"\")"; + sql=QString("select `NUMBER` from `CART` where ")+ + "(`PENDING_STATION` is not null)&&"+ + "(`PENDING_DATETIME`<'"+now.addDays(-1). + toString("yyyy-MM-dd hh:mm:ss")+"')"; q=new QSqlQuery(sql); while(q->next()) { printf(" Cart %06u has stale reservation, delete cart(y/N)?", @@ -645,8 +657,12 @@ void MainObject::CheckOrphanedCarts() const QSqlQuery *q; QSqlQuery *q1; - sql="select CART.NUMBER,CART.TITLE from CART left join GROUPS \ - on CART.GROUP_NAME=GROUPS.NAME where GROUPS.NAME is null"; + sql=QString("select ")+ + "`CART`.`NUMBER`,"+ + "`CART`.`TITLE` "+ + "from `CART` left join `GROUPS` "+ + "on `CART`.`GROUP_NAME`=`GROUPS`.`NAME` where "+ + "`GROUPS`.`NAME` is null"; q=new QSqlQuery(sql); while(q->next()) { printf(" Cart %06u [%s] has missing/invalid group.\n", @@ -658,10 +674,9 @@ void MainObject::CheckOrphanedCarts() const printf(" Assign to group \"%s\" (y/N)?", db_orphan_group_name.toUtf8().constData()); if(UserResponse()) { - sql=QString(). - sprintf("update CART set GROUP_NAME=\"%s\" where NUMBER=%u", - RDEscapeString(db_orphan_group_name).toUtf8().constData(), - q->value(0).toUInt()); + sql=QString("update `CART` set ")+ + "`GROUP_NAME`='"+RDEscapeString(db_orphan_group_name)+"' "+ + QString().sprintf("where `NUMBER`=%u",q->value(0).toUInt()); q1=new QSqlQuery(sql); delete q1; } @@ -680,8 +695,12 @@ void MainObject::CheckOrphanedCuts() const QSqlQuery *q2; QFileInfo *file=NULL; - sql="select CUTS.CUT_NAME,CUTS.DESCRIPTION from CUTS left join CART \ - on CUTS.CART_NUMBER=CART.NUMBER where CART.NUMBER is null"; + sql=QString("select ")+ + "`CUTS`.`CUT_NAME`,"+ // 00 + "`CUTS`.`DESCRIPTION` "+ // 01 + "from `CUTS` left join `CART` "+ + "on `CUTS`.`CART_NUMBER`=`CART`.`NUMBER` "+ + "where `CART`.`NUMBER` is null"; q=new QSqlQuery(sql); while(q->next()) { printf(" Cut %s [%s] is orphaned.\n", @@ -690,7 +709,7 @@ void MainObject::CheckOrphanedCuts() const // // Try to repair it // - sql=QString().sprintf("select NUMBER from CART where NUMBER=%d", + sql=QString().sprintf("select `NUMBER` from `CART` where `NUMBER`=%d", q->value(0).toString().left(6).toUInt()); q1=new QSqlQuery(sql); if(q1->first()) { @@ -700,7 +719,7 @@ void MainObject::CheckOrphanedCuts() const // FIXME: Regen Cart Data // sql=QString(). - sprintf("update CUTS set CART_NUMBER=%u where CUT_NAME=\"%s\"", + sprintf("update `CUTS` set `CART_NUMBER`=%u where `CUT_NAME`='%s'", q1->value(0).toUInt(), q->value(0).toString().toUtf8().constData()); q2=new QSqlQuery(sql); @@ -720,7 +739,7 @@ void MainObject::CheckOrphanedCuts() const if(!file->exists()) { printf(" Clear it (y/N)?"); if(UserResponse()) { - sql=QString().sprintf("delete from CUTS where CUT_NAME=\"%s\"", + sql=QString().sprintf("delete from `CUTS` where `CUT_NAME`='%s'", q->value(0).toString().toUtf8().constData()); q1=new QSqlQuery(sql); delete q1; @@ -734,7 +753,7 @@ void MainObject::CheckOrphanedCuts() const printf(" Clear it (y/N)?"); if(UserResponse()) { system(("mv "+file->filePath()+" "+db_dump_cuts_dir+"/").toUtf8()); - sql=QString().sprintf("delete from CUTS where CUT_NAME=\"%s\"", + sql=QString().sprintf("delete from `CUTS` where `CUT_NAME`='%s'", q->value(0).toString().toUtf8().constData()); q1=new QSqlQuery(sql); delete q1; @@ -765,9 +784,9 @@ void MainObject::CheckOrphanedAudio() const list[i].mid(7,3).toInt(&ok); if(ok) { QString sql=QString("select ")+ - "CUT_NAME "+ - "from CUTS where "+ - "CUT_NAME=\""+RDEscapeString(list.at(i).left(10))+"\""; + "`CUT_NAME` "+ + "from `CUTS` where "+ + "`CUT_NAME`='"+RDEscapeString(list.at(i).left(10))+"'"; QSqlQuery *q=new QSqlQuery(sql); if(!q->first()) { printf(" File \"%s/%s\" is orphaned.\n", @@ -806,7 +825,11 @@ void MainObject::ValidateAudioLengths() const QSqlQuery *q; RDWaveFile *wave=NULL; - sql="select CUT_NAME,CART_NUMBER,LENGTH from CUTS order by CART_NUMBER"; + sql=QString("select ")+ + "`CUT_NAME`,"+ + "`CART_NUMBER`,"+ + "`LENGTH` "+ + "from `CUTS` order by `CART_NUMBER`"; q=new QSqlQuery(sql); while(q->next()) { if(q->value(2).toInt()>0) { @@ -834,9 +857,9 @@ void MainObject::Rehash(const QString &arg) const bool ok=false; if(arg.toLower()=="all") { - sql=QString("select NUMBER from CART where ")+ - QString().sprintf("TYPE=%d ",RDCart::Audio)+ - "order by NUMBER"; + sql=QString("select `NUMBER` from `CART` where ")+ + QString().sprintf("`TYPE`=%d ",RDCart::Audio)+ + "order by `NUMBER`"; q=new QSqlQuery(sql); while(q->next()) { RehashCart(q->value(0).toUInt()); @@ -862,9 +885,9 @@ void MainObject::RehashCart(unsigned cartnum) const RDCart *cart=new RDCart(cartnum); if(cart->exists()) { if(cart->type()==RDCart::Audio) { - QString sql=QString("select CUT_NAME from CUTS where ")+ - QString().sprintf("CART_NUMBER=%u ",cartnum)+ - "order by CUT_NAME"; + QString sql=QString("select `CUT_NAME` from `CUTS` where ")+ + QString().sprintf("`CART_NUMBER`=%u ",cartnum)+ + "order by `CUT_NAME`"; QSqlQuery *q=new QSqlQuery(sql); while(q->next()) { RehashCut(q->value(0).toString()); @@ -930,20 +953,20 @@ void MainObject::SetCutLength(const QString &cutname,int len) const fflush(NULL); if(UserResponse()) { fflush(NULL); - sql=QString("update CUTS set ")+ - "START_POINT=0,"+ - QString().sprintf("END_POINT=%d,",len)+ - "FADEUP_POINT=-1,"+ - "FADEDOWN_POINT=-1,"+ - "SEGUE_START_POINT=-1,"+ - "SEGUE_END_POINT=-1,"+ - "TALK_START_POINT=-1,"+ - "TALK_END_POINT=-1,"+ - "HOOK_START_POINT=-1,"+ - "HOOK_END_POINT=-1,"+ - "PLAY_GAIN=0,"+ - QString().sprintf("LENGTH=%d where ",len)+ - "CUT_NAME=\""+RDEscapeString(cutname)+"\""; + sql=QString("update `CUTS` set ")+ + "`START_POINT`=0,"+ + QString().sprintf("`END_POINT`=%d,",len)+ + "`FADEUP_POINT`=-1,"+ + "`FADEDOWN_POINT`=-1,"+ + "`SEGUE_START_POINT`=-1,"+ + "`SEGUE_END_POINT`=-1,"+ + "`TALK_START_POINT`=-1,"+ + "`TALK_END_POINT`=-1,"+ + "`HOOK_START_POINT`=-1,"+ + "`HOOK_END_POINT`=-1,"+ + "`PLAY_GAIN`=0,"+ + QString().sprintf("`LENGTH`=%d where ",len)+ + "`CUT_NAME`='"+RDEscapeString(cutname)+"'"; q=new QSqlQuery(sql); delete q; cart->updateLength(); @@ -1031,8 +1054,8 @@ void MainObject::CheckSchedCodeRules(bool prompt_user) const // Check that we have at least one schedule code // sql=QString("select ")+ - "CODE "+ // 00 - "from SCHED_CODES"; + "`CODE` "+ // 00 + "from `SCHED_CODES`"; q=new RDSqlQuery(sql); if(!q->first()) { delete q; @@ -1044,19 +1067,19 @@ void MainObject::CheckSchedCodeRules(bool prompt_user) const // Check for orphaned rules // sql=QString("select ")+ - "NAME "+ // 00 - "from CLOCKS order by NAME"; + "`NAME` "+ // 00 + "from `CLOCKS` order by `NAME`"; q=new RDSqlQuery(sql); QString where_sql=""; while(q->next()) { - where_sql+="(CLOCK_NAME!=\""+RDEscapeString(q->value(0).toString())+"\")&&"; + where_sql+="(`CLOCK_NAME`!='"+RDEscapeString(q->value(0).toString())+"')&&"; } where_sql=where_sql.left(where_sql.length()-2); delete q; sql=QString("select ")+ - "ID " // 00 - "from RULE_LINES where "+ + "`ID` " // 00 + "from `RULE_LINES` where "+ where_sql; q=new RDSqlQuery(sql); if(q->first()) { @@ -1076,27 +1099,27 @@ void MainObject::CheckSchedCodeRules(bool prompt_user) const // Check for missing rules // sql=QString("select ")+ - "NAME "+ // 00 - "from CLOCKS order by NAME"; + "`NAME` "+ // 00 + "from `CLOCKS` order by `NAME`"; RDSqlQuery *clock_q=new RDSqlQuery(sql); while(clock_q->next()) { QString clkname=clock_q->value(0).toString(); sql=QString("select ")+ - "CODE "+ // 00 - "from SCHED_CODES order by CODE"; + "`CODE` "+ // 00 + "from `SCHED_CODES` order by CODE"; RDSqlQuery *code_q=new RDSqlQuery(sql); while(code_q->next()) { QString code=code_q->value(0).toString(); sql=QString("select ")+ - "ID "+ // 00 - "from RULE_LINES where "+ - "CLOCK_NAME=\""+RDEscapeString(clkname)+"\" && "+ - "CODE=\""+RDEscapeString(code)+"\""; + "`ID` "+ // 00 + "from `RULE_LINES` where "+ + "`CLOCK_NAME`='"+RDEscapeString(clkname)+"' && "+ + "`CODE`='"+RDEscapeString(code)+"'"; q=new RDSqlQuery(sql); if(!q->first()) { - sql=QString("insert into RULE_LINES set ")+ - "CLOCK_NAME=\""+RDEscapeString(clkname)+"\","+ - "CODE=\""+RDEscapeString(code)+"\""; + sql=QString("insert into `RULE_LINES` set ")+ + "`CLOCK_NAME`='"+RDEscapeString(clkname)+"',"+ + "`CODE`='"+RDEscapeString(code)+"'"; RDSqlQuery::apply(sql); } delete q; diff --git a/utils/rddbmgr/create.cpp b/utils/rddbmgr/create.cpp index 4aed7d59..f8857653 100644 --- a/utils/rddbmgr/create.cpp +++ b/utils/rddbmgr/create.cpp @@ -76,39 +76,39 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create USERS table // - sql=QString("create table if not exists USERS (")+ - "LOGIN_NAME char(255) not null primary key,"+ - "FULL_NAME char(255),"+ - "PHONE_NUMBER char(20),"+ - "DESCRIPTION char(255),"+ - "PASSWORD char(32),"+ - "WEBAPI_AUTH_TIMEOUT int not null default 3600,"+ - "ENABLE_WEB enum('N','Y') default 'N',"+ - "LOCAL_AUTH enum('N','Y') default 'Y',"+ - "PAM_SERVICE char(32) default \"rivendell\","+ - "ADMIN_USERS_PRIV enum('N','Y') not null default 'N',"+ - "ADMIN_CONFIG_PRIV enum('N','Y') not null default 'N',"+ - "CREATE_CARTS_PRIV enum('N','Y') not null default 'N',"+ - "DELETE_CARTS_PRIV enum('N','Y') not null default 'N',"+ - "MODIFY_CARTS_PRIV enum('N','Y') not null default 'N',"+ - "EDIT_AUDIO_PRIV enum('N','Y') not null default 'N',"+ - "WEBGET_LOGIN_PRIV enum('N','Y') not null default 'N',"+ - "ASSIGN_CART_PRIV enum('N','Y') not null default 'N',"+ - "CREATE_LOG_PRIV enum('N','Y') not null default 'N',"+ - "DELETE_LOG_PRIV enum('N','Y') not null default 'N',"+ - "DELETE_REC_PRIV enum('N','Y') not null default 'N',"+ - "PLAYOUT_LOG_PRIV enum('N','Y') not null default 'N',"+ - "ARRANGE_LOG_PRIV enum('N','Y') not null default 'N',"+ - "MODIFY_TEMPLATE_PRIV enum('N','Y') not null default 'N',"+ - "ADDTO_LOG_PRIV enum('N','Y') not null default 'N',"+ - "REMOVEFROM_LOG_PRIV enum('N','Y') not null default 'N',"+ - "CONFIG_PANELS_PRIV enum('N','Y') not null default 'N',"+ - "VOICETRACK_LOG_PRIV enum('N','Y') not null default 'N',"+ - "EDIT_CATCHES_PRIV enum('N','Y') not null default 'N',"+ - "ADD_PODCAST_PRIV enum('N','Y') not null default 'N',"+ - "EDIT_PODCAST_PRIV enum('N','Y') not null default 'N',"+ - "DELETE_PODCAST_PRIV enum('N','Y') not null default 'N',"+ - "INDEX FULL_NAME_IDX (FULL_NAME))"+ + sql=QString("create table if not exists `USERS` (")+ + "`LOGIN_NAME` char(255) not null primary key,"+ + "`FULL_NAME` char(255),"+ + "`PHONE_NUMBER` char(20),"+ + "`DESCRIPTION` char(255),"+ + "`PASSWORD` char(32),"+ + "`WEBAPI_AUTH_TIMEOUT` int not null default 3600,"+ + "`ENABLE_WEB` enum('N','Y') default 'N',"+ + "`LOCAL_AUTH` enum('N','Y') default 'Y',"+ + "`PAM_SERVICE` char(32) default 'rivendell',"+ + "`ADMIN_USERS_PRIV` enum('N','Y') not null default 'N',"+ + "`ADMIN_CONFIG_PRIV` enum('N','Y') not null default 'N',"+ + "`CREATE_CARTS_PRIV` enum('N','Y') not null default 'N',"+ + "`DELETE_CARTS_PRIV` enum('N','Y') not null default 'N',"+ + "`MODIFY_CARTS_PRIV` enum('N','Y') not null default 'N',"+ + "`EDIT_AUDIO_PRIV` enum('N','Y') not null default 'N',"+ + "`WEBGET_LOGIN_PRIV` enum('N','Y') not null default 'N',"+ + "`ASSIGN_CART_PRIV` enum('N','Y') not null default 'N',"+ + "`CREATE_LOG_PRIV` enum('N','Y') not null default 'N',"+ + "`DELETE_LOG_PRIV` enum('N','Y') not null default 'N',"+ + "`DELETE_REC_PRIV` enum('N','Y') not null default 'N',"+ + "`PLAYOUT_LOG_PRIV` enum('N','Y') not null default 'N',"+ + "`ARRANGE_LOG_PRIV` enum('N','Y') not null default 'N',"+ + "`MODIFY_TEMPLATE_PRIV` enum('N','Y') not null default 'N',"+ + "`ADDTO_LOG_PRIV` enum('N','Y') not null default 'N',"+ + "`REMOVEFROM_LOG_PRIV` enum('N','Y') not null default 'N',"+ + "`CONFIG_PANELS_PRIV` enum('N','Y') not null default 'N',"+ + "`VOICETRACK_LOG_PRIV` enum('N','Y') not null default 'N',"+ + "`EDIT_CATCHES_PRIV` enum('N','Y') not null default 'N',"+ + "`ADD_PODCAST_PRIV` enum('N','Y') not null default 'N',"+ + "`EDIT_PODCAST_PRIV` enum('N','Y') not null default 'N',"+ + "`DELETE_PODCAST_PRIV` enum('N','Y') not null default 'N',"+ + "`INDEX FULL_NAME_IDX` (`FULL_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -118,49 +118,49 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create STATIONS table // - sql=QString("create table if not exists STATIONS (")+ - "NAME char(64) primary key not null,"+ - "SHORT_NAME char(64),"+ - "DESCRIPTION char(64),"+ - "USER_NAME char(255),"+ - "DEFAULT_NAME char(255),"+ - "IPV4_ADDRESS char(15) default \"127.0.0.2\","+ - "HTTP_STATION char(64) default \"localhost\","+ - "CAE_STATION char(64) default \"localhost\","+ - "TIME_OFFSET int default 0,"+ - "BACKUP_DIR char(255),"+ - "BACKUP_LIFE int default 0,"+ - "BROADCAST_SECURITY int unsigned default 0,"+ - "HEARTBEAT_CART int unsigned default 0,"+ - "HEARTBEAT_INTERVAL int unsigned default 0,"+ - "STARTUP_CART int unsigned default 0,"+ - "EDITOR_PATH char(255) default \"\","+ - "FILTER_MODE int default 0,"+ - "START_JACK enum('N','Y') default 'N',"+ - "JACK_SERVER_NAME char(64),"+ - "JACK_COMMAND_LINE char(255),"+ - "CUE_CARD int default 0,"+ - "CUE_PORT int default 0,"+ - "CUE_START_CART int unsigned,"+ - "CUE_STOP_CART int unsigned,"+ - "CARTSLOT_COLUMNS int default 1,"+ - "CARTSLOT_ROWS int default 8,"+ - "ENABLE_DRAGDROP enum('N','Y') default 'Y',"+ - "ENFORCE_PANEL_SETUP enum('N','Y') default 'N',"+ - "SYSTEM_MAINT enum('N','Y') default 'Y',"+ - "STATION_SCANNED enum('N','Y') default 'N',"+ - "HAVE_OGGENC enum('N','Y') default 'N',"+ - "HAVE_OGG123 enum('N','Y') default 'N',"+ - "HAVE_FLAC enum('N','Y') default 'N',"+ - "HAVE_TWOLAME enum('N','Y') default 'N',"+ - "HAVE_LAME enum('N','Y') default 'N',"+ - "HAVE_MPG321 enum('N','Y') default 'N',"+ - "HAVE_MP4_DECODE enum('N','Y') default 'N',"+ - "HPI_VERSION char(16),"+ - "JACK_VERSION char(16),"+ - "ALSA_VERSION char(16),"+ - "INDEX DESCRIPTION_IDX (DESCRIPTION),"+ - "index IPV4_ADDRESS_IDX (IPV4_ADDRESS))"+ + sql=QString("create table if not exists `STATIONS` (")+ + "`NAME` char(64) primary key not null,"+ + "`SHORT_NAME` char(64),"+ + "`DESCRIPTION` char(64),"+ + "`USER_NAME` char(255),"+ + "`DEFAULT_NAME` char(255),"+ + "`IPV4_ADDRESS` char(15) default '127.0.0.2',"+ + "`HTTP_STATION` char(64) default 'localhost',"+ + "`CAE_STATION` char(64) default 'localhost',"+ + "`TIME_OFFSET` int default 0,"+ + "`BACKUP_DIR` char(255),"+ + "`BACKUP_LIFE` int default 0,"+ + "`BROADCAST_SECURITY` int unsigned default 0,"+ + "`HEARTBEAT_CART` int unsigned default 0,"+ + "`HEARTBEAT_INTERVAL` int unsigned default 0,"+ + "`STARTUP_CART` int unsigned default 0,"+ + "`EDITOR_PATH` char(255) default '',"+ + "`FILTER_MODE` int default 0,"+ + "`START_JACK` enum('N','Y') default 'N',"+ + "`JACK_SERVER_NAME` char(64),"+ + "`JACK_COMMAND_LINE` char(255),"+ + "`CUE_CARD` int default 0,"+ + "`CUE_PORT` int default 0,"+ + "`CUE_START_CART` int unsigned,"+ + "`CUE_STOP_CART` int unsigned,"+ + "`CARTSLOT_COLUMNS` int default 1,"+ + "`CARTSLOT_ROWS` int default 8,"+ + "`ENABLE_DRAGDROP` enum('N','Y') default 'Y',"+ + "`ENFORCE_PANEL_SETUP` enum('N','Y') default 'N',"+ + "`SYSTEM_MAINT` enum('N','Y') default 'Y',"+ + "`STATION_SCANNED` enum('N','Y') default 'N',"+ + "`HAVE_OGGENC` enum('N','Y') default 'N',"+ + "`HAVE_OGG123` enum('N','Y') default 'N',"+ + "`HAVE_FLAC` enum('N','Y') default 'N',"+ + "`HAVE_TWOLAME` enum('N','Y') default 'N',"+ + "`HAVE_LAME` enum('N','Y') default 'N',"+ + "`HAVE_MPG321` enum('N','Y') default 'N',"+ + "`HAVE_MP4_DECODE` enum('N','Y') default 'N',"+ + "`HPI_VERSION` char(16),"+ + "`JACK_VERSION` char(16),"+ + "`ALSA_VERSION` char(16),"+ + "INDEX `DESCRIPTION_IDX` (`DESCRIPTION`),"+ + "index `IPV4_ADDRESS_IDX` (`IPV4_ADDRESS`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -170,65 +170,65 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create CART table // - sql=QString("create table if not exists CART (")+ - "NUMBER int unsigned not null primary key,"+ - "TYPE int unsigned not null,"+ - "GROUP_NAME char(10) not null,"+ - "TITLE char(255),"+ - "ARTIST char(255),"+ - "ALBUM char(255),"+ - "YEAR date,"+ - "CONDUCTOR char(64),"+ - "LABEL char(64),"+ - "CLIENT char(64),"+ - "AGENCY char(64),"+ - "PUBLISHER char(64),"+ - "COMPOSER char(64),"+ - "USER_DEFINED char(255),"+ - "SONG_ID char(32),"+ - "BPM int unsigned default 0,"+ - "USAGE_CODE int default 0,"+ - "FORCED_LENGTH int unsigned,"+ - "AVERAGE_LENGTH int unsigned,"+ - "LENGTH_DEVIATION int unsigned default 0,"+ - "AVERAGE_SEGUE_LENGTH int unsigned,"+ - "AVERAGE_HOOK_LENGTH int unsigned default 0,"+ - "CUT_QUANTITY int unsigned,"+ - "LAST_CUT_PLAYED int unsigned,"+ - "PLAY_ORDER int unsigned,"+ - "VALIDITY int unsigned default 2,"+ - "START_DATETIME datetime,"+ - "END_DATETIME datetime,"+ - "ENFORCE_LENGTH enum('N','Y') default 'N',"+ - "PRESERVE_PITCH enum('N','Y') default 'N',"+ - "USE_WEIGHTING enum('N','Y') default 'Y',"+ - "ASYNCRONOUS enum('N','Y') default 'N',"+ - "OWNER char(64),"+ - "MACROS text,"+ - "SCHED_CODES VARCHAR( 255 ) NULL default NULL,"+ - "NOTES text,"+ - "METADATA_DATETIME datetime,"+ - "USE_EVENT_LENGTH enum('N','Y') default 'N',"+ - "PENDING_STATION char(64),"+ - "PENDING_PID int,"+ - "PENDING_DATETIME datetime,"+ - "index GROUP_NAME_IDX (GROUP_NAME),"+ - "index TITLE_IDX (TITLE),"+ - "index ARTIST_IDX (ARTIST),"+ - "index ALBUM_IDX (ALBUM),"+ - "index CONDUCTOR_IDX (CONDUCTOR),"+ - "index LABEL_IDX (LABEL),"+ - "index CLIENT_IDX (CLIENT),"+ - "index AGENCY_IDX (AGENCY),"+ - "index PUBLISHER_IDX (PUBLISHER),"+ - "index COMPOSER_IDX (COMPOSER),"+ - "index USER_DEFINED_IDX (USER_DEFINED),"+ - "index SONG_ID_IDX (SONG_ID),"+ - "index OWNER_IDX (OWNER),"+ - "index METADATA_DATETIME_IDX (METADATA_DATETIME),"+ - "index PENDING_STATION_IDX(PENDING_STATION),"+ - "index PENDING_PID_IDX(PENDING_STATION,PENDING_PID),"+ - "index PENDING_DATETIME_IDX(PENDING_DATETIME))"+ + sql=QString("create table if not exists `CART` (")+ + "`NUMBER` int unsigned not null primary key,"+ + "`TYPE` int unsigned not null,"+ + "`GROUP_NAME` char(10) not null,"+ + "`TITLE` char(255),"+ + "`ARTIST` char(255),"+ + "`ALBUM` char(255),"+ + "`YEAR` date,"+ + "`CONDUCTOR` char(64),"+ + "`LABEL` char(64),"+ + "`CLIENT` char(64),"+ + "`AGENCY` char(64),"+ + "`PUBLISHER` char(64),"+ + "`COMPOSER` char(64),"+ + "`USER_DEFINED` char(255),"+ + "`SONG_ID` char(32),"+ + "`BPM` int unsigned default 0,"+ + "`USAGE_CODE` int default 0,"+ + "`FORCED_LENGTH` int unsigned,"+ + "`AVERAGE_LENGTH` int unsigned,"+ + "`LENGTH_DEVIATION` int unsigned default 0,"+ + "`AVERAGE_SEGUE_LENGTH` int unsigned,"+ + "`AVERAGE_HOOK_LENGTH` int unsigned default 0,"+ + "`CUT_QUANTITY` int unsigned,"+ + "`LAST_CUT_PLAYED` int unsigned,"+ + "`PLAY_ORDER` int unsigned,"+ + "`VALIDITY` int unsigned default 2,"+ + "`START_DATETIME` datetime,"+ + "`END_DATETIME` datetime,"+ + "`ENFORCE_LENGTH` enum('N','Y') default 'N',"+ + "`PRESERVE_PITCH` enum('N','Y') default 'N',"+ + "`USE_WEIGHTING` enum('N','Y') default 'Y',"+ + "`ASYNCRONOUS` enum('N','Y') default 'N',"+ + "`OWNER` char(64),"+ + "`MACROS` text,"+ + "`SCHED_CODES` VARCHAR( 255 ) NULL default NULL,"+ + "`NOTES` text,"+ + "`METADATA_DATETIME` datetime,"+ + "`USE_EVENT_LENGTH` enum('N','Y') default 'N',"+ + "`PENDING_STATION` char(64),"+ + "`PENDING_PID` int,"+ + "`PENDING_DATETIME` datetime,"+ + "index `GROUP_NAME_IDX` (`GROUP_NAME`),"+ + "index `TITLE_IDX` (`TITLE`),"+ + "index `ARTIST_IDX` (`ARTIST`),"+ + "index `ALBUM_IDX` (`ALBUM`),"+ + "index `CONDUCTOR_IDX` (`CONDUCTOR`),"+ + "index `LABEL_IDX` (`LABEL`),"+ + "index `CLIENT_IDX` (`CLIENT`),"+ + "index `AGENCY_IDX` (`AGENCY`),"+ + "index `PUBLISHER_IDX` (`PUBLISHER`),"+ + "index `COMPOSER_IDX` (`COMPOSER`),"+ + "index `USER_DEFINED_IDX` (`USER_DEFINED`),"+ + "index `SONG_ID_IDX` (`SONG_ID`),"+ + "index `OWNER_IDX` (`OWNER`),"+ + "index `METADATA_DATETIME_IDX` (`METADATA_DATETIME`),"+ + "index `PENDING_STATION_IDX` (`PENDING_STATION`),"+ + "index `PENDING_PID_IDX` (`PENDING_STATION`,`PENDING_PID`),"+ + "index `PENDING_DATETIME_IDX` (`PENDING_DATETIME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -238,62 +238,62 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create CUTS table // - sql=QString("create table if not exists CUTS (")+ - "CUT_NAME char(12) primary key not null,"+ - "CART_NUMBER int unsigned not null,"+ - "EVERGREEN enum('N','Y') default 'N',"+ - "DESCRIPTION char(64),"+ - "OUTCUE char(64),"+ - "ISRC char(12),"+ - "ISCI char(32),"+ - "LENGTH int unsigned,"+ - "SHA1_HASH char(40),"+ - "ORIGIN_DATETIME datetime,"+ - "START_DATETIME datetime,"+ - "END_DATETIME datetime,"+ - "SUN enum('N','Y') default 'Y',"+ - "MON enum('N','Y') default 'Y',"+ - "TUE enum('N','Y') default 'Y',"+ - "WED enum('N','Y') default 'Y',"+ - "THU enum('N','Y') default 'Y',"+ - "FRI enum('N','Y') default 'Y',"+ - "SAT enum('N','Y') default 'Y',"+ - "START_DAYPART time,"+ - "END_DAYPART time,"+ - "ORIGIN_NAME char(64),"+ - "ORIGIN_LOGIN_NAME char(255),"+ - "SOURCE_HOSTNAME char(255),"+ - "WEIGHT int unsigned default 1,"+ - "PLAY_ORDER int,"+ - "LAST_PLAY_DATETIME datetime,"+ - "UPLOAD_DATETIME datetime,"+ - "PLAY_COUNTER int unsigned default 0,"+ - "LOCAL_COUNTER int unsigned default 0,"+ - "VALIDITY int unsigned default 2,"+ - "CODING_FORMAT int unsigned,"+ - "SAMPLE_RATE int unsigned,"+ - "BIT_RATE int unsigned,"+ - "CHANNELS int unsigned,"+ - "PLAY_GAIN int default 0,"+ - "START_POINT int default -1,"+ - "END_POINT int default -1,"+ - "FADEUP_POINT int default -1,"+ - "FADEDOWN_POINT int default -1,"+ - "SEGUE_START_POINT int default -1,"+ - "SEGUE_END_POINT int default -1,"+ - QString().sprintf("SEGUE_GAIN int default %d,",RD_FADE_DEPTH)+ - "HOOK_START_POINT int default -1,"+ - "HOOK_END_POINT int default -1,"+ - "TALK_START_POINT int default -1,"+ - "TALK_END_POINT int default -1,"+ - "index CART_NUMBER_IDX (CART_NUMBER),"+ - "index DESCRIPTION_IDX (DESCRIPTION),"+ - "index OUTCUE_IDX (OUTCUE),"+ - "index ORIGIN_DATETIME_IDX (ORIGIN_DATETIME),"+ - "index START_DATETIME_IDX (START_DATETIME),"+ - "index END_DATETIME_IDX (END_DATETIME),"+ - "index ISCI_IDX (ISCI),"+ - "index ISRC_IDX (ISRC))"+ + sql=QString("create table if not exists `CUTS` (")+ + "`CUT_NAME` char(12) primary key not null,"+ + "`CART_NUMBER` int unsigned not null,"+ + "`EVERGREEN` enum('N','Y') default 'N',"+ + "`DESCRIPTION` char(64),"+ + "`OUTCUE` char(64),"+ + "`ISRC` char(12),"+ + "`ISCI` char(32),"+ + "`LENGTH` int unsigned,"+ + "`SHA1_HASH` char(40),"+ + "`ORIGIN_DATETIME` datetime,"+ + "`START_DATETIME` datetime,"+ + "`END_DATETIME` datetime,"+ + "`SUN` enum('N','Y') default 'Y',"+ + "`MON` enum('N','Y') default 'Y',"+ + "`TUE` enum('N','Y') default 'Y',"+ + "`WED` enum('N','Y') default 'Y',"+ + "`THU` enum('N','Y') default 'Y',"+ + "`FRI` enum('N','Y') default 'Y',"+ + "`SAT` enum('N','Y') default 'Y',"+ + "`START_DAYPART` time,"+ + "`END_DAYPART` time,"+ + "`ORIGIN_NAME` char(64),"+ + "`ORIGIN_LOGIN_NAME` char(255),"+ + "`SOURCE_HOSTNAME` char(255),"+ + "`WEIGHT` int unsigned default 1,"+ + "`PLAY_ORDER` int,"+ + "`LAST_PLAY_DATETIME` datetime,"+ + "`UPLOAD_DATETIME` datetime,"+ + "`PLAY_COUNTER` int unsigned default 0,"+ + "`LOCAL_COUNTER` int unsigned default 0,"+ + "`VALIDITY` int unsigned default 2,"+ + "`CODING_FORMAT` int unsigned,"+ + "`SAMPLE_RATE` int unsigned,"+ + "`BIT_RATE` int unsigned,"+ + "`CHANNELS` int unsigned,"+ + "`PLAY_GAIN` int default 0,"+ + "`START_POINT` int default -1,"+ + "`END_POINT` int default -1,"+ + "`FADEUP_POINT` int default -1,"+ + "`FADEDOWN_POINT` int default -1,"+ + "`SEGUE_START_POINT` int default -1,"+ + "`SEGUE_END_POINT` int default -1,"+ + QString().sprintf("`SEGUE_GAIN` int default %d,",RD_FADE_DEPTH)+ + "`HOOK_START_POINT` int default -1,"+ + "`HOOK_END_POINT` int default -1,"+ + "`TALK_START_POINT` int default -1,"+ + "`TALK_END_POINT` int default -1,"+ + "index `CART_NUMBER_IDX` (`CART_NUMBER`),"+ + "index `DESCRIPTION_IDX` (`DESCRIPTION`),"+ + "index `OUTCUE_IDX` (`OUTCUE`),"+ + "index `ORIGIN_DATETIME_IDX` (`ORIGIN_DATETIME`),"+ + "index `START_DATETIME_IDX` (`START_DATETIME`),"+ + "index `END_DATETIME_IDX` (`END_DATETIME`),"+ + "index `ISCI_IDX` (ISCI),"+ + "index `ISRC_IDX` (ISRC))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -303,35 +303,35 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create CLIPBOARD table // - sql=QString("create table if not exists CLIPBOARD (")+ - "CUT_NAME char(12) primary key not null,"+ - "CART_NUMBER int unsigned not null,"+ - "DESCRIPTION char(64),"+ - "OUTCUE char(64),"+ - "LENGTH int unsigned,"+ - "ORIGIN_DATETIME datetime,"+ - "ORIGIN_NAME char(64),"+ - "WEIGHT int unsigned default 1,"+ - "LAST_PLAY_DATETIME datetime,"+ - "PLAY_COUNTER int unsigned default 0,"+ - "CODING_FORMAT int unsigned,"+ - "SAMPLE_RATE int unsigned,"+ - "BIT_RATE int unsigned,"+ - "CHANNELS int unsigned,"+ - "PLAY_GAIN int default 0,"+ - "START_POINT int default -1,"+ - "END_POINT int default -1,"+ - "FADEUP_POINT int default -1,"+ - "FADEDOWN_POINT int default -1,"+ - "SEGUE_START_POINT int default -1,"+ - "SEGUE_END_POINT int default -1,"+ - "HOOK_START_POINT int default -1,"+ - "HOOK_END_POINT int default -1,"+ - "TALK_START_POINT int default -1,"+ - "TALK_END_POINT int default -1,"+ - "index CART_NUMBER_IDX (CART_NUMBER),"+ - "index DESCRIPTION_IDX (DESCRIPTION),"+ - "index OUTCUE_IDX (OUTCUE))"+ + sql=QString("create table if not exists `CLIPBOARD` (")+ + "`CUT_NAME` char(12) primary key not null,"+ + "`CART_NUMBER` int unsigned not null,"+ + "`DESCRIPTION` char(64),"+ + "`OUTCUE` char(64),"+ + "`LENGTH` int unsigned,"+ + "`ORIGIN_DATETIME` datetime,"+ + "`ORIGIN_NAME` char(64),"+ + "`WEIGHT` int unsigned default 1,"+ + "`LAST_PLAY_DATETIME` datetime,"+ + "`PLAY_COUNTER` int unsigned default 0,"+ + "`CODING_FORMAT` int unsigned,"+ + "`SAMPLE_RATE` int unsigned,"+ + "`BIT_RATE` int unsigned,"+ + "`CHANNELS` int unsigned,"+ + "`PLAY_GAIN` int default 0,"+ + "`START_POINT` int default -1,"+ + "`END_POINT` int default -1,"+ + "`FADEUP_POINT` int default -1,"+ + "`FADEDOWN_POINT` int default -1,"+ + "`SEGUE_START_POINT` int default -1,"+ + "`SEGUE_END_POINT` int default -1,"+ + "`HOOK_START_POINT` int default -1,"+ + "`HOOK_END_POINT` int default -1,"+ + "`TALK_START_POINT` int default -1,"+ + "`TALK_END_POINT` int default -1,"+ + "index `CART_NUMBER_IDX` (`CART_NUMBER`),"+ + "index `DESCRIPTION_IDX` (`DESCRIPTION`),"+ + "index `OUTCUE_IDX` (`OUTCUE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -341,81 +341,81 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create SERVICES table // - sql=QString("create table if not exists SERVICES (")+ - "NAME char(10) not null primary key,"+ - "DESCRIPTION char(255),"+ - "NAME_TEMPLATE char(255),"+ - "DESCRIPTION_TEMPLATE char(255),"+ - "PROGRAM_CODE char(255),"+ - "CHAIN_LOG enum('N','Y') default 'N',"+ - "TRACK_GROUP char(10),"+ - "AUTOSPOT_GROUP char(10),"+ - "AUTO_REFRESH enum('N','Y') default 'N',"+ - "DEFAULT_LOG_SHELFLIFE int default -1,"+ - "LOG_SHELFLIFE_ORIGIN int default 0,"+ - "ELR_SHELFLIFE int default -1,"+ - "TFC_PATH char(255),"+ - "TFC_PREIMPORT_CMD text,"+ - "TFC_WIN_PATH char(255),"+ - "TFC_WIN_PREIMPORT_CMD text,"+ - "TFC_IMPORT_TEMPLATE char(64) default \"Rivendell Standard Import\","+ - "TFC_LABEL_CART char(32),"+ - "TFC_TRACK_CART char(32),"+ - "TFC_BREAK_STRING char(64),"+ - "TFC_TRACK_STRING char(64),"+ - "TFC_CART_OFFSET int,"+ - "TFC_CART_LENGTH int,"+ - "TFC_TITLE_OFFSET int,"+ - "TFC_TITLE_LENGTH int,"+ - "TFC_HOURS_OFFSET int,"+ - "TFC_HOURS_LENGTH int,"+ - "TFC_MINUTES_OFFSET int,"+ - "TFC_MINUTES_LENGTH int,"+ - "TFC_SECONDS_OFFSET int,"+ - "TFC_SECONDS_LENGTH int,"+ - "TFC_LEN_HOURS_OFFSET int,"+ - "TFC_LEN_HOURS_LENGTH int,"+ - "TFC_LEN_MINUTES_OFFSET int,"+ - "TFC_LEN_MINUTES_LENGTH int,"+ - "TFC_LEN_SECONDS_OFFSET int,"+ - "TFC_LEN_SECONDS_LENGTH int,"+ - "TFC_DATA_OFFSET int,"+ - "TFC_DATA_LENGTH int,"+ - "TFC_EVENT_ID_OFFSET int,"+ - "TFC_EVENT_ID_LENGTH int,"+ - "TFC_ANNC_TYPE_OFFSET int,"+ - "TFC_ANNC_TYPE_LENGTH int,"+ - "MUS_PATH char(255),"+ - "MUS_PREIMPORT_CMD text,"+ - "MUS_WIN_PATH char(255),"+ - "MUS_WIN_PREIMPORT_CMD text,"+ - "MUS_IMPORT_TEMPLATE char(64) default \"Rivendell Standard Import\","+ - "MUS_LABEL_CART char(32),"+ - "MUS_TRACK_CART char(32),"+ - "MUS_BREAK_STRING char(64),"+ - "MUS_TRACK_STRING char(64),"+ - "MUS_CART_OFFSET int,"+ - "MUS_CART_LENGTH int,"+ - "MUS_TITLE_OFFSET int,"+ - "MUS_TITLE_LENGTH int,"+ - "MUS_HOURS_OFFSET int,"+ - "MUS_HOURS_LENGTH int,"+ - "MUS_MINUTES_OFFSET int,"+ - "MUS_MINUTES_LENGTH int,"+ - "MUS_SECONDS_OFFSET int,"+ - "MUS_SECONDS_LENGTH int,"+ - "MUS_LEN_HOURS_OFFSET int,"+ - "MUS_LEN_HOURS_LENGTH int,"+ - "MUS_LEN_MINUTES_OFFSET int,"+ - "MUS_LEN_MINUTES_LENGTH int,"+ - "MUS_LEN_SECONDS_OFFSET int,"+ - "MUS_LEN_SECONDS_LENGTH int,"+ - "MUS_DATA_OFFSET int,"+ - "MUS_DATA_LENGTH int,"+ - "MUS_EVENT_ID_OFFSET int,"+ - "MUS_EVENT_ID_LENGTH int,"+ - "MUS_ANNC_TYPE_OFFSET int,"+ - "MUS_ANNC_TYPE_LENGTH int)"+ + sql=QString("create table if not exists `SERVICES` (")+ + "`NAME` char(10) not null primary key,"+ + "`DESCRIPTION` char(255),"+ + "`NAME_TEMPLATE` char(255),"+ + "`DESCRIPTION_TEMPLATE` char(255),"+ + "`PROGRAM_CODE` char(255),"+ + "`CHAIN_LOG` enum('N','Y') default 'N',"+ + "`TRACK_GROUP` char(10),"+ + "`AUTOSPOT_GROUP` char(10),"+ + "`AUTO_REFRESH` enum('N','Y') default 'N',"+ + "`DEFAULT_LOG_SHELFLIFE` int default -1,"+ + "`LOG_SHELFLIFE_ORIGIN` int default 0,"+ + "`ELR_SHELFLIFE` int default -1,"+ + "`TFC_PATH` char(255),"+ + "`TFC_PREIMPORT_CMD` text,"+ + "`TFC_WIN_PATH` char(255),"+ + "`TFC_WIN_PREIMPORT_CMD` text,"+ + "`TFC_IMPORT_TEMPLATE` char(64) default 'Rivendell Standard Import',"+ + "`TFC_LABEL_CART` char(32),"+ + "`TFC_TRACK_CART` char(32),"+ + "`TFC_BREAK_STRING` char(64),"+ + "`TFC_TRACK_STRING` char(64),"+ + "`TFC_CART_OFFSET` int,"+ + "`TFC_CART_LENGTH` int,"+ + "`TFC_TITLE_OFFSET` int,"+ + "`TFC_TITLE_LENGTH` int,"+ + "`TFC_HOURS_OFFSET` int,"+ + "`TFC_HOURS_LENGTH` int,"+ + "`TFC_MINUTES_OFFSET` int,"+ + "`TFC_MINUTES_LENGTH` int,"+ + "`TFC_SECONDS_OFFSET` int,"+ + "`TFC_SECONDS_LENGTH` int,"+ + "`TFC_LEN_HOURS_OFFSET` int,"+ + "`TFC_LEN_HOURS_LENGTH` int,"+ + "`TFC_LEN_MINUTES_OFFSET` int,"+ + "`TFC_LEN_MINUTES_LENGTH` int,"+ + "`TFC_LEN_SECONDS_OFFSET` int,"+ + "`TFC_LEN_SECONDS_LENGTH` int,"+ + "`TFC_DATA_OFFSET` int,"+ + "`TFC_DATA_LENGTH` int,"+ + "`TFC_EVENT_ID_OFFSET` int,"+ + "`TFC_EVENT_ID_LENGTH` int,"+ + "`TFC_ANNC_TYPE_OFFSET` int,"+ + "`TFC_ANNC_TYPE_LENGTH` int,"+ + "`MUS_PATH` char(255),"+ + "`MUS_PREIMPORT_CMD` text,"+ + "`MUS_WIN_PATH` char(255),"+ + "`MUS_WIN_PREIMPORT_CMD` text,"+ + "`MUS_IMPORT_TEMPLATE` char(64) default 'Rivendell Standard Import',"+ + "`MUS_LABEL_CART` char(32),"+ + "`MUS_TRACK_CART` char(32),"+ + "`MUS_BREAK_STRING` char(64),"+ + "`MUS_TRACK_STRING` char(64),"+ + "`MUS_CART_OFFSET` int,"+ + "`MUS_CART_LENGTH` int,"+ + "`MUS_TITLE_OFFSET` int,"+ + "`MUS_TITLE_LENGTH` int,"+ + "`MUS_HOURS_OFFSET` int,"+ + "`MUS_HOURS_LENGTH` int,"+ + "`MUS_MINUTES_OFFSET` int,"+ + "`MUS_MINUTES_LENGTH` int,"+ + "`MUS_SECONDS_OFFSET` int,"+ + "`MUS_SECONDS_LENGTH` int,"+ + "`MUS_LEN_HOURS_OFFSET` int,"+ + "`MUS_LEN_HOURS_LENGTH` int,"+ + "`MUS_LEN_MINUTES_OFFSET` int,"+ + "`MUS_LEN_MINUTES_LENGTH` int,"+ + "`MUS_LEN_SECONDS_OFFSET` int,"+ + "`MUS_LEN_SECONDS_LENGTH` int,"+ + "`MUS_DATA_OFFSET` int,"+ + "`MUS_DATA_LENGTH` int,"+ + "`MUS_EVENT_ID_OFFSET` int,"+ + "`MUS_EVENT_ID_LENGTH` int,"+ + "`MUS_ANNC_TYPE_OFFSET` int,"+ + "`MUS_ANNC_TYPE_LENGTH` int)"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -425,23 +425,23 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create GROUPS table // - sql=QString("create table if not exists GROUPS (")+ - "NAME char(10) not null primary key,"+ - "DESCRIPTION char(255),"+ - "DEFAULT_CART_TYPE int unsigned default 1,"+ - "DEFAULT_LOW_CART int unsigned default 0,"+ - "DEFAULT_HIGH_CART int unsigned default 0,"+ - "DEFAULT_CUT_LIFE int default -1,"+ - "CUT_SHELFLIFE int default -1,"+ - "DELETE_EMPTY_CARTS enum('N','Y') default 'N',"+ - "DEFAULT_TITLE char(255) default \"Imported from %f.%e\","+ - "ENFORCE_CART_RANGE enum('N','Y') default 'N',"+ - "REPORT_TFC enum('N','Y') default 'Y',"+ - "REPORT_MUS enum('N','Y') default 'Y',"+ - "ENABLE_NOW_NEXT enum('N','Y') default 'N',"+ - "COLOR char(7),"+ - "index IDX_REPORT_TFC (REPORT_TFC),"+ - "index IDX_REPORT_MUS (REPORT_MUS))"+ + sql=QString("create table if not exists `GROUPS` (")+ + "`NAME` char(10) not null primary key,"+ + "`DESCRIPTION` char(255),"+ + "`DEFAULT_CART_TYPE` int unsigned default 1,"+ + "`DEFAULT_LOW_CART` int unsigned default 0,"+ + "`DEFAULT_HIGH_CART` int unsigned default 0,"+ + "`DEFAULT_CUT_LIFE` int default -1,"+ + "`CUT_SHELFLIFE` int default -1,"+ + "`DELETE_EMPTY_CARTS` enum('N','Y') default 'N',"+ + "`DEFAULT_TITLE` char(255) default 'Imported from %f.%e',"+ + "`ENFORCE_CART_RANGE` enum('N','Y') default 'N',"+ + "`REPORT_TFC` enum('N','Y') default 'Y',"+ + "`REPORT_MUS` enum('N','Y') default 'Y',"+ + "`ENABLE_NOW_NEXT` enum('N','Y') default 'N',"+ + "`COLOR` char(7),"+ + "index `IDX_REPORT_TFC` (`REPORT_TFC`),"+ + "index `IDX_REPORT_MUS` (`REPORT_MUS`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -451,12 +451,12 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create AUDIO_PERMS table // - sql=QString("create table if not exists AUDIO_PERMS (")+ - "ID int unsigned AUTO_INCREMENT not null primary key,"+ - "GROUP_NAME char(10),"+ - "SERVICE_NAME char(10),"+ - "index GROUP_IDX (GROUP_NAME),"+ - "index SERVICE_IDX (SERVICE_NAME))"+ + sql=QString("create table if not exists `AUDIO_PERMS` (")+ + "`ID` int unsigned AUTO_INCREMENT not null primary key,"+ + "`GROUP_NAME` char(10),"+ + "`SERVICE_NAME` char(10),"+ + "index `GROUP_IDX` (`GROUP_NAME`),"+ + "index `SERVICE_IDX` (`SERVICE_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -466,35 +466,35 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create RDLIBRARY table // - sql=QString("create table if not exists RDLIBRARY (")+ - "ID int unsigned primary key AUTO_INCREMENT,"+ - "STATION char(40) not null,"+ - "INSTANCE int unsigned not null,"+ - "INPUT_CARD int default 0,"+ - "INPUT_PORT int default 0,"+ - "INPUT_TYPE enum('A','D') default 'A',"+ - "OUTPUT_CARD int default 0,"+ - "OUTPUT_PORT int default 0,"+ - "VOX_THRESHOLD int default -5000,"+ - "TRIM_THRESHOLD int default 0,"+ - "DEFAULT_FORMAT int unsigned default 0,"+ - "DEFAULT_CHANNELS int unsigned default 2,"+ - "DEFAULT_LAYER int unsigned default 0,"+ - "DEFAULT_BITRATE int unsigned default 0,"+ - "DEFAULT_RECORD_MODE int unsigned default 0,"+ - "DEFAULT_TRIM_STATE enum('N','Y') default 'N',"+ - "MAXLENGTH int,"+ - "TAIL_PREROLL int unsigned default 1500,"+ - "RIPPER_DEVICE char(64) default \"/dev/cdrom\","+ - "PARANOIA_LEVEL int default 0,"+ - "RIPPER_LEVEL int default -1300,"+ - "CDDB_SERVER char(64) default \"freedb.freedb.org\","+ - "READ_ISRC enum('N','Y') default 'Y',"+ - "ENABLE_EDITOR enum('N','Y') default 'N',"+ - "SRC_CONVERTER int default 1,"+ - "LIMIT_SEARCH int default 1,"+ - "SEARCH_LIMITED enum('N','Y') default 'Y',"+ - "index STATION_IDX (STATION,INSTANCE))"+ + sql=QString("create table if not exists `RDLIBRARY` (")+ + "`ID` int unsigned primary key AUTO_INCREMENT,"+ + "`STATION` char(40) not null,"+ + "`INSTANCE` int unsigned not null,"+ + "`INPUT_CARD` int default 0,"+ + "`INPUT_PORT` int default 0,"+ + "`INPUT_TYPE` enum('A','D') default 'A',"+ + "`OUTPUT_CARD` int default 0,"+ + "`OUTPUT_PORT` int default 0,"+ + "`VOX_THRESHOLD` int default -5000,"+ + "`TRIM_THRESHOLD` int default 0,"+ + "`DEFAULT_FORMAT` int unsigned default 0,"+ + "`DEFAULT_CHANNELS` int unsigned default 2,"+ + "`DEFAULT_LAYER` int unsigned default 0,"+ + "`DEFAULT_BITRATE` int unsigned default 0,"+ + "`DEFAULT_RECORD_MODE` int unsigned default 0,"+ + "`DEFAULT_TRIM_STATE` enum('N','Y') default 'N',"+ + "`MAXLENGTH` int,"+ + "`TAIL_PREROLL` int unsigned default 1500,"+ + "`RIPPER_DEVICE` char(64) default '/dev/cdrom',"+ + "`PARANOIA_LEVEL` int default 0,"+ + "`RIPPER_LEVEL` int default -1300,"+ + "`CDDB_SERVER` char(64) default 'freedb.freedb.org',"+ + "`READ_ISRC` enum('N','Y') default 'Y',"+ + "`ENABLE_EDITOR` enum('N','Y') default 'N',"+ + "`SRC_CONVERTER` int default 1,"+ + "`LIMIT_SEARCH` int default 1,"+ + "`SEARCH_LIMITED` enum('N','Y') default 'Y',"+ + "index `STATION_IDX` (`STATION`,`INSTANCE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -504,12 +504,12 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create TRIGGERS table // - sql=QString("create table if not exists TRIGGERS (")+ - "ID int unsigned AUTO_INCREMENT not null primary key,"+ - "CUT_NAME char(12),"+ - "TRIGGER_CODE int unsigned,"+ - "OFFSET int unsigned,"+ - "index CUT_NAME_IDX (CUT_NAME))"+ + sql=QString("create table if not exists `TRIGGERS` (")+ + "`ID` int unsigned AUTO_INCREMENT not null primary key,"+ + "`CUT_NAME` char(12),"+ + "`TRIGGER_CODE` int unsigned,"+ + "`OFFSET` int unsigned,"+ + "index `CUT_NAME_IDX` (`CUT_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -519,17 +519,17 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create TTYS table // - sql=QString("create table if not exists TTYS (")+ - "ID int unsigned not null primary key AUTO_INCREMENT,"+ - "PORT_ID int unsigned not null,"+ - "ACTIVE enum('N','Y') not null default 'N',"+ - "STATION_NAME char(64) not null,"+ - "PORT char(20),"+ - "BAUD_RATE int default 9600,"+ - "DATA_BITS int default 8,"+ - "STOP_BITS int default 1,"+ - "PARITY int default 0,"+ - "TERMINATION int default 0,"+ + sql=QString("create table if not exists `TTYS` (")+ + "`ID` int unsigned not null primary key AUTO_INCREMENT,"+ + "`PORT_ID` int unsigned not null,"+ + "`ACTIVE` enum('N','Y') not null default 'N',"+ + "`STATION_NAME` char(64) not null,"+ + "`PORT` char(20),"+ + "`BAUD_RATE` int default 9600,"+ + "`DATA_BITS` int default 8,"+ + "`STOP_BITS` int default 1,"+ + "`PARITY` int default 0,"+ + "`TERMINATION` int default 0,"+ "index STATION_NAME_IDX (STATION_NAME),"+ "index ACTIVE_IDX (ACTIVE),"+ "index PORT_ID_IDX (PORT_ID))"+ @@ -542,26 +542,26 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create DECKS table // - sql=QString("create table if not exists DECKS (")+ - "ID int unsigned not null primary key AUTO_INCREMENT,"+ - "STATION_NAME char(64) not null,"+ - "CHANNEL int unsigned not null,"+ - "CARD_NUMBER int default -1,"+ - "STREAM_NUMBER int default -1,"+ - "PORT_NUMBER int default -1,"+ - "MON_PORT_NUMBER int default -1,"+ - "DEFAULT_MONITOR_ON enum('N','Y') default 'N',"+ - "PORT_TYPE enum('A','D') default 'A',"+ - "DEFAULT_FORMAT int default 0,"+ - "DEFAULT_CHANNELS int default 2,"+ - "DEFAULT_BITRATE int default 0,"+ - "DEFAULT_THRESHOLD int default 0,"+ - "SWITCH_STATION char(64),"+ - "SWITCH_MATRIX int default -1,"+ - "SWITCH_OUTPUT int default -1,"+ - "SWITCH_DELAY int default 0,"+ - "index STATION_NAME_IDX (STATION_NAME),"+ - "index CHANNEL_IDX (CHANNEL))"+ + sql=QString("create table if not exists `DECKS` (")+ + "`ID` int unsigned not null primary key AUTO_INCREMENT,"+ + "`STATION_NAME` char(64) not null,"+ + "`CHANNEL` int unsigned not null,"+ + "`CARD_NUMBER` int default -1,"+ + "`STREAM_NUMBER` int default -1,"+ + "`PORT_NUMBER` int default -1,"+ + "`MON_PORT_NUMBER` int default -1,"+ + "`DEFAULT_MONITOR_ON` enum('N','Y') default 'N',"+ + "`PORT_TYPE` enum('A','D') default 'A',"+ + "`DEFAULT_FORMAT` int default 0,"+ + "`DEFAULT_CHANNELS` int default 2,"+ + "`DEFAULT_BITRATE` int default 0,"+ + "`DEFAULT_THRESHOLD` int default 0,"+ + "`SWITCH_STATION` char(64),"+ + "`SWITCH_MATRIX` int default -1,"+ + "`SWITCH_OUTPUT` int default -1,"+ + "`SWITCH_DELAY` int default 0,"+ + "index `STATION_NAME_IDX` (`STATION_NAME`),"+ + "index `CHANNEL_IDX` (`CHANNEL`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -571,59 +571,59 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create RECORDINGS table // - sql=QString("create table if not exists RECORDINGS (")+ - "ID int unsigned not null primary key AUTO_INCREMENT,"+ - "IS_ACTIVE enum('N','Y') default 'Y',"+ - "STATION_NAME char(64) not null,"+ - "TYPE int default 0,"+ - "CHANNEL int unsigned not null,"+ - "CUT_NAME char(12) not null,"+ - "SUN enum('N','Y') default 'N',"+ - "MON enum('N','Y') default 'N',"+ - "TUE enum('N','Y') default 'N',"+ - "WED enum('N','Y') default 'N',"+ - "THU enum('N','Y') default 'N',"+ - "FRI enum('N','Y') default 'N',"+ - "SAT enum('N','Y') default 'N',"+ - "DESCRIPTION char(64),"+ - "START_TYPE int unsigned default 0,"+ - "START_TIME time,"+ - "START_LENGTH int default 0,"+ - "START_MATRIX int default -1,"+ - "START_LINE int default -1,"+ - "START_OFFSET int default 0,"+ - "END_TYPE int default 0,"+ - "END_TIME time,"+ - "END_LENGTH int default 0,"+ - "END_MATRIX int default -1,"+ - "END_LINE int default -1,"+ - "LENGTH int unsigned,"+ - "START_GPI int default -1,"+ - "END_GPI int default -1,"+ - "ALLOW_MULT_RECS enum('N','Y') default 'N',"+ - "MAX_GPI_REC_LENGTH int unsigned default 3600000,"+ - "TRIM_THRESHOLD int,"+ - "NORMALIZE_LEVEL int default -1300,"+ - "STARTDATE_OFFSET int unsigned default 0,"+ - "ENDDATE_OFFSET int unsigned default 0,"+ - "EVENTDATE_OFFSET int default 0,"+ - "FORMAT int default 0,"+ - "SAMPRATE int unsigned default 44100,"+ - "CHANNELS int default 2,"+ - "BITRATE int default 0,"+ - "QUALITY int default 0,"+ - "MACRO_CART int default -1,"+ - "SWITCH_INPUT int default -1,"+ - "SWITCH_OUTPUT int default -1,"+ - "EXIT_CODE int default 0,"+ - "EXIT_TEXT text,"+ - "ONE_SHOT enum('N','Y') default 'N',"+ - "URL char(255),"+ - "URL_USERNAME char(64),"+ - "URL_PASSWORD char(64),"+ - "ENABLE_METADATA enum('N','Y') default 'N',"+ - "FEED_ID int default -1,"+ - "index STATION_NAME_IDX (STATION_NAME))"+ + sql=QString("create table if not exists `RECORDINGS` (")+ + "`ID` int unsigned not null primary key AUTO_INCREMENT,"+ + "`IS_ACTIVE` enum('N','Y') default 'Y',"+ + "`STATION_NAME` char(64) not null,"+ + "`TYPE` int default 0,"+ + "`CHANNEL` int unsigned not null,"+ + "`CUT_NAME` char(12) not null,"+ + "`SUN` enum('N','Y') default 'N',"+ + "`MON` enum('N','Y') default 'N',"+ + "`TUE` enum('N','Y') default 'N',"+ + "`WED` enum('N','Y') default 'N',"+ + "`THU` enum('N','Y') default 'N',"+ + "`FRI` enum('N','Y') default 'N',"+ + "`SAT` enum('N','Y') default 'N',"+ + "`DESCRIPTION` char(64),"+ + "`START_TYPE` int unsigned default 0,"+ + "`START_TIME` time,"+ + "`START_LENGTH` int default 0,"+ + "`START_MATRIX` int default -1,"+ + "`START_LINE` int default -1,"+ + "`START_OFFSET` int default 0,"+ + "`END_TYPE` int default 0,"+ + "`END_TIME` time,"+ + "`END_LENGTH` int default 0,"+ + "`END_MATRIX` int default -1,"+ + "`END_LINE` int default -1,"+ + "`LENGTH` int unsigned,"+ + "`START_GPI` int default -1,"+ + "`END_GPI` int default -1,"+ + "`ALLOW_MULT_RECS` enum('N','Y') default 'N',"+ + "`MAX_GPI_REC_LENGTH` int unsigned default 3600000,"+ + "`TRIM_THRESHOLD` int,"+ + "`NORMALIZE_LEVEL` int default -1300,"+ + "`STARTDATE_OFFSET` int unsigned default 0,"+ + "`ENDDATE_OFFSET` int unsigned default 0,"+ + "`EVENTDATE_OFFSET` int default 0,"+ + "`FORMAT` int default 0,"+ + "`SAMPRATE` int unsigned default 44100,"+ + "`CHANNELS` int default 2,"+ + "`BITRATE` int default 0,"+ + "`QUALITY` int default 0,"+ + "`MACRO_CART` int default -1,"+ + "`SWITCH_INPUT` int default -1,"+ + "`SWITCH_OUTPUT` int default -1,"+ + "`EXIT_CODE` int default 0,"+ + "`EXIT_TEXT` text,"+ + "`ONE_SHOT` enum('N','Y') default 'N',"+ + "`URL` char(255),"+ + "`URL_USERNAME` char(64),"+ + "`URL_PASSWORD` char(64),"+ + "`ENABLE_METADATA` enum('N','Y') default 'N',"+ + "`FEED_ID` int default -1,"+ + "index `STATION_NAME_IDX` (`STATION_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -633,41 +633,41 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create LOGS table // - sql=QString("create table if not exists LOGS (")+ - "NAME char(64) not null primary key,"+ - "LOG_EXISTS enum('N','Y') default 'Y',"+ - "TYPE int not null default 0,"+ - "SERVICE char(10) not null,"+ - "DESCRIPTION char(64),"+ - "ORIGIN_USER char(255) not null,"+ - "ORIGIN_DATETIME datetime not null,"+ - "LINK_DATETIME datetime,"+ - "MODIFIED_DATETIME datetime not null,"+ - "AUTO_REFRESH enum('N','Y') default 'N',"+ - "START_DATE date,"+ - "END_DATE date,"+ - "PURGE_DATE date,"+ - "IMPORT_DATE date,"+ - "SCHEDULED_TRACKS int unsigned default 0,"+ - "COMPLETED_TRACKS int unsigned default 0,"+ - "MUSIC_LINKS int default 0,"+ - "MUSIC_LINKED enum('N','Y') default 'N',"+ - "TRAFFIC_LINKS int default 0,"+ - "TRAFFIC_LINKED enum('N','Y') default 'N',"+ - "NEXT_ID int default 0,"+ - "LOCK_USER_NAME char(255),"+ - "LOCK_STATION_NAME char(64),"+ - "LOCK_IPV4_ADDRESS char(16),"+ - "LOCK_DATETIME datetime,"+ - "LOCK_GUID char(82),"+ - "index NAME_IDX (NAME,LOG_EXISTS),"+ - "index SERVICE_IDX (SERVICE),"+ - "index DESCRIPTION_IDX (DESCRIPTION),"+ - "index ORIGIN_USER_IDX (ORIGIN_USER),"+ - "index START_DATE_IDX (START_DATE),"+ - "index END_DATE_IDX (END_DATE),"+ - "index TYPE_IDX(TYPE,LOG_EXISTS),"+ - "index LOCK_GUID_IDX(LOCK_GUID))"+ + sql=QString("create table if not exists `LOGS` (")+ + "`NAME` char(64) not null primary key,"+ + "`LOG_EXISTS` enum('N','Y') default 'Y',"+ + "`TYPE` int not null default 0,"+ + "`SERVICE` char(10) not null,"+ + "`DESCRIPTION` char(64),"+ + "`ORIGIN_USER` char(255) not null,"+ + "`ORIGIN_DATETIME` datetime not null,"+ + "`LINK_DATETIME` datetime,"+ + "`MODIFIED_DATETIME` datetime not null,"+ + "`AUTO_REFRESH` enum('N','Y') default 'N',"+ + "`START_DATE` date,"+ + "`END_DATE` date,"+ + "`PURGE_DATE` date,"+ + "`IMPORT_DATE` date,"+ + "`SCHEDULED_TRACKS` int unsigned default 0,"+ + "`COMPLETED_TRACKS` int unsigned default 0,"+ + "`MUSIC_LINKS` int default 0,"+ + "`MUSIC_LINKED` enum('N','Y') default 'N',"+ + "`TRAFFIC_LINKS` int default 0,"+ + "`TRAFFIC_LINKED` enum('N','Y') default 'N',"+ + "`NEXT_ID` int default 0,"+ + "`LOCK_USER_NAME` char(255),"+ + "`LOCK_STATION_NAME` char(64),"+ + "`LOCK_IPV4_ADDRESS` char(16),"+ + "`LOCK_DATETIME` datetime,"+ + "`LOCK_GUID` char(82),"+ + "index `NAME_IDX` (`NAME`,`LOG_EXISTS`),"+ + "index `SERVICE_IDX` (`SERVICE),"+ + "index `DESCRIPTION_IDX` (`DESCRIPTION`),"+ + "index `ORIGIN_USER_IDX` (`ORIGIN_USER`),"+ + "index `START_DATE_IDX` (`START_DATE`),"+ + "index `END_DATE_IDX` (`END_DATE`),"+ + "index `TYPE_IDX` (`TYPE`,`LOG_EXISTS`),"+ + "index `LOCK_GUID_IDX` (`LOCK_GUID`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -677,10 +677,10 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create VERSION table // - sql=QString("create table if not exists VERSION (")+ - "DB int not null primary key,"+ - "LAST_MAINT_DATETIME datetime default \"1970-01-01 00:00:00\","+ - "LAST_ISCI_XREFERENCE datetime default \"1970-01-01 00:00:00\")"+ + sql=QString("create table if not exists `VERSION` (")+ + "`DB` int not null primary key,"+ + "`LAST_MAINT_DATETIME` datetime default '1970-01-01 00:00:00',"+ + "`LAST_ISCI_XREFERENCE` datetime default '1970-01-01 00:00:00')"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -690,40 +690,40 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create RDAIRPLAY Table // - sql=QString("create table if not exists RDAIRPLAY (")+ - "ID int not null primary key auto_increment,"+ - "STATION char(40) not null,"+ - "SEGUE_LENGTH int default 250,"+ - "TRANS_LENGTH int default 50,"+ - "LOG_MODE_STYLE int default 0,"+ - "PIE_COUNT_LENGTH int default 15000,"+ - "PIE_COUNT_ENDPOINT int default 0,"+ - "CHECK_TIMESYNC enum('N','Y') default 'N',"+ - "STATION_PANELS int default 3,"+ - "USER_PANELS int default 3,"+ - "SHOW_AUX_1 enum('N','Y') default 'Y',"+ - "SHOW_AUX_2 enum('N','Y') default 'Y',"+ - "CLEAR_FILTER enum('N','Y') default 'N',"+ - "DEFAULT_TRANS_TYPE int default 0,"+ - "BAR_ACTION int unsigned default 0,"+ - "FLASH_PANEL enum('N','Y') default 'N',"+ - "PANEL_PAUSE_ENABLED enum('N','Y') default 'N',"+ - "BUTTON_LABEL_TEMPLATE char(32) default '%t',"+ - "PAUSE_ENABLED enum('N','Y'),"+ - "DEFAULT_SERVICE char(10),"+ - "HOUR_SELECTOR_ENABLED enum('N','Y') default 'N',"+ - "TITLE_TEMPLATE char(64) default '%t',"+ - "ARTIST_TEMPLATE char(64) default '%a',"+ - "OUTCUE_TEMPLATE char(64) default '%o',"+ - "DESCRIPTION_TEMPLATE char(64) default '%i',"+ - "EXIT_CODE int default 0,"+ - "VIRTUAL_EXIT_CODE int default 0,"+ - "EXIT_PASSWORD char(41) default \"\","+ - "SKIN_PATH char(255) default \""+ - RDEscapeString(RD_DEFAULT_RDAIRPLAY_SKIN)+"\","+ - "SHOW_COUNTERS enum('N','Y') default 'N',"+ - "AUDITION_PREROLL int default 10000,"+ - "index STATION_IDX (STATION))"+ + sql=QString("create table if not exists `RDAIRPLAY` (")+ + "`ID` int not null primary key auto_increment,"+ + "`STATION` char(40) not null,"+ + "`SEGUE_LENGTH` int default 250,"+ + "`TRANS_LENGTH` int default 50,"+ + "`LOG_MODE_STYLE` int default 0,"+ + "`PIE_COUNT_LENGTH` int default 15000,"+ + "`PIE_COUNT_ENDPOINT` int default 0,"+ + "`CHECK_TIMESYNC` enum('N','Y') default 'N',"+ + "`STATION_PANELS` int default 3,"+ + "`USER_PANELS` int default 3,"+ + "`SHOW_AUX_1` enum('N','Y') default 'Y',"+ + "`SHOW_AUX_2` enum('N','Y') default 'Y',"+ + "`CLEAR_FILTER` enum('N','Y') default 'N',"+ + "`DEFAULT_TRANS_TYPE` int default 0,"+ + "`BAR_ACTION` int unsigned default 0,"+ + "`FLASH_PANEL` enum('N','Y') default 'N',"+ + "`PANEL_PAUSE_ENABLED` enum('N','Y') default 'N',"+ + "`BUTTON_LABEL_TEMPLATE` char(32) default '%t',"+ + "`PAUSE_ENABLED` enum('N','Y'),"+ + "`DEFAULT_SERVICE` char(10),"+ + "`HOUR_SELECTOR_ENABLED` enum('N','Y') default 'N',"+ + "`TITLE_TEMPLATE` char(64) default '%t',"+ + "`ARTIST_TEMPLATE` char(64) default '%a',"+ + "`OUTCUE_TEMPLATE` char(64) default '%o',"+ + "`DESCRIPTION_TEMPLATE` char(64) default '%i',"+ + "`EXIT_CODE` int default 0,"+ + "`VIRTUAL_EXIT_CODE` int default 0,"+ + "`EXIT_PASSWORD` char(41) default '',"+ + "`SKIN_PATH` char(255) default '"+ + RDEscapeString(RD_DEFAULT_RDAIRPLAY_SKIN)+"',"+ + "`SHOW_COUNTERS` enum('N','Y') default 'N',"+ + "`AUDITION_PREROLL` int default 10000,"+ + "index `STATION_IDX` (`STATION`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -733,18 +733,18 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create PANELS Table // - sql=QString("create table if not exists PANELS (")+ - "ID int auto_increment not null primary key,"+ - "TYPE int not null,"+ - "OWNER char(64) not null,"+ - "PANEL_NO int not null,"+ - "ROW_NO int not null,"+ - "COLUMN_NO int not null,"+ - "LABEL char(64),"+ - "CART int,"+ - "DEFAULT_COLOR char(7),"+ - "index LOAD_IDX (TYPE,OWNER,PANEL_NO),"+ - "index SAVE_IDX (TYPE,OWNER,PANEL_NO,ROW_NO,COLUMN_NO))"+ + sql=QString("create table if not exists `PANELS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`TYPE` int not null,"+ + "`OWNER` char(64) not null,"+ + "`PANEL_NO` int not null,"+ + "`ROW_NO` int not null,"+ + "`COLUMN_NO` int not null,"+ + "`LABEL` char(64),"+ + "`CART` int,"+ + "`DEFAULT_COLOR` char(7),"+ + "index `LOAD_IDX` (`TYPE`,`OWNER`,`PANEL_NO`),"+ + "index `SAVE_IDX` (`TYPE`,`OWNER`,`PANEL_NO`,`ROW_NO`,`COLUMN_NO`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -754,38 +754,38 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create MATRICES Table // - sql=QString("create table if not exists MATRICES (")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "NAME char(64),"+ - "MATRIX int not null,"+ - "TYPE int not null,"+ - "LAYER int default 86,"+ - "PORT_TYPE int default 0,"+ - "PORT_TYPE_2 int default 0,"+ - "CARD int default -1,"+ - "PORT int not null default 0,"+ - "PORT_2 int not null default 0,"+ - "IP_ADDRESS char(16),"+ - "IP_ADDRESS_2 char(16),"+ - "IP_PORT int,"+ - "IP_PORT_2 int,"+ - "USERNAME char(32),"+ - "USERNAME_2 char(32),"+ - "PASSWORD char(32),"+ - "PASSWORD_2 char(32),"+ - "START_CART int unsigned,"+ - "STOP_CART int unsigned,"+ - "START_CART_2 int unsigned,"+ - "STOP_CART_2 int unsigned,"+ - "GPIO_DEVICE char(255),"+ - "INPUTS int not null default 0,"+ - "OUTPUTS int not null default 0,"+ - "GPIS int not null default 0,"+ - "GPOS int not null default 0,"+ - "FADERS int default 0,"+ - "DISPLAYS int default 0,"+ - "index MATRIX_IDX (STATION_NAME,MATRIX))"+ + sql=QString("create table if not exists `MATRICES` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`NAME` char(64),"+ + "`MATRIX` int not null,"+ + "`TYPE` int not null,"+ + "`LAYER` int default 86,"+ + "`PORT_TYPE` int default 0,"+ + "`PORT_TYPE_2` int default 0,"+ + "`CARD` int default -1,"+ + "`PORT` int not null default 0,"+ + "`PORT_2` int not null default 0,"+ + "`IP_ADDRESS` char(16),"+ + "`IP_ADDRESS_2` char(16),"+ + "`IP_PORT` int,"+ + "`IP_PORT_2` int,"+ + "`USERNAME` char(32),"+ + "`USERNAME_2` char(32),"+ + "`PASSWORD` char(32),"+ + "`PASSWORD_2` char(32),"+ + "`START_CART` int unsigned,"+ + "`STOP_CART` int unsigned,"+ + "`START_CART_2` int unsigned,"+ + "`STOP_CART_2` int unsigned,"+ + "`GPIO_DEVICE` char(255),"+ + "`INPUTS` int not null default 0,"+ + "`OUTPUTS` int not null default 0,"+ + "`GPIS` int not null default 0,"+ + "`GPOS` int not null default 0,"+ + "`FADERS` int default 0,"+ + "`DISPLAYS` int default 0,"+ + "index `MATRIX_IDX` (`STATION_NAME`,`MATRIX`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -795,21 +795,21 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create INPUTS Table // - sql=QString("create table if not exists INPUTS (")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "MATRIX int not null,"+ - "NUMBER int not null,"+ - "NAME char(64),"+ - "FEED_NAME char(8),"+ - "CHANNEL_MODE int,"+ - "ENGINE_NUM int default -1,"+ - "DEVICE_NUM int default -1,"+ - "NODE_HOSTNAME char(255),"+ - "NODE_TCP_PORT int,"+ - "NODE_SLOT int,"+ - "index MATRIX_IDX (STATION_NAME,MATRIX,NUMBER),"+ - "index NODE_IDX (STATION_NAME,MATRIX,NUMBER,NODE_HOSTNAME,NODE_TCP_PORT))"+ + sql=QString("create table if not exists `INPUTS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`MATRIX` int not null,"+ + "`NUMBER` int not null,"+ + "`NAME` char(64),"+ + "`FEED_NAME` char(8),"+ + "`CHANNEL_MODE` int,"+ + "`ENGINE_NUM` int default -1,"+ + "`DEVICE_NUM` int default -1,"+ + "`NODE_HOSTNAME` char(255),"+ + "`NODE_TCP_PORT` int,"+ + "`NODE_SLOT` int,"+ + "index `MATRIX_IDX` (`STATION_NAME`,`MATRIX`,`NUMBER`),"+ + "index `NODE_IDX` (`STATION_NAME`,`MATRIX`,`NUMBER`,`NODE_HOSTNAME`,`NODE_TCP_PORT`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -819,19 +819,19 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create OUTPUTS Table // - sql=QString("create table if not exists OUTPUTS (")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "MATRIX int not null,"+ - "NUMBER int not null,"+ - "NAME char(64),"+ - "ENGINE_NUM int default -1,"+ - "DEVICE_NUM int default -1,"+ - "NODE_HOSTNAME char(255),"+ - "NODE_TCP_PORT int,"+ - "NODE_SLOT int,"+ - "index MATRIX_IDX (STATION_NAME,MATRIX,NUMBER),"+ - "index NODE_IDX (STATION_NAME,MATRIX,NUMBER,NODE_HOSTNAME,NODE_TCP_PORT))"+ + sql=QString("create table if not exists `OUTPUTS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`MATRIX` int not null,"+ + "`NUMBER` int not null,"+ + "`NAME` char(64),"+ + "`ENGINE_NUM` int default -1,"+ + "`DEVICE_NUM` int default -1,"+ + "`NODE_HOSTNAME` char(255),"+ + "`NODE_TCP_PORT` int,"+ + "`NODE_SLOT` int,"+ + "index `MATRIX_IDX` (`STATION_NAME`,`MATRIX,NUMBER`),"+ + "index `NODE_IDX` (`STATION_NAME`,`MATRIX`,`NUMBER`,`NODE_HOSTNAME`,`NODE_TCP_PORT`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -841,14 +841,14 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create GPIS Table // - sql=QString("create table if not exists GPIS (")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "MATRIX int not null,"+ - "NUMBER int not null,"+ - "MACRO_CART int default 0,"+ - "OFF_MACRO_CART int default 0,"+ - "index MATRIX_IDX (STATION_NAME,MATRIX,NUMBER))"+ + sql=QString("create table if not exists `GPIS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`MATRIX` int not null,"+ + "`NUMBER` int not null,"+ + "`MACRO_CART` int default 0,"+ + "`OFF_MACRO_CART` int default 0,"+ + "index `MATRIX_IDX` (`STATION_NAME`,`MATRIX`,`NUMBER`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -858,32 +858,32 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create EVENTS table // - sql=QString("create table if not exists EVENTS (")+ - "NAME char(64) not null primary key,"+ - "PROPERTIES char(64),"+ - "DISPLAY_TEXT char(64),"+ - "NOTE_TEXT char(255),"+ - "PREPOSITION int default -1,"+ - "TIME_TYPE int default 0,"+ - "GRACE_TIME int default 0,"+ - "POST_POINT enum('N','Y') default 'N',"+ - "USE_AUTOFILL enum('N','Y') default 'N',"+ - "AUTOFILL_SLOP int default -1,"+ - "USE_TIMESCALE enum('N','Y') default 'N',"+ - "IMPORT_SOURCE int default 0,"+ - "START_SLOP int default 0,"+ - "END_SLOP int default 0,"+ - "FIRST_TRANS_TYPE int default 0,"+ - "DEFAULT_TRANS_TYPE int default 0,"+ - "COLOR char(7),"+ - "SCHED_GROUP VARCHAR(10),"+ - "TITLE_SEP INT(10) unsigned,"+ - "HAVE_CODE VARCHAR(10),"+ - "HAVE_CODE2 VARCHAR(10),"+ - "HOR_SEP INT(10) unsigned,"+ - "HOR_DIST INT(10) unsigned,"+ - "NESTED_EVENT char(64),"+ - "REMARKS char(255))"+ + sql=QString("create table if not exists `EVENTS` (")+ + "`NAME` char(64) not null primary key,"+ + "`PROPERTIES` char(64),"+ + "`DISPLAY_TEXT` char(64),"+ + "`NOTE_TEXT` char(255),"+ + "`PREPOSITION` int default -1,"+ + "`TIME_TYPE` int default 0,"+ + "`GRACE_TIME` int default 0,"+ + "`POST_POINT` enum('N','Y') default 'N',"+ + "`USE_AUTOFILL` enum('N','Y') default 'N',"+ + "`AUTOFILL_SLOP` int default -1,"+ + "`USE_TIMESCALE` enum('N','Y') default 'N',"+ + "`IMPORT_SOURCE` int default 0,"+ + "`START_SLOP` int default 0,"+ + "`END_SLOP` int default 0,"+ + "`FIRST_TRANS_TYPE` int default 0,"+ + "`DEFAULT_TRANS_TYPE` int default 0,"+ + "`COLOR` char(7),"+ + "`SCHED_GROUP` varchar(10),"+ + "`TITLE_SEP` int(10) unsigned,"+ + "`HAVE_CODE` varchar(10),"+ + "`HAVE_CODE2` varchar(10),"+ + "`HOR_SEP` int(10) unsigned,"+ + "`HOR_DIST` int(10) unsigned,"+ + "`NESTED_EVENT` char(64),"+ + "`REMARKS` char(255))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -893,12 +893,12 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create CLOCKS table // - sql=QString("create table if not exists CLOCKS (")+ - "NAME char(64) not null primary key,"+ - "SHORT_NAME char(8),"+ - "ARTISTSEP int(10) unsigned,"+ - "COLOR char(7),"+ - "REMARKS char(255))"+ + sql=QString("create table if not exists `CLOCKS` (")+ + "`NAME` char(64) not null primary key,"+ + "`SHORT_NAME` char(8),"+ + "`ARTISTSEP` int(10) unsigned,"+ + "`COLOR` char(7),"+ + "`REMARKS` char(255))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -908,11 +908,11 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create AUTOFILLS table // - sql=QString("create table if not exists AUTOFILLS (")+ - "ID int not null primary key auto_increment,"+ - "SERVICE char(10),"+ - "CART_NUMBER int unsigned,"+ - "index SERVICE_IDX (SERVICE))"+ + sql=QString("create table if not exists `AUTOFILLS` (")+ + "`ID` int not null primary key auto_increment,"+ + "`SERVICE` char(10),"+ + "`CART_NUMBER` int unsigned,"+ + "index `SERVICE_IDX` (`SERVICE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -922,13 +922,13 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create HOSTVARS table // - sql=QString("create table if not exists HOSTVARS (")+ - "ID int not null primary key auto_increment,"+ - "STATION_NAME char(64) not null,"+ - "NAME char(32) not null,"+ - "VARVALUE char(255),"+ - "REMARK char(255),"+ - "index NAME_IDX (STATION_NAME))"+ + sql=QString("create table if not exists `HOSTVARS` (")+ + "`ID` int not null primary key auto_increment,"+ + "`STATION_NAME` char(64) not null,"+ + "`NAME` char(32) not null,"+ + "`VARVALUE` char(255),"+ + "`REMARK` char(255),"+ + "index `NAME_IDX` (`STATION_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -938,12 +938,12 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create SERVICE_PERMS Table // - sql=QString("create table if not exists SERVICE_PERMS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "STATION_NAME char(64),"+ - "SERVICE_NAME char(10),"+ - "index STATION_IDX (STATION_NAME),"+ - "index SERVICE_IDX (SERVICE_NAME))"+ + sql=QString("create table if not exists `SERVICE_PERMS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`STATION_NAME` char(64),"+ + "`SERVICE_NAME` char(10),"+ + "index `STATION_IDX` (`STATION_NAME`),"+ + "index `SERVICE_IDX` (`SERVICE_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -953,32 +953,32 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create REPORTS Table // - sql=QString("create table if not exists REPORTS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "NAME char(64) not null unique,"+ - "DESCRIPTION char(64),"+ - "EXPORT_FILTER int,"+ - "EXPORT_PATH char(255),"+ - "POST_EXPORT_CMD text,"+ - "WIN_EXPORT_PATH char(255),"+ - "WIN_POST_EXPORT_CMD text,"+ - "EXPORT_TFC enum('N','Y') default 'N',"+ - "FORCE_TFC enum('N','Y') default 'N',"+ - "EXPORT_MUS enum('N','Y') default 'N',"+ - "FORCE_MUS enum('N','Y') default 'N',"+ - "EXPORT_GEN enum('N','Y') default 'N',"+ - "STATION_ID char(16),"+ - "CART_DIGITS int unsigned default 6,"+ - "USE_LEADING_ZEROS enum('N','Y') default 'N',"+ - "LINES_PER_PAGE int default 66,"+ - "SERVICE_NAME char(64),"+ - "STATION_TYPE int default 0,"+ - "STATION_FORMAT char(64),"+ - "FILTER_ONAIR_FLAG enum('N','Y') default 'N',"+ - "FILTER_GROUPS enum('N','Y') default 'N',"+ - "START_TIME time,"+ - "END_TIME time,"+ - "index IDX_NAME (NAME))"+ + sql=QString("create table if not exists `REPORTS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`NAME` char(64) not null unique,"+ + "`DESCRIPTION` char(64),"+ + "`EXPORT_FILTER` int,"+ + "`EXPORT_PATH` char(255),"+ + "`POST_EXPORT_CMD` text,"+ + "`WIN_EXPORT_PATH` char(255),"+ + "`WIN_POST_EXPORT_CMD` text,"+ + "`EXPORT_TFC` enum('N','Y') default 'N',"+ + "`FORCE_TFC` enum('N','Y') default 'N',"+ + "`EXPORT_MUS` enum('N','Y') default 'N',"+ + "`FORCE_MUS` enum('N','Y') default 'N',"+ + "`EXPORT_GEN` enum('N','Y') default 'N',"+ + "`STATION_ID` char(16),"+ + "`CART_DIGITS` int unsigned default 6,"+ + "`USE_LEADING_ZEROS` enum('N','Y') default 'N',"+ + "`LINES_PER_PAGE` int default 66,"+ + "`SERVICE_NAME` char(64),"+ + "`STATION_TYPE` int default 0,"+ + "`STATION_FORMAT` char(64),"+ + "`FILTER_ONAIR_FLAG` enum('N','Y') default 'N',"+ + "`FILTER_GROUPS` enum('N','Y') default 'N',"+ + "`START_TIME` time,"+ + "`END_TIME` time,"+ + "index `IDX_NAME` (`NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -988,11 +988,11 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create REPORT_SERVICES Table // - sql=QString("create table if not exists REPORT_SERVICES (")+ - "ID int unsigned auto_increment not null primary key,"+ - "REPORT_NAME char(64) not null,"+ - "SERVICE_NAME char(10),"+ - "index IDX_REPORT_NAME (REPORT_NAME))"+ + sql=QString("create table if not exists `REPORT_SERVICES` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`REPORT_NAME` char(64) not null,"+ + "`SERVICE_NAME` char(10),"+ + "index `IDX_REPORT_NAME` (`REPORT_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1002,11 +1002,11 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create REPORT_STATIONS Table // - sql=QString("create table if not exists REPORT_STATIONS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "REPORT_NAME char(64) not null,"+ - "STATION_NAME char(64),"+ - "index IDX_REPORT_NAME (REPORT_NAME))"+ + sql=QString("create table if not exists `REPORT_STATIONS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`REPORT_NAME` char(64) not null,"+ + "`STATION_NAME` char(64),"+ + "index `IDX_REPORT_NAME` (`REPORT_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1016,11 +1016,11 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create REPORT_GROUPS Table // - sql=QString("create table if not exists REPORT_GROUPS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "REPORT_NAME char(64) not null,"+ - "GROUP_NAME char(10),"+ - "index IDX_REPORT_NAME (REPORT_NAME))"+ + sql=QString("create table if not exists `REPORT_GROUPS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`REPORT_NAME` char(64) not null,"+ + "`GROUP_NAME` char(10),"+ + "index `IDX_REPORT_NAME` (`REPORT_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1030,12 +1030,12 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create CLOCK_PERMS Table // - sql=QString("create table if not exists CLOCK_PERMS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "CLOCK_NAME char(64),"+ - "SERVICE_NAME char(10),"+ - "index STATION_IDX (CLOCK_NAME),"+ - "index SERVICE_IDX (SERVICE_NAME))"+ + sql=QString("create table if not exists `CLOCK_PERMS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`CLOCK_NAME` char(64),"+ + "`SERVICE_NAME` char(10),"+ + "index `STATION_IDX` (`CLOCK_NAME`),"+ + "index `SERVICE_IDX` (`SERVICE_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1045,12 +1045,12 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create EVENT_PERMS Table // - sql=QString("create table if not exists EVENT_PERMS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "EVENT_NAME char(64),"+ - "SERVICE_NAME char(10),"+ - "index STATION_IDX (EVENT_NAME),"+ - "index SERVICE_IDX (SERVICE_NAME))"+ + sql=QString("create table if not exists `EVENT_PERMS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`EVENT_NAME` char(64),"+ + "`SERVICE_NAME` char(10),"+ + "index `STATION_IDX` (`EVENT_NAME`),"+ + "index `SERVICE_IDX` (`SERVICE_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1060,12 +1060,12 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create USER_PERMS table // - sql=QString("create table if not exists USER_PERMS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "USER_NAME char(255),"+ - "GROUP_NAME char(10),"+ - "index USER_IDX (USER_NAME),"+ - "index GROUP_IDX (GROUP_NAME))"+ + sql=QString("create table if not exists `USER_PERMS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`USER_NAME` char(255),"+ + "`GROUP_NAME` char(10),"+ + "index `USER_IDX` (`USER_NAME`),"+ + "index `GROUP_IDX` (`GROUP_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1075,18 +1075,18 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create VGUEST_RESOURCES Table // - sql=QString("create table if not exists VGUEST_RESOURCES (")+ - "ID int unsigned auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "MATRIX_NUM int not null,"+ - "VGUEST_TYPE int not null,"+ - "NUMBER int not null,"+ - "ENGINE_NUM int default -1,"+ - "DEVICE_NUM int default -1,"+ - "SURFACE_NUM int default 0,"+ - "RELAY_NUM int default -1,"+ - "BUSS_NUM int default -1,"+ - "index STATION_MATRIX_IDX (STATION_NAME,MATRIX_NUM,VGUEST_TYPE))"+ + sql=QString("create table if not exists `VGUEST_RESOURCES` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`MATRIX_NUM` int not null,"+ + "`VGUEST_TYPE` int not null,"+ + "`NUMBER` int not null,"+ + "`ENGINE_NUM` int default -1,"+ + "`DEVICE_NUM` int default -1,"+ + "`SURFACE_NUM` int default 0,"+ + "`RELAY_NUM` int default -1,"+ + "`BUSS_NUM` int default -1,"+ + "index `STATION_MATRIX_IDX` (`STATION_NAME`,`MATRIX_NUM`,`VGUEST_TYPE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1096,28 +1096,28 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create RDLOGEDIT table // - sql=QString("create table if not exists RDLOGEDIT (")+ - "ID int unsigned primary key auto_increment,"+ - "STATION char(64) not null,"+ - "INPUT_CARD int default -1,"+ - "INPUT_PORT int default 0,"+ - "OUTPUT_CARD int default -1,"+ - "OUTPUT_PORT int default 0,"+ - "FORMAT int unsigned default 0,"+ - "LAYER int unsigned default 0,"+ - "BITRATE int unsigned default 0,"+ - "ENABLE_SECOND_START enum('N','Y') default 'Y',"+ - "DEFAULT_CHANNELS int unsigned default 2,"+ - "MAXLENGTH int default 0,"+ - "TAIL_PREROLL int unsigned default 2000,"+ - "START_CART int unsigned default 0,"+ - "END_CART int unsigned default 0,"+ - "REC_START_CART int unsigned default 0,"+ - "REC_END_CART int unsigned default 0,"+ - "TRIM_THRESHOLD int default -3000,"+ - "RIPPER_LEVEL int default -1300,"+ - "DEFAULT_TRANS_TYPE int default 0,"+ - "index STATION_IDX (STATION))"+ + sql=QString("create table if not exists `RDLOGEDIT` (")+ + "`ID` int unsigned primary key auto_increment,"+ + "`STATION` char(64) not null,"+ + "`INPUT_CARD` int default -1,"+ + "`INPUT_PORT` int default 0,"+ + "`OUTPUT_CARD` int default -1,"+ + "`OUTPUT_PORT` int default 0,"+ + "`FORMAT` int unsigned default 0,"+ + "`LAYER` int unsigned default 0,"+ + "`BITRATE` int unsigned default 0,"+ + "`ENABLE_SECOND_START` enum('N','Y') default 'Y',"+ + "`DEFAULT_CHANNELS` int unsigned default 2,"+ + "`MAXLENGTH` int default 0,"+ + "`TAIL_PREROLL` int unsigned default 2000,"+ + "`START_CART` int unsigned default 0,"+ + "`END_CART` int unsigned default 0,"+ + "`REC_START_CART` int unsigned default 0,"+ + "`REC_END_CART` int unsigned default 0,"+ + "`TRIM_THRESHOLD` int default -3000,"+ + "`RIPPER_LEVEL` int default -1300,"+ + "`DEFAULT_TRANS_TYPE` int default 0,"+ + "index `STATION_IDX` (`STATION`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1127,11 +1127,11 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create RDCATCH table // - sql=QString("create table if not exists RDCATCH (")+ - "ID int unsigned primary key auto_increment,"+ - "STATION char(64) not null,"+ - "ERROR_RML char(255),"+ - "index STATION_IDX (STATION))"+ + sql=QString("create table if not exists `RDCATCH` (")+ + "`ID` int unsigned primary key auto_increment,"+ + "`STATION` char(64) not null,"+ + "`ERROR_RML` char(255),"+ + "index `STATION_IDX` (`STATION`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1141,9 +1141,9 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create SCHED_CODES Table // - sql=QString("create table if not exists SCHED_CODES")+ - "(CODE varchar(10) not null primary key,"+ - "DESCRIPTION varchar(255))"+ + sql=QString("create table if not exists `SCHED_CODES`")+ + "(`CODE` varchar(10) not null primary key,"+ + "`DESCRIPTION` varchar(255))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1153,32 +1153,32 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create DROPBOXES Table // - sql=QString("create table if not exists DROPBOXES ")+ - "(ID int auto_increment not null primary key,"+ - "STATION_NAME char(64),"+ - "GROUP_NAME char(10),"+ - "PATH char(255),"+ - "NORMALIZATION_LEVEL int default 1,"+ - "AUTOTRIM_LEVEL int default 1,"+ - "SINGLE_CART enum('N','Y') default 'N',"+ - "TO_CART int unsigned default 0,"+ - "FORCE_TO_MONO enum('N','Y') default 'N',"+ - "SEGUE_LEVEL int(11) default 1,"+ - "SEGUE_LENGTH int(11) default 0,"+ - "USE_CARTCHUNK_ID enum('N','Y') default 'N',"+ - "TITLE_FROM_CARTCHUNK_ID enum('N','Y') default 'N',"+ - "DELETE_CUTS enum('N','Y') default 'N',"+ - "DELETE_SOURCE enum('N','Y') default 'Y',"+ - "METADATA_PATTERN char(64),"+ - "STARTDATE_OFFSET int default 0,"+ - "ENDDATE_OFFSET int default 0,"+ - "FIX_BROKEN_FORMATS enum('N','Y') default 'N',"+ - "LOG_PATH char(255),"+ - "IMPORT_CREATE_DATES enum('N','Y') default 'N',"+ - "CREATE_STARTDATE_OFFSET int default 0,"+ - "CREATE_ENDDATE_OFFSET int default 0,"+ - "SET_USER_DEFINED char(255),"+ - "index STATION_NAME_IDX (STATION_NAME))"+ + sql=QString("create table if not exists `DROPBOXES` ")+ + "(`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64),"+ + "`GROUP_NAME` char(10),"+ + "`PATH` char(255),"+ + "`NORMALIZATION_LEVEL` int default 1,"+ + "`AUTOTRIM_LEVEL` int default 1,"+ + "`SINGLE_CART` enum('N','Y') default 'N',"+ + "`TO_CART` int unsigned default 0,"+ + "`FORCE_TO_MONO` enum('N','Y') default 'N',"+ + "`SEGUE_LEVEL` int(11) default 1,"+ + "`SEGUE_LENGTH` int(11) default 0,"+ + "`USE_CARTCHUNK_ID` enum('N','Y') default 'N',"+ + "`TITLE_FROM_CARTCHUNK_ID` enum('N','Y') default 'N',"+ + "`DELETE_CUTS` enum('N','Y') default 'N',"+ + "`DELETE_SOURCE` enum('N','Y') default 'Y',"+ + "`METADATA_PATTERN` char(64),"+ + "`STARTDATE_OFFSET` int default 0,"+ + "`ENDDATE_OFFSET` int default 0,"+ + "`FIX_BROKEN_FORMATS` enum('N','Y') default 'N',"+ + "`LOG_PATH` char(255),"+ + "`IMPORT_CREATE_DATES` enum('N','Y') default 'N',"+ + "`CREATE_STARTDATE_OFFSET` int default 0,"+ + "`CREATE_ENDDATE_OFFSET` int default 0,"+ + "`SET_USER_DEFINED` char(255),"+ + "index `STATION_NAME_IDX` (`STATION_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1188,19 +1188,19 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create RDPANEL Table // - sql=QString("create table if not exists RDPANEL (")+ - "ID int not null primary key auto_increment,"+ - "STATION char(40) not null,"+ - "STATION_PANELS int default 3,"+ - "USER_PANELS int default 3,"+ - "CLEAR_FILTER enum('N','Y') default 'N',"+ - "FLASH_PANEL enum('N','Y') default 'N',"+ - "PANEL_PAUSE_ENABLED enum('N','Y') default 'N',"+ - "BUTTON_LABEL_TEMPLATE char(32) default \"%t\","+ - "DEFAULT_SERVICE char(10),"+ - "SKIN_PATH char(255) default \""+ - RDEscapeString(RD_DEFAULT_RDPANEL_SKIN)+"\","+ - "index STATION_IDX (STATION))"+ + sql=QString("create table if not exists `RDPANEL` (")+ + "`ID` int not null primary key auto_increment,"+ + "`STATION` char(40) not null,"+ + "`STATION_PANELS` int default 3,"+ + "`USER_PANELS` int default 3,"+ + "`CLEAR_FILTER` enum('N','Y') default 'N',"+ + "`FLASH_PANEL` enum('N','Y') default 'N',"+ + "`PANEL_PAUSE_ENABLED` enum('N','Y') default 'N',"+ + "`BUTTON_LABEL_TEMPLATE` char(32) default '%t',"+ + "`DEFAULT_SERVICE` char(10),"+ + "`SKIN_PATH` char(255) default '"+ + RDEscapeString(RD_DEFAULT_RDPANEL_SKIN)+"',"+ + "index `STATION_IDX` (`STATION`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1210,18 +1210,18 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create EXTENDED_PANELS Table // - sql=QString("create table if not exists EXTENDED_PANELS (")+ - "ID int auto_increment not null primary key,"+ - "TYPE int not null,"+ - "OWNER char(64) not null,"+ - "PANEL_NO int not null,"+ - "ROW_NO int not null,"+ - "COLUMN_NO int not null,"+ - "LABEL char(64),"+ - "CART int,"+ - "DEFAULT_COLOR char(7),"+ - "index LOAD_IDX (TYPE,OWNER,PANEL_NO),"+ - "index SAVE_IDX (TYPE,OWNER,PANEL_NO,ROW_NO,COLUMN_NO))"+ + sql=QString("create table if not exists `EXTENDED_PANELS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`TYPE` int not null,"+ + "`OWNER` char(64) not null,"+ + "`PANEL_NO` int not null,"+ + "`ROW_NO` int not null,"+ + "`COLUMN_NO` int not null,"+ + "`LABEL` char(64),"+ + "`CART` int,"+ + "`DEFAULT_COLOR` char(7),"+ + "index `LOAD_IDX` (`TYPE`,`OWNER`,`PANEL_NO`),"+ + "index `SAVE_IDX` (`TYPE`,`OWNER`,`PANEL_NO`,`ROW_NO`,`COLUMN_NO`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1231,13 +1231,13 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create PANEL_NAMES Table // - sql=QString("create table if not exists PANEL_NAMES (")+ - "ID int auto_increment not null primary key,"+ - "TYPE int not null,"+ - "OWNER char(64) not null,"+ - "PANEL_NO int not null,"+ - "NAME char(64),"+ - "index LOAD_IDX (TYPE,OWNER,PANEL_NO))"+ + sql=QString("create table if not exists `PANEL_NAMES` (")+ + "`ID` int auto_increment not null primary key,"+ + "`TYPE` int not null,"+ + "`OWNER` char(64) not null,"+ + "`PANEL_NO` int not null,"+ + "`NAME` char(64),"+ + "index `LOAD_IDX` (`TYPE`,`OWNER`,`PANEL_NO`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1247,13 +1247,13 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create EXTENDED_PANEL_NAMES Table // - sql=QString("create table if not exists EXTENDED_PANEL_NAMES (")+ - "ID int auto_increment not null primary key,"+ - "TYPE int not null,"+ - "OWNER char(64) not null,"+ - "PANEL_NO int not null,"+ - "NAME char(64),"+ - "index LOAD_IDX (TYPE,OWNER,PANEL_NO))"+ + sql=QString("create table if not exists `EXTENDED_PANEL_NAMES` (")+ + "`ID` int auto_increment not null primary key,"+ + "`TYPE` int not null,"+ + "`OWNER` char(64) not null,"+ + "`PANEL_NO` int not null,"+ + "`NAME` char(64),"+ + "index `LOAD_IDX` (`TYPE`,`OWNER`,`PANEL_NO`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1263,40 +1263,40 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create FEEDS Table // - sql=QString("create table if not exists FEEDS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "KEY_NAME char(8) unique not null,"+ - "CHANNEL_TITLE char(255),"+ - "CHANNEL_DESCRIPTION text,"+ - "CHANNEL_CATEGORY char(64),"+ - "CHANNEL_LINK char(255),"+ - "CHANNEL_COPYRIGHT char(64),"+ - "CHANNEL_WEBMASTER char(64),"+ - "CHANNEL_LANGUAGE char(5) default \"en-us\","+ - "BASE_URL char(255),"+ - "BASE_PREAMBLE char(255),"+ - "PURGE_URL char(255),"+ - "PURGE_USERNAME char(64),"+ - "PURGE_PASSWORD char(64),"+ - "HEADER_XML text,"+ - "CHANNEL_XML text,"+ - "ITEM_XML text,"+ - "CAST_ORDER enum('N','Y') default 'N',"+ - "MAX_SHELF_LIFE int,"+ - "LAST_BUILD_DATETIME datetime,"+ - "ORIGIN_DATETIME datetime,"+ - "ENABLE_AUTOPOST enum('N','Y') default 'N',"+ - "KEEP_METADATA enum('N','Y') default 'Y',"+ - "UPLOAD_FORMAT int default 2,"+ - "UPLOAD_CHANNELS int default 2,"+ - "UPLOAD_SAMPRATE int default 44100,"+ - "UPLOAD_BITRATE int default 32000,"+ - "UPLOAD_QUALITY int default 0,"+ - "UPLOAD_EXTENSION char(16) default \"mp3\","+ - "NORMALIZE_LEVEL int default -100,"+ - "REDIRECT_PATH char(255),"+ - "MEDIA_LINK_MODE int default 0,"+ - "index KEY_NAME_IDX(KEY_NAME))"+ + sql=QString("create table if not exists `FEEDS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`KEY_NAME` char(8) unique not null,"+ + "`CHANNEL_TITLE` char(255),"+ + "`CHANNEL_DESCRIPTION` text,"+ + "`CHANNEL_CATEGORY` char(64),"+ + "`CHANNEL_LINK` char(255),"+ + "`CHANNEL_COPYRIGHT` char(64),"+ + "`CHANNEL_WEBMASTER` char(64),"+ + "`CHANNEL_LANGUAGE` char(5) default 'en-us',"+ + "`BASE_URL` char(255),"+ + "`BASE_PREAMBLE` char(255),"+ + "`PURGE_URL` char(255),"+ + "`PURGE_USERNAME` char(64),"+ + "`PURGE_PASSWORD` char(64),"+ + "`HEADER_XML` text,"+ + "`CHANNEL_XML` text,"+ + "`ITEM_XML` text,"+ + "`CAST_ORDER` enum('N','Y') default 'N',"+ + "`MAX_SHELF_LIFE` int,"+ + "`LAST_BUILD_DATETIME` datetime,"+ + "`ORIGIN_DATETIME` datetime,"+ + "`ENABLE_AUTOPOST` enum('N','Y') default 'N',"+ + "`KEEP_METADATA` enum('N','Y') default 'Y',"+ + "`UPLOAD_FORMAT` int default 2,"+ + "`UPLOAD_CHANNELS` int default 2,"+ + "`UPLOAD_SAMPRATE` int default 44100,"+ + "`UPLOAD_BITRATE` int default 32000,"+ + "`UPLOAD_QUALITY` int default 0,"+ + "`UPLOAD_EXTENSION` char(16) default 'mp3',"+ + "`NORMALIZE_LEVEL` int default -100,"+ + "`REDIRECT_PATH` char(255),"+ + "`MEDIA_LINK_MODE` int default 0,"+ + "index `KEY_NAME_IDX` (`KEY_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1306,25 +1306,25 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create PODCASTS Table // - sql=QString("create table if not exists PODCASTS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "FEED_ID int unsigned not null,"+ - "STATUS int unsigned default 1,"+ - "ITEM_TITLE char(255),"+ - "ITEM_DESCRIPTION text,"+ - "ITEM_CATEGORY char(64),"+ - "ITEM_LINK char(255),"+ - "ITEM_COMMENTS char(255),"+ - "ITEM_AUTHOR char(255),"+ - "ITEM_SOURCE_TEXT char(64),"+ - "ITEM_SOURCE_URL char(255),"+ - "AUDIO_FILENAME char(255),"+ - "AUDIO_LENGTH int unsigned,"+ - "AUDIO_TIME int unsigned,"+ - "SHELF_LIFE int,"+ - "ORIGIN_DATETIME datetime,"+ - "EFFECTIVE_DATETIME datetime,"+ - "index FEED_ID_IDX(FEED_ID,ORIGIN_DATETIME))"+ + sql=QString("create table if not exists `PODCASTS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`FEED_ID` int unsigned not null,"+ + "`STATUS` int unsigned default 1,"+ + "`ITEM_TITLE` char(255),"+ + "`ITEM_DESCRIPTION` text,"+ + "`ITEM_CATEGORY` char(64),"+ + "`ITEM_LINK` char(255),"+ + "`ITEM_COMMENTS` char(255),"+ + "`ITEM_AUTHOR` char(255),"+ + "`ITEM_SOURCE_TEXT` char(64),"+ + "`ITEM_SOURCE_URL` char(255),"+ + "`AUDIO_FILENAME` char(255),"+ + "`AUDIO_LENGTH` int unsigned,"+ + "`AUDIO_TIME` int unsigned,"+ + "`SHELF_LIFE` int,"+ + "`ORIGIN_DATETIME` datetime,"+ + "`EFFECTIVE_DATETIME` datetime,"+ + "index `FEED_ID_IDX` (`FEED_ID`,`ORIGIN_DATETIME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1334,12 +1334,12 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create AUX_METADATA Table // - sql=QString("create table if not exists AUX_METADATA (")+ - "ID int unsigned auto_increment not null primary key,"+ - "FEED_ID int unsigned,"+ - "VAR_NAME char(16),"+ - "CAPTION char(64),"+ - "index FEED_ID_IDX(FEED_ID))"+ + sql=QString("create table if not exists `AUX_METADATA` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`FEED_ID` int unsigned,"+ + "`VAR_NAME` char(16),"+ + "`CAPTION` char(64),"+ + "index `FEED_ID_IDX` (`FEED_ID`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1349,12 +1349,12 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create FEED_PERMS table // - sql=QString("create table if not exists FEED_PERMS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "USER_NAME char(255),"+ - "KEY_NAME char(8),"+ - "index USER_IDX (USER_NAME),"+ - "index KEYNAME_IDX (KEY_NAME))"+ + sql=QString("create table if not exists `FEED_PERMS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`USER_NAME` char(255),"+ + "`KEY_NAME` char(8),"+ + "index `USER_IDX` (`USER_NAME`),"+ + "index `KEYNAME_IDX` (`KEY_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1364,11 +1364,11 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create WEB_CONNECTIONS Table // - sql=QString("create table if not exists WEB_CONNECTIONS (")+ - "SESSION_ID int unsigned not null primary key,"+ - "LOGIN_NAME char(255),"+ - "IP_ADDRESS char(16),"+ - "TIME_STAMP datetime)"+ + sql=QString("create table if not exists `WEB_CONNECTIONS` (")+ + "`SESSION_ID` int unsigned not null primary key,"+ + "`LOGIN_NAME` char(255),"+ + "`IP_ADDRESS` char(16),"+ + "`TIME_STAMP` datetime)"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1378,16 +1378,16 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create SWITCHER_NODES Table // - sql=QString("create table if not exists SWITCHER_NODES (")+ - "ID int not null auto_increment primary key,"+ - "STATION_NAME char(64),"+ - "MATRIX int,"+ - "BASE_OUTPUT int default 0,"+ - "HOSTNAME char(64),"+ - "PASSWORD char(64),"+ - "TCP_PORT int,"+ - "DESCRIPTION char(255),"+ - "index STATION_IDX (STATION_NAME,MATRIX))"+ + sql=QString("create table if not exists `SWITCHER_NODES` (")+ + "`ID int not null auto_increment primary key,"+ + "`STATION_NAME` char(64),"+ + "`MATRIX` int,"+ + "`BASE_OUTPUT` int default 0,"+ + "`HOSTNAME` char(64),"+ + "`PASSWORD` char(64),"+ + "`TCP_PORT` int,"+ + "`DESCRIPTION` char(255),"+ + "index `STATION_IDX` (`STATION_NAME`,`MATRIX`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1397,13 +1397,13 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create ENCODERS Table // - sql=QString("create table if not exists ENCODERS (")+ - "ID int not null auto_increment primary key,"+ - "NAME char(32) not null,"+ - "STATION_NAME char(64),"+ - "COMMAND_LINE char(255),"+ - "DEFAULT_EXTENSION char(16),"+ - "index NAME_IDX(NAME,STATION_NAME))"+ + sql=QString("create table if not exists `ENCODERS` (")+ + "`ID` int not null auto_increment primary key,"+ + "`NAME` char(32) not null,"+ + "`STATION_NAME` char(64),"+ + "`COMMAND_LINE` char(255),"+ + "`DEFAULT_EXTENSION` char(16),"+ + "index `NAME_IDX`(`NAME`,`STATION_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1414,12 +1414,12 @@ bool MainObject::CreateNewDb(QString *err_msg) const return false; } // Ensure that dynamic format IDs start after 100 - sql=QString("insert into ENCODERS set ID=100,NAME=\"dummy\""); + sql=QString("insert into `ENCODERS` set `ID`=100,`NAME`='dummy'"); RDSqlQuery::run(sql,&ok); if(!ok) { return false; } - sql=QString("delete from ENCODERS where ID=100"); + sql=QString("delete from `ENCODERS` where `ID`=100"); RDSqlQuery::run(sql,&ok); if(!ok) { return false; @@ -1428,11 +1428,11 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create ENCODER_BITRATES Table // - sql=QString("create table if not exists ENCODER_BITRATES (")+ - "ID int not null auto_increment primary key,"+ - "ENCODER_ID int not null,"+ - "BITRATES int not null,"+ - "index ENCODER_ID_IDX(ENCODER_ID))"+ + sql=QString("create table if not exists `ENCODER_BITRATES` (")+ + "`ID` int not null auto_increment primary key,"+ + "`ENCODER_ID` int not null,"+ + "`BITRATES` int not null,"+ + "index `ENCODER_ID_IDX` (`ENCODER_ID`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1442,11 +1442,11 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create ENCODER_CHANNELS Table // - sql=QString("create table if not exists ENCODER_CHANNELS (")+ - "ID int not null auto_increment primary key,"+ - "ENCODER_ID int not null,"+ - "CHANNELS int not null,"+ - "index ENCODER_ID_IDX(ENCODER_ID))"+ + sql=QString("create table if not exists `ENCODER_CHANNELS` (")+ + "`ID` int not null auto_increment primary key,"+ + "`ENCODER_ID` int not null,"+ + "`CHANNELS` int not null,"+ + "index `ENCODER_ID_IDX` (`ENCODER_ID`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1456,11 +1456,11 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create ENCODER_SAMPLERATES Table // - sql=QString("create table if not exists ENCODER_SAMPLERATES (")+ - "ID int not null auto_increment primary key,"+ - "ENCODER_ID int not null,"+ - "SAMPLERATES int not null,"+ - "index ENCODER_ID_IDX(ENCODER_ID))"+ + sql=QString("create table if not exists `ENCODER_SAMPLERATES` (")+ + "`ID` int not null auto_increment primary key,"+ + "`ENCODER_ID` int not null,"+ + "`SAMPLERATES` int not null,"+ + "index `ENCODER_ID_IDX` (`ENCODER_ID`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1470,14 +1470,14 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create GPOS Table // - sql=QString("create table if not exists GPOS (")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "MATRIX int not null,"+ - "NUMBER int not null,"+ - "MACRO_CART int default 0,"+ - "OFF_MACRO_CART int default 0,"+ - "index MATRIX_IDX (STATION_NAME,MATRIX,NUMBER))"+ + sql=QString("create table if not exists `GPOS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`MATRIX` int not null,"+ + "`NUMBER` int not null,"+ + "`MACRO_CART` int default 0,"+ + "`OFF_MACRO_CART` int default 0,"+ + "index `MATRIX_IDX` (`STATION_NAME`,`MATRIX,NUMBER`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1487,12 +1487,12 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // DROPBOX_PATHS Table // - sql=QString("create table if not exists DROPBOX_PATHS (")+ - "ID int auto_increment not null primary key,"+ - "DROPBOX_ID int not null,"+ - "FILE_PATH char(255) not null,"+ - "FILE_DATETIME datetime,"+ - "index FILE_PATH_IDX (DROPBOX_ID,FILE_PATH))"+ + sql=QString("create table if not exists `DROPBOX_PATHS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`DROPBOX_ID` int not null,"+ + "`FILE_PATH` char(255) not null,"+ + "`FILE_DATETIME` datetime,"+ + "index `FILE_PATH_IDX` (`DROPBOX_ID`,`FILE_PATH`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1502,13 +1502,13 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create NOWNEXT_PLUGINS Table // - sql=QString("create table if not exists NOWNEXT_PLUGINS (")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "LOG_MACHINE int unsigned not null default 0,"+ - "PLUGIN_PATH char(255),"+ - "PLUGIN_ARG char(255),"+ - "index STATION_IDX (STATION_NAME,LOG_MACHINE))"+ + sql=QString("create table if not exists `NOWNEXT_PLUGINS` (")+ + "`ID int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`LOG_MACHINE` int unsigned not null default 0,"+ + "`PLUGIN_PATH` char(255),"+ + "`PLUGIN_ARG` char(255),"+ + "index `STATION_IDX` (`STATION_NAME`,`LOG_MACHINE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1518,18 +1518,18 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create SYSTEM Table // - sql=QString("create table if not exists SYSTEM (")+ - "ID int auto_increment not null primary key,"+ - QString().sprintf("SAMPLE_RATE int unsigned default %d,", + sql=QString("create table if not exists `SYSTEM` (")+ + "`ID` int auto_increment not null primary key,"+ + QString().sprintf("`SAMPLE_RATE` int unsigned default %d,", RD_DEFAULT_SAMPLE_RATE)+ - "DUP_CART_TITLES enum('N','Y') not null default 'Y',"+ - "FIX_DUP_CART_TITLES enum('N','Y') not null default 'Y',"+ - QString().sprintf("MAX_POST_LENGTH int unsigned default %u,", + "`DUP_CART_TITLES` enum('N','Y') not null default 'Y',"+ + "`FIX_DUP_CART_TITLES` enum('N','Y') not null default 'Y',"+ + QString().sprintf("`MAX_POST_LENGTH` int unsigned default %u,", RD_DEFAULT_MAX_POST_LENGTH)+ - "ISCI_XREFERENCE_PATH char(255),"+ - "TEMP_CART_GROUP char(10),"+ - "SHOW_USER_LIST enum('N','Y') not null default 'Y',"+ - "NOTIFICATION_ADDRESS char(15) default \""+RD_NOTIFICATION_ADDRESS+"\")"+ + "`ISCI_XREFERENCE_PATH` char(255),"+ + "`TEMP_CART_GROUP` char(10),"+ + "`SHOW_USER_LIST` enum('N','Y') not null default 'Y',"+ + "`NOTIFICATION_ADDRESS` char(15) default '"+RD_NOTIFICATION_ADDRESS+"')"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1539,32 +1539,32 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create IMPORT_TEMPLATES table // - sql=QString("create table if not exists IMPORT_TEMPLATES (")+ - "NAME char(64) not null primary key,"+ - "CART_OFFSET int,"+ - "CART_LENGTH int,"+ - "TITLE_OFFSET int,"+ - "TITLE_LENGTH int,"+ - "HOURS_OFFSET int,"+ - "HOURS_LENGTH int,"+ - "MINUTES_OFFSET int,"+ - "MINUTES_LENGTH int,"+ - "SECONDS_OFFSET int,"+ - "SECONDS_LENGTH int,"+ - "LEN_HOURS_OFFSET int,"+ - "LEN_HOURS_LENGTH int,"+ - "LEN_MINUTES_OFFSET int,"+ - "LEN_MINUTES_LENGTH int,"+ - "LEN_SECONDS_OFFSET int,"+ - "LEN_SECONDS_LENGTH int,"+ - "LENGTH_OFFSET int,"+ - "LENGTH_LENGTH int,"+ - "DATA_OFFSET int,"+ - "DATA_LENGTH int,"+ - "EVENT_ID_OFFSET int,"+ - "EVENT_ID_LENGTH int,"+ - "ANNC_TYPE_OFFSET int,"+ - "ANNC_TYPE_LENGTH int)"+ + sql=QString("create table if not exists `IMPORT_TEMPLATES` (")+ + "`NAME` char(64) not null primary key,"+ + "`CART_OFFSET` int,"+ + "`CART_LENGTH` int,"+ + "`TITLE_OFFSET` int,"+ + "`TITLE_LENGTH` int,"+ + "`HOURS_OFFSET` int,"+ + "`HOURS_LENGTH` int,"+ + "`MINUTES_OFFSET` int,"+ + "`MINUTES_LENGTH` int,"+ + "`SECONDS_OFFSET` int,"+ + "`SECONDS_LENGTH` int,"+ + "`LEN_HOURS_OFFSET` int,"+ + "`LEN_HOURS_LENGTH` int,"+ + "`LEN_MINUTES_OFFSET` int,"+ + "`LEN_MINUTES_LENGTH` int,"+ + "`LEN_SECONDS_OFFSET` int,"+ + "`LEN_SECONDS_LENGTH` int,"+ + "`LENGTH_OFFSET` int,"+ + "`LENGTH_LENGTH` int,"+ + "`DATA_OFFSET` int,"+ + "`DATA_LENGTH` int,"+ + "`EVENT_ID_OFFSET` int,"+ + "`EVENT_ID_LENGTH` int,"+ + "`ANNC_TYPE_OFFSET` int,"+ + "`ANNC_TYPE_LENGTH` int)"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1577,23 +1577,23 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create REPLICATORS Table // - sql=QString("create table if not exists REPLICATORS (")+ - "NAME char(32) not null primary key,"+ - "DESCRIPTION char(64),"+ - "TYPE_ID int unsigned not null,"+ - "STATION_NAME char(64),"+ - "FORMAT int unsigned default 0,"+ - "CHANNELS int unsigned default 2,"+ - QString().sprintf("SAMPRATE int unsigned default %u,", + sql=QString("create table if not exists `REPLICATORS` (")+ + "`NAME` char(32) not null primary key,"+ + "`DESCRIPTION` char(64),"+ + "`TYPE_ID` int unsigned not null,"+ + "`STATION_NAME` char(64),"+ + "`FORMAT` int unsigned default 0,"+ + "`CHANNELS` int unsigned default 2,"+ + QString().sprintf("`SAMPRATE` int unsigned default %u,", RD_DEFAULT_SAMPLE_RATE)+ - "BITRATE int unsigned default 0,"+ - "QUALITY int unsigned default 0,"+ - "URL char(255),"+ - "URL_USERNAME char(64),"+ - "URL_PASSWORD char(64),"+ - "ENABLE_METADATA enum('N','Y') default 'N',"+ - "NORMALIZATION_LEVEL int default 0,"+ - "index TYPE_ID_IDX (TYPE_ID))"+ + "`BITRATE` int unsigned default 0,"+ + "`QUALITY` int unsigned default 0,"+ + "`URL` char(255),"+ + "`URL_USERNAME` char(64),"+ + "`URL_PASSWORD` char(64),"+ + "`ENABLE_METADATA` enum('N','Y') default 'N',"+ + "`NORMALIZATION_LEVEL` int default 0,"+ + "index `TYPE_ID_IDX` (`TYPE_ID`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1603,12 +1603,12 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create REPLICATOR_MAP Table // - sql=QString("create table if not exists REPLICATOR_MAP (")+ - "ID int unsigned not null auto_increment primary key,"+ - "REPLICATOR_NAME char(32) not null,"+ - "GROUP_NAME char(10) not null,"+ - "index REPLICATOR_NAME_IDX(REPLICATOR_NAME),"+ - "index GROUP_NAME_IDX(GROUP_NAME))"+ + sql=QString("create table if not exists `REPLICATOR_MAP` (")+ + "`ID` int unsigned not null auto_increment primary key,"+ + "`REPLICATOR_NAME` char(32) not null,"+ + "`GROUP_NAME` char(10) not null,"+ + "index `REPLICATOR_NAME_IDX` (`REPLICATOR_NAME`),"+ + "index `GROUP_NAME_IDX` (`GROUP_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1618,14 +1618,14 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create REPL_CART_STATE Table // - sql=QString("create table if not exists REPL_CART_STATE (")+ - "ID int unsigned not null auto_increment primary key,"+ - "REPLICATOR_NAME char(32) not null,"+ - "CART_NUMBER int unsigned not null,"+ - "POSTED_FILENAME char(255),"+ - "ITEM_DATETIME datetime not null,"+ - "REPOST enum('N','Y') default 'N',"+ - "unique REPLICATOR_NAME_IDX(REPLICATOR_NAME,CART_NUMBER,POSTED_FILENAME))"+ + sql=QString("create table if not exists `REPL_CART_STATE` (")+ + "`ID` int unsigned not null auto_increment primary key,"+ + "`REPLICATOR_NAME` char(32) not null,"+ + "`CART_NUMBER` int unsigned not null,"+ + "`POSTED_FILENAME` char(255),"+ + "`ITEM_DATETIME` datetime not null,"+ + "`REPOST` enum('N','Y') default 'N',"+ + "unique `REPLICATOR_NAME_IDX` (`REPLICATOR_NAME`,`CART_NUMBER`,`POSTED_FILENAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1635,12 +1635,12 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create REPL_CUT_STATE Table // - sql=QString("create table if not exists REPL_CUT_STATE (")+ - "ID int unsigned not null auto_increment primary key,"+ - "REPLICATOR_NAME char(32) not null,"+ - "CUT_NAME char(12) not null,"+ - "ITEM_DATETIME datetime not null,"+ - "unique REPLICATOR_NAME_IDX(REPLICATOR_NAME,CUT_NAME))"+ + sql=QString("create table if not exists `REPL_CUT_STATE` (")+ + "`ID` int unsigned not null auto_increment primary key,"+ + "`REPLICATOR_NAME` char(32) not null,"+ + "`CUT_NAME` char(12) not null,"+ + "`ITEM_DATETIME` datetime not null,"+ + "unique `REPLICATOR_NAME_IDX` (`REPLICATOR_NAME`,`CUT_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1650,20 +1650,20 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create ISCI_XREFERENCE Table // - sql=QString("create table if not exists ISCI_XREFERENCE (")+ - "ID int unsigned not null auto_increment primary key,"+ - "CART_NUMBER int unsigned not null,"+ - "ISCI char(32) not null,"+ - "FILENAME char(64) not null,"+ - "LATEST_DATE date not null,"+ - "TYPE char(1) not null,"+ - "ADVERTISER_NAME char(30),"+ - "PRODUCT_NAME char(35),"+ - "CREATIVE_TITLE char(30),"+ - "REGION_NAME char(80),"+ - "index CART_NUMBER_IDX(CART_NUMBER),"+ - "index TYPE_IDX(TYPE,LATEST_DATE),"+ - "index LATEST_DATE_IDX(LATEST_DATE))"+ + sql=QString("create table if not exists `ISCI_XREFERENCE` (")+ + "`ID` int unsigned not null auto_increment primary key,"+ + "`CART_NUMBER` int unsigned not null,"+ + "`ISCI` char(32) not null,"+ + "`FILENAME` char(64) not null,"+ + "`LATEST_DATE` date not null,"+ + "`TYPE` char(1) not null,"+ + "`ADVERTISER_NAME` char(30),"+ + "`PRODUCT_NAME` char(35),"+ + "`CREATIVE_TITLE` char(30),"+ + "`REGION_NAME` char(80),"+ + "index `CART_NUMBER_IDX` (`CART_NUMBER`),"+ + "index `TYPE_IDX` (`TYPE`,`LATEST_DATE`),"+ + "index `LATEST_DATE_IDX` (`LATEST_DATE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1673,13 +1673,13 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create RDHOTKEYS table // - sql=QString("create table if not exists RDHOTKEYS (")+ - "ID int unsigned not null auto_increment primary key,"+ - "STATION_NAME char(64),"+ - "MODULE_NAME char(64),"+ - "KEY_ID int,"+ - "KEY_VALUE char(64),"+ - "KEY_LABEL char(64))"+ + sql=QString("create table if not exists `RDHOTKEYS` (")+ + "`ID` int unsigned not null auto_increment primary key,"+ + "`STATION_NAME` char(64),"+ + "`MODULE_NAME` char(64),"+ + "`KEY_ID` int,"+ + "`KEY_VALUE` char(64),"+ + "`KEY_LABEL` char(64))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1689,12 +1689,12 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create JACK_CLIENTS Table // - sql=QString("create table if not exists JACK_CLIENTS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "DESCRIPTION char(64),"+ - "COMMAND_LINE text not null,"+ - "index IDX_STATION_NAME (STATION_NAME))"+ + sql=QString("create table if not exists `JACK_CLIENTS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`DESCRIPTION` char(64),"+ + "`COMMAND_LINE` text not null,"+ + "index `IDX_STATION_NAME` (`STATION_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1704,23 +1704,23 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create CARTSLOTS Table // - sql=QString("create table if not exists CARTSLOTS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "SLOT_NUMBER int unsigned not null,"+ - "MODE int not null default 0,"+ - "DEFAULT_MODE int not null default -1,"+ - "STOP_ACTION int not null default 0,"+ - "DEFAULT_STOP_ACTION int not null default -1,"+ - "CART_NUMBER int default 0,"+ - "DEFAULT_CART_NUMBER int not null default 0,"+ - "HOOK_MODE int default 0,"+ - "DEFAULT_HOOK_MODE int not null default -1,"+ - "SERVICE_NAME char(10),"+ - "CARD int not null default 0,"+ - "INPUT_PORT int not null default 0,"+ - "OUTPUT_PORT int not null default 0,"+ - "index STATION_NAME_IDX(STATION_NAME,SLOT_NUMBER))"+ + sql=QString("create table if not exists `CARTSLOTS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`SLOT_NUMBER` int unsigned not null,"+ + "`MODE` int not null default 0,"+ + "`DEFAULT_MODE` int not null default -1,"+ + "`STOP_ACTION` int not null default 0,"+ + "`DEFAULT_STOP_ACTION` int not null default -1,"+ + "`CART_NUMBER` int default 0,"+ + "`DEFAULT_CART_NUMBER` int not null default 0,"+ + "`HOOK_MODE` int default 0,"+ + "`DEFAULT_HOOK_MODE` int not null default -1,"+ + "`SERVICE_NAME` char(10),"+ + "`CARD` int not null default 0,"+ + "`INPUT_PORT` int not null default 0,"+ + "`OUTPUT_PORT` int not null default 0,"+ + "index `STATION_NAME_IDX` (`STATION_NAME`,`SLOT_NUMBER`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1730,14 +1730,14 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create LIVEWIRE_GPIO_SLOTS table // - sql=QString("create table if not exists LIVEWIRE_GPIO_SLOTS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "MATRIX int not null,"+ - "SLOT int not null,"+ - "IP_ADDRESS char(15),"+ - "SOURCE_NUMBER int,"+ - "index STATION_NAME_IDX(STATION_NAME,MATRIX))"+ + sql=QString("create table if not exists `LIVEWIRE_GPIO_SLOTS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`MATRIX` int not null,"+ + "`SLOT` int not null,"+ + "`IP_ADDRESS` char(15),"+ + "`SOURCE_NUMBER` int,"+ + "index `STATION_NAME_IDX` (`STATION_NAME`,`MATRIX`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1747,24 +1747,24 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create RDAIRPLAY_CHANNELS table // - sql=QString("create table if not exists RDAIRPLAY_CHANNELS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "INSTANCE int unsigned not null,"+ - "CARD int not null default 0,"+ - "PORT int not null default 0,"+ - "START_RML char(255),"+ - "STOP_RML char(255),"+ - "GPIO_TYPE int unsigned default 0,"+ - "START_GPI_MATRIX int not null default -1,"+ - "START_GPI_LINE int not null default -1,"+ - "START_GPO_MATRIX int not null default -1,"+ - "START_GPO_LINE int not null default -1,"+ - "STOP_GPI_MATRIX int not null default -1,"+ - "STOP_GPI_LINE int not null default -1,"+ - "STOP_GPO_MATRIX int not null default -1,"+ - "STOP_GPO_LINE int not null default -1,"+ - "index STATION_NAME_IDX(STATION_NAME,INSTANCE))"+ + sql=QString("create table if not exists `RDAIRPLAY_CHANNELS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`INSTANCE` int unsigned not null,"+ + "`CARD` int not null default 0,"+ + "`PORT` int not null default 0,"+ + "`START_RML` char(255),"+ + "`STOP_RML` char(255),"+ + "`GPIO_TYPE` int unsigned default 0,"+ + "`START_GPI_MATRIX` int not null default -1,"+ + "`START_GPI_LINE` int not null default -1,"+ + "`START_GPO_MATRIX` int not null default -1,"+ + "`START_GPO_LINE` int not null default -1,"+ + "`STOP_GPI_MATRIX` int not null default -1,"+ + "`STOP_GPI_LINE` int not null default -1,"+ + "`STOP_GPO_MATRIX` int not null default -1,"+ + "`STOP_GPO_LINE` int not null default -1,"+ + "index `STATION_NAME_IDX` (`STATION_NAME`,`INSTANCE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1774,24 +1774,24 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create RDPANEL_CHANNELS table // - sql=QString("create table if not exists RDPANEL_CHANNELS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "INSTANCE int unsigned not null,"+ - "CARD int not null default 0,"+ - "PORT int not null default 0,"+ - "START_RML char(255),"+ - "STOP_RML char(255),"+ - "GPIO_TYPE int unsigned default 0,"+ - "START_GPI_MATRIX int not null default -1,"+ - "START_GPI_LINE int not null default -1,"+ - "START_GPO_MATRIX int not null default -1,"+ - "START_GPO_LINE int not null default -1,"+ - "STOP_GPI_MATRIX int not null default -1,"+ - "STOP_GPI_LINE int not null default -1,"+ - "STOP_GPO_MATRIX int not null default -1,"+ - "STOP_GPO_LINE int not null default -1,"+ - "index STATION_NAME_IDX(STATION_NAME,INSTANCE))"+ + sql=QString("create table if not exists `RDPANEL_CHANNELS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`INSTANCE` int unsigned not null,"+ + "`CARD` int not null default 0,"+ + "`PORT` int not null default 0,"+ + "`START_RML` char(255),"+ + "`STOP_RML` char(255),"+ + "`GPIO_TYPE` int unsigned default 0,"+ + "`START_GPI_MATRIX` int not null default -1,"+ + "`START_GPI_LINE` int not null default -1,"+ + "`START_GPO_MATRIX` int not null default -1,"+ + "`START_GPO_LINE` int not null default -1,"+ + "`STOP_GPI_MATRIX` int not null default -1,"+ + "`STOP_GPI_LINE` int not null default -1,"+ + "`STOP_GPO_MATRIX` int not null default -1,"+ + "`STOP_GPO_LINE` int not null default -1,"+ + "index `STATION_NAME_IDX` (`STATION_NAME`,`INSTANCE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1801,13 +1801,13 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create LOG_MODES table // - sql=QString("create table if not exists LOG_MODES (")+ - "ID int unsigned auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "MACHINE int unsigned not null,"+ - "START_MODE int not null default 0,"+ - "OP_MODE int not null default 2,"+ - "index STATION_NAME_IDX(STATION_NAME,MACHINE))"+ + sql=QString("create table if not exists `LOG_MODES` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`MACHINE` int unsigned not null,"+ + "`START_MODE` int not null default 0,"+ + "`OP_MODE` int not null default 2,"+ + "index `STATION_NAME_IDX` (`STATION_NAME`,`MACHINE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1817,12 +1817,12 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create DROPBOX_SCHED_CODES table // - sql=QString("create table if not exists DROPBOX_SCHED_CODES(")+ - "ID int auto_increment not null primary key,"+ - "DROPBOX_ID int not null,"+ - "SCHED_CODE char(11) not null," - "index DROPBOX_ID_IDX(DROPBOX_ID),"+ - "index SCHED_CODE_IDX(SCHED_CODE))"+ + sql=QString("create table if not exists `DROPBOX_SCHED_CODES` (")+ + "`ID` int auto_increment not null primary key,"+ + "`DROPBOX_ID` int not null,"+ + "`SCHED_CODE` char(11) not null," + "index `DROPBOX_ID_IDX` (`DROPBOX_ID`),"+ + "index `SCHED_CODE_IDX` (`SCHED_CODE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1832,15 +1832,15 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create GPIO_EVENTS table // - sql=QString("create table if not exists GPIO_EVENTS(")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "MATRIX int not null,"+ - "NUMBER int not null,"+ - "TYPE int not null,"+ - "EDGE int not null,"+ - "EVENT_DATETIME datetime not null,"+ - "index STATION_NAME_IDX(STATION_NAME,MATRIX,TYPE,EVENT_DATETIME,EDGE))"+ + sql=QString("create table if not exists `GPIO_EVENTS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`MATRIX` int not null,"+ + "`NUMBER` int not null,"+ + "`TYPE` int not null,"+ + "`EDGE` int not null,"+ + "`EVENT_DATETIME` datetime not null,"+ + "index `STATION_NAME_IDX` (`STATION_NAME`,`MATRIX`,`TYPE`,`EVENT_DATETIME`,`EDGE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1850,12 +1850,12 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create CUT_EVENTS table // - sql=QString("create table if not exists CUT_EVENTS(")+ - "ID int auto_increment not null primary key,"+ - "CUT_NAME char(12) not null,"+ - "NUMBER int not null,"+ - "POINT int not null,"+ - "index CUT_NAME_IDX(CUT_NAME))"+ + sql=QString("create table if not exists `CUT_EVENTS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`CUT_NAME` char(12) not null,"+ + "`NUMBER` int not null,"+ + "`POINT` int not null,"+ + "index `CUT_NAME_IDX` (`CUT_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1865,13 +1865,13 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create DECK_EVENTS table // - sql=QString("create table if not exists DECK_EVENTS(")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "CHANNEL int unsigned not null,"+ - "NUMBER int not null,"+ - "CART_NUMBER int unsigned not null default 0,"+ - "index STATION_NAME_IDX(STATION_NAME,CHANNEL))"+ + sql=QString("create table if not exists `DECK_EVENTS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`CHANNEL` int unsigned not null,"+ + "`NUMBER` int not null,"+ + "`CART_NUMBER` int unsigned not null default 0,"+ + "index `STATION_NAME_IDX` (`STATION_NAME`,`CHANNEL`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1881,13 +1881,13 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create SERVICE_CLOCKS table // - sql=QString("create table if not exists SERVICE_CLOCKS(")+ - "ID int auto_increment not null primary key,"+ - "SERVICE_NAME char(10) not null,"+ - "HOUR int not null,"+ - "CLOCK_NAME char(64) default null,"+ - "index SERVICE_NAME_IDX(SERVICE_NAME,HOUR),"+ - "index CLOCK_NAME_IDX(CLOCK_NAME))"+ + sql=QString("create table if not exists `SERVICE_CLOCKS`(")+ + "`ID` int auto_increment not null primary key,"+ + "`SERVICE_NAME` char(10) not null,"+ + "`HOUR` int not null,"+ + "`CLOCK_NAME` char(64) default null,"+ + "index `SERVICE_NAME_IDX`(`SERVICE_NAME`,`HOUR`),"+ + "index `CLOCK_NAME_IDX`(`CLOCK_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1897,12 +1897,12 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create WEBAPI_AUTH table // - sql=QString("create table if not exists WEBAPI_AUTHS(")+ - "TICKET char(41) not null primary key,"+ - "LOGIN_NAME char(255) not null,"+ - "IPV4_ADDRESS char(16) not null,"+ - "EXPIRATION_DATETIME datetime not null,"+ - "index TICKET_IDX(TICKET,IPV4_ADDRESS,EXPIRATION_DATETIME))"+ + sql=QString("create table if not exists `WEBAPI_AUTHS` (")+ + "`TICKET` char(41) not null primary key,"+ + "`LOGIN_NAME` char(255) not null,"+ + "`IPV4_ADDRESS` char(16) not null,"+ + "`EXPIRATION_DATETIME` datetime not null,"+ + "index `TICKET_IDX` (`TICKET`,`IPV4_ADDRESS`,`EXPIRATION_DATETIME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1912,11 +1912,11 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create USER_SERVICE_PERMS table // - sql=QString("create table if not exists USER_SERVICE_PERMS (")+ - "ID int auto_increment not null primary key,"+ - "USER_NAME char(255) not null,"+ - "SERVICE_NAME char(10) not null,"+ - "index USER_NAME_IDX(USER_NAME))"+ + sql=QString("create table if not exists `USER_SERVICE_PERMS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`USER_NAME` char(255) not null,"+ + "`SERVICE_NAME` char(10) not null,"+ + "index `USER_NAME_IDX` (`USER_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1926,24 +1926,24 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create LOG_MACHINES table // - sql=QString("create table if not exists LOG_MACHINES (")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "MACHINE int not null,"+ - "START_MODE int not null default 0,"+ - "AUTO_RESTART enum('N','Y') not null default 'N',"+ - "LOG_NAME char(64),"+ - "CURRENT_LOG char(64),"+ - "RUNNING enum('N','Y') not null default 'N',"+ - "LOG_ID int not null default -1,"+ - "LOG_LINE int not null default -1,"+ - "NOW_CART int unsigned not null default 0,"+ - "NEXT_CART int unsigned not null default 0,"+ - "UDP_ADDR char(255),"+ - "UDP_PORT int unsigned,"+ - "UDP_STRING char(255),"+ - "LOG_RML char(255),"+ - "index STATION_NAME_IDX(STATION_NAME,MACHINE))"+ + sql=QString("create table if not exists `LOG_MACHINES` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`MACHINE` int not null,"+ + "`START_MODE` int not null default 0,"+ + "`AUTO_RESTART` enum('N','Y') not null default 'N',"+ + "`LOG_NAME` char(64),"+ + "`CURRENT_LOG` char(64),"+ + "`RUNNING` enum('N','Y') not null default 'N',"+ + "`LOG_ID` int not null default -1,"+ + "`LOG_LINE` int not null default -1,"+ + "`NOW_CART` int unsigned not null default 0,"+ + "`NEXT_CART` int unsigned not null default 0,"+ + "`UDP_ADDR` char(255),"+ + "`UDP_PORT` int unsigned,"+ + "`UDP_STRING` char(255),"+ + "`LOG_RML` char(255),"+ + "index `STATION_NAME_IDX` (`STATION_NAME`,`MACHINE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1953,16 +1953,16 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create AUDIO_CARDS table // - sql=QString("create table if not exists AUDIO_CARDS (")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "CARD_NUMBER int not null,"+ - "DRIVER int not null default 0,"+ - "NAME char(64),"+ - "INPUTS int not null default -1,"+ - "OUTPUTS int not null default -1,"+ - "CLOCK_SOURCE int not null default 0,"+ - "unique index STATION_NAME_IDX(STATION_NAME,CARD_NUMBER))"+ + sql=QString("create table if not exists `AUDIO_CARDS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`CARD_NUMBER` int not null,"+ + "`DRIVER` int not null default 0,"+ + "`NAME` char(64),"+ + "`INPUTS` int not null default -1,"+ + "`OUTPUTS` int not null default -1,"+ + "`CLOCK_SOURCE` int not null default 0,"+ + "unique index `STATION_NAME_IDX` (`STATION_NAME`,`CARD_NUMBER`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1972,15 +1972,15 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create AUDIO_INPUTS table // - sql=QString("create table if not exists AUDIO_INPUTS (")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "CARD_NUMBER int not null,"+ - "PORT_NUMBER int not null,"+ - "LEVEL int not null default 0,"+ - "TYPE int not null default 0," - "MODE int not null default 0,"+ - "unique index STATION_NAME_IDX(STATION_NAME,CARD_NUMBER,PORT_NUMBER))"+ + sql=QString("create table if not exists `AUDIO_INPUTS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`CARD_NUMBER` int not null,"+ + "`PORT_NUMBER` int not null,"+ + "`LEVEL` int not null default 0,"+ + "`TYPE` int not null default 0," + "`MODE` int not null default 0,"+ + "unique index `STATION_NAME_IDX` (`STATION_NAME`,`CARD_NUMBER`,`PORT_NUMBER`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1990,13 +1990,13 @@ bool MainObject::CreateNewDb(QString *err_msg) const // // Create AUDIO_OUTPUTS table // - sql=QString("create table if not exists AUDIO_OUTPUTS (")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "CARD_NUMBER int not null,"+ - "PORT_NUMBER int not null,"+ - "LEVEL int not null default 0,"+ - "unique index STATION_NAME_IDX(STATION_NAME,CARD_NUMBER,PORT_NUMBER))"+ + sql=QString("create table if not exists `AUDIO_OUTPUTS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`CARD_NUMBER` int not null,"+ + "`PORT_NUMBER` int not null,"+ + "`LEVEL` int not null default 0,"+ + "unique index `STATION_NAME_IDX` (`STATION_NAME`,`CARD_NUMBER`,`PORT_NUMBER`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -2016,13 +2016,13 @@ bool MainObject::InititalizeNewDb(const QString &station_name,bool gen_audio, // // Create Default Admin Account // - sql=QString("insert into USERS set ")+ - "LOGIN_NAME=\""+RDEscapeString(RDA_LOGIN_NAME)+"\","+ - "PASSWORD=\""+RDEscapeString(RDA_PASSWORD)+"\","+ - "FULL_NAME=\""+RDEscapeString(RDA_FULLNAME)+"\","+ - "DESCRIPTION=\""+RDEscapeString(RDA_DESCRIPTION)+"\","+ - "ADMIN_USERS_PRIV=\"Y\","+ - "ADMIN_CONFIG_PRIV=\"Y\""; + sql=QString("insert into `USERS` set ")+ + "`LOGIN_NAME`='"+RDEscapeString(RDA_LOGIN_NAME)+"',"+ + "`PASSWORD`='"+RDEscapeString(RDA_PASSWORD)+"',"+ + "`FULL_NAME`='"+RDEscapeString(RDA_FULLNAME)+"',"+ + "`DESCRIPTION`='"+RDEscapeString(RDA_DESCRIPTION)+"',"+ + "`ADMIN_USERS_PRIV`='Y',"+ + "`ADMIN_CONFIG_PRIV`='Y'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2030,30 +2030,30 @@ bool MainObject::InititalizeNewDb(const QString &station_name,bool gen_audio, // // Create Default User Account // - sql=QString("insert into USERS set ")+ - "LOGIN_NAME=\""+RDEscapeString(RD_USER_LOGIN_NAME)+"\","+ - "PASSWORD=\""+RDEscapeString(RD_USER_PASSWORD)+"\","+ - "FULL_NAME=\""+RDEscapeString(RD_USER_FULL_NAME)+"\","+ - "DESCRIPTION=\""+RDEscapeString(RD_USER_DESCRIPTION)+"\","+ - "CREATE_CARTS_PRIV=\"Y\","+ - "DELETE_CARTS_PRIV=\"Y\","+ - "MODIFY_CARTS_PRIV=\"Y\","+ - "EDIT_AUDIO_PRIV=\"Y\","+ - "ASSIGN_CART_PRIV=\"Y\","+ - "CREATE_LOG_PRIV=\"Y\","+ - "DELETE_LOG_PRIV=\"Y\","+ - "DELETE_REC_PRIV=\"Y\","+ - "PLAYOUT_LOG_PRIV=\"Y\","+ - "ARRANGE_LOG_PRIV=\"Y\","+ - "MODIFY_TEMPLATE_PRIV=\"Y\","+ - "ADDTO_LOG_PRIV=\"Y\","+ - "REMOVEFROM_LOG_PRIV=\"Y\","+ - "CONFIG_PANELS_PRIV=\"Y\","+ - "VOICETRACK_LOG_PRIV=\"Y\","+ - "EDIT_CATCHES_PRIV=\"Y\","+ - "ADD_PODCAST_PRIV=\"Y\","+ - "EDIT_PODCAST_PRIV=\"Y\","+ - "DELETE_PODCAST_PRIV=\"Y\""; + sql=QString("insert into `USERS` set ")+ + "`LOGIN_NAME`='"+RDEscapeString(RD_USER_LOGIN_NAME)+"',"+ + "`PASSWORD`='"+RDEscapeString(RD_USER_PASSWORD)+"',"+ + "`FULL_NAME`='"+RDEscapeString(RD_USER_FULL_NAME)+"',"+ + "`DESCRIPTION`='"+RDEscapeString(RD_USER_DESCRIPTION)+"',"+ + "`CREATE_CARTS_PRIV`='Y',"+ + "`DELETE_CARTS_PRIV`='Y',"+ + "`MODIFY_CARTS_PRIV`='Y',"+ + "`EDIT_AUDIO_PRIV`='Y',"+ + "`ASSIGN_CART_PRIV`='Y',"+ + "`CREATE_LOG_PRIV`='Y',"+ + "`DELETE_LOG_PRIV`='Y',"+ + "`DELETE_REC_PRIV`='Y',"+ + "`PLAYOUT_LOG_PRIV`='Y',"+ + "`ARRANGE_LOG_PRIV`='Y',"+ + "`MODIFY_TEMPLATE_PRIV`='Y',"+ + "`ADDTO_LOG_PRIV`='Y',"+ + "`REMOVEFROM_LOG_PRIV`='Y',"+ + "`CONFIG_PANELS_PRIV`='Y',"+ + "`VOICETRACK_LOG_PRIV`='Y',"+ + "`EDIT_CATCHES_PRIV`='Y',"+ + "`ADD_PODCAST_PRIV`='Y',"+ + "`EDIT_PODCAST_PRIV`='Y',"+ + "`DELETE_PODCAST_PRIV`='Y'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2061,7 +2061,7 @@ bool MainObject::InititalizeNewDb(const QString &station_name,bool gen_audio, // // Create Default System-wide Settings Record // - sql="insert into SYSTEM set ID=1"; + sql="insert into `SYSTEM` set `ID`=1"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2073,9 +2073,9 @@ bool MainObject::InititalizeNewDb(const QString &station_name,bool gen_audio, // Add Audio Cards // for(int i=0;ih_addr[0],0xFF&hostent->h_addr[1], 0xFF&hostent->h_addr[2],0xFF&hostent->h_addr[3]); } @@ -2127,21 +2127,21 @@ bool MainObject::InititalizeNewDb(const QString &station_name,bool gen_audio, // // Create Default Service // - sql=QString("insert into SERVICES set NAME=\"")+ - RDEscapeString(RD_SERVICE_NAME)+"\","+ - "NAME_TEMPLATE=\""+RDEscapeString(RD_SERVICE_NAME)+"-%m%d\","+ - "DESCRIPTION_TEMPLATE=\""+RDEscapeString(RD_SERVICE_NAME)+" log for %d/%m/%Y\""; + sql=QString("insert into `SERVICES` set `NAME`='")+ + RDEscapeString(RD_SERVICE_NAME)+"',"+ + "`NAME_TEMPLATE`='"+RDEscapeString(RD_SERVICE_NAME)+"-%m%d',"+ + "`DESCRIPTION_TEMPLATE`='"+RDEscapeString(RD_SERVICE_NAME)+" log for %d/%m/%Y'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } // Create Group Audio Perms - sql="select NAME from GROUPS"; + sql="select `NAME` from `GROUPS`"; q=new RDSqlQuery(sql); while(q->next()) { - sql=QString("insert into AUDIO_PERMS set ")+ - "GROUP_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - "SERVICE_NAME=\""+RDEscapeString(RD_SERVICE_NAME)+"\""; + sql=QString("insert into `AUDIO_PERMS` set ")+ + "`GROUP_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + "`SERVICE_NAME`='"+RDEscapeString(RD_SERVICE_NAME)+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2149,12 +2149,12 @@ bool MainObject::InititalizeNewDb(const QString &station_name,bool gen_audio, delete q; // Create Station Perms - sql="select NAME from STATIONS"; + sql="select `NAME` from `STATIONS`"; q=new RDSqlQuery(sql); while(q->next()) { - sql=QString("insert into SERVICE_PERMS set ")+ - "STATION_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - "SERVICE_NAME=\""+RDEscapeString(RD_SERVICE_NAME)+"\""; + sql=QString("insert into `SERVICE_PERMS` set ")+ + "`STATION_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + "`SERVICE_NAME`='"+RDEscapeString(RD_SERVICE_NAME)+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2162,19 +2162,19 @@ bool MainObject::InititalizeNewDb(const QString &station_name,bool gen_audio, delete q; // Create User Perms - sql=QString("insert into USER_SERVICE_PERMS set ")+ - "USER_NAME=\""+RDEscapeString(RD_USER_LOGIN_NAME)+"\","+ - "SERVICE_NAME=\""+RDEscapeString(RD_SERVICE_NAME)+"\""; + sql=QString("insert into `USER_SERVICE_PERMS` set ")+ + "`USER_NAME`='"+RDEscapeString(RD_USER_LOGIN_NAME)+"',"+ + "`SERVICE_NAME`='"+RDEscapeString(RD_SERVICE_NAME)+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } // Populate RDLogManager Grid for(int i=0;i<168;i++) { - sql=QString("insert into SERVICE_CLOCKS set ")+ - "SERVICE_NAME=\""+RDEscapeString(RD_SERVICE_NAME)+"\","+ - QString().sprintf("HOUR=%d,",i)+ - "CLOCK_NAME=null"; + sql=QString("insert into `SERVICE_CLOCKS` set ")+ + "`SERVICE_NAME`='"+RDEscapeString(RD_SERVICE_NAME)+"',"+ + QString().sprintf("`HOUR`=%d,",i)+ + "`CLOCK_NAME`=null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2188,34 +2188,34 @@ bool MainObject::InititalizeNewDb(const QString &station_name,bool gen_audio, // RDAirPlay/RDPanel Channel Data // for(unsigned i=0;i<10;i++) { - sql=QString("insert into RDAIRPLAY_CHANNELS set ")+ - "STATION_NAME=\""+RDEscapeString(station_name)+"\","+ - QString().sprintf("INSTANCE=%u",i); + sql=QString("insert into `RDAIRPLAY_CHANNELS` set ")+ + "`STATION_NAME`='"+RDEscapeString(station_name)+"',"+ + QString().sprintf("`INSTANCE`=%u",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("insert into RDPANEL_CHANNELS set ")+ - "STATION_NAME=\""+RDEscapeString(station_name)+"\","+ - QString().sprintf("INSTANCE=%u",i); + sql=QString("insert into `RDPANEL_CHANNELS` set ")+ + "`STATION_NAME`='"+RDEscapeString(station_name)+"',"+ + QString().sprintf("`INSTANCE`=%u",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } for(int i=0;inext()) { - sql=QString().sprintf("insert into AUDIO_PERMS set\ - GROUP_NAME=\"%s\",SERVICE_NAME=\"%s\"", + sql=QString().sprintf("insert into `AUDIO_PERMS` set\ + `GROUP_NAME`='%s',`SERVICE_NAME`='%s'", RDEscapeString(q->value(0).toString()). toUtf8().constData(), RDEscapeString(RD_SERVICE_NAME).toUtf8().constData()); @@ -2327,17 +2327,17 @@ bool MainObject::InititalizeNewDb(const QString &station_name,bool gen_audio, delete q; for(int i=0;i<168;i++) { - sql=QString("insert into SERVICE_CLOCKS set ")+ - "SERVICE_NAME=\""+RDEscapeString(RD_SERVICE_NAME)+"\","+ - QString().sprintf("HOUR=%d,",i)+ - "CLOCK_NAME=null"; + sql=QString("insert into `SERVICE_CLOCKS` set ")+ + "`SERVICE_NAME`='"+RDEscapeString(RD_SERVICE_NAME)+"',"+ + QString().sprintf("`HOUR`=%d,",i)+ + "`CLOCK_NAME`=null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } - sql=QString("update SERVICES set ")+ - "DESCRIPTION=\""+RDEscapeString(RD_SERVICE_DESCRIPTION)+"\" where "+ - "NAME=\""+RDEscapeString(RD_SERVICE_NAME)+"\""; + sql=QString("update `SERVICES` set ")+ + "`DESCRIPTION`='"+RDEscapeString(RD_SERVICE_DESCRIPTION)+"' where "+ + "`NAME`='"+RDEscapeString(RD_SERVICE_NAME)+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2372,29 +2372,29 @@ bool MainObject::InititalizeNewDb(const QString &station_name,bool gen_audio, for (const struct Group *g = group; g->group != NULL; g++){ // Create the group - sql=QString("insert into GROUPS set ")+ - "NAME=\""+RDEscapeString(g->group)+"\","+ - "DESCRIPTION=\""+RDEscapeString(g->description)+"\","+ - QString().sprintf("DEFAULT_CART_TYPE=%d,",g->macro?2:1)+ - QString().sprintf("DEFAULT_LOW_CART=%d,",g->start)+ - QString().sprintf("DEFAULT_HIGH_CART=%d,",g->end)+ - "REPORT_TFC=\""+RDYesNo(g->rpt_traffic)+"\","+ - "REPORT_MUS=\""+RDYesNo(g->rpt_music)+"\","+ - "ENABLE_NOW_NEXT=\""+RDYesNo(g->now_next)+"\""; + sql=QString("insert into `GROUPS` set ")+ + "`NAME`='"+RDEscapeString(g->group)+"',"+ + "`DESCRIPTION`='"+RDEscapeString(g->description)+"',"+ + QString().sprintf("`DEFAULT_CART_TYPE`=%d,",g->macro?2:1)+ + QString().sprintf("`DEFAULT_LOW_CART`=%d,",g->start)+ + QString().sprintf("`DEFAULT_HIGH_CART`=%d,",g->end)+ + "`REPORT_TFC`='"+RDYesNo(g->rpt_traffic)+"',"+ + "`REPORT_MUS`='"+RDYesNo(g->rpt_music)+"',"+ + "`ENABLE_NOW_NEXT`='"+RDYesNo(g->now_next)+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } // Add it to the user permissions table for the default user - sql=QString("insert into USER_PERMS set ")+ - "USER_NAME=\""+RDEscapeString(RD_USER_LOGIN_NAME)+"\","+ - "GROUP_NAME=\""+RDEscapeString(g->group)+"\""; + sql=QString("insert into `USER_PERMS` set ")+ + "`USER_NAME`='"+RDEscapeString(RD_USER_LOGIN_NAME)+"',"+ + "`GROUP_NAME`='"+RDEscapeString(g->group)+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } // Add it to the audio permsmissions table - sql=QString("insert into AUDIO_PERMS set ")+ - "GROUP_NAME=\""+RDEscapeString(g->group)+"\","+ - "SERVICE_NAME=\""+RDEscapeString(RD_SERVICE_NAME)+"\""; + sql=QString("insert into `AUDIO_PERMS` set ")+ + "`GROUP_NAME`='"+RDEscapeString(g->group)+"',"+ + "`SERVICE_NAME`='"+RDEscapeString(RD_SERVICE_NAME)+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2404,60 +2404,60 @@ bool MainObject::InititalizeNewDb(const QString &station_name,bool gen_audio, // Create Sample Log // sql=QString("create table if not exists `SAMPLE_LOG`")+ - "(ID int not null primary key,"+ - "COUNT int NOT NULL,"+ - "TYPE int DEFAULT 0,"+ - "SOURCE int NOT NULL,"+ - "START_TIME int,"+ - "GRACE_TIME int default 0,"+ - "CART_NUMBER int UNSIGNED NOT NULL default 0,"+ - "TIME_TYPE int NOT NULL,"+ - "POST_POINT enum('N','Y') default 'N',"+ - "TRANS_TYPE int NOT NULL,"+ - "START_POINT int NOT NULL DEFAULT -1,"+ - "END_POINT int NOT NULL DEFAULT -1,"+ - "FADEUP_POINT int default -1,"+ - QString().sprintf("FADEUP_GAIN int default %d,",RD_FADE_DEPTH)+ - "FADEDOWN_POINT int default -1,"+ - QString().sprintf("FADEDOWN_GAIN int default %d,",RD_FADE_DEPTH)+ - "SEGUE_START_POINT int NOT NULL DEFAULT -1,"+ - "SEGUE_END_POINT int NOT NULL DEFAULT -1,"+ - QString().sprintf("SEGUE_GAIN int default %d,",RD_FADE_DEPTH)+ - "DUCK_UP_GAIN int default 0,"+ - "DUCK_DOWN_GAIN int default 0,"+ - "COMMENT char(255),"+ - "LABEL char(64),"+ - "ORIGIN_USER char(255),"+ - "ORIGIN_DATETIME datetime,"+ - "EVENT_LENGTH int default -1,"+ - "LINK_EVENT_NAME char(64),"+ - "LINK_START_TIME int,"+ - "LINK_LENGTH int default 0,"+ - "LINK_START_SLOP int default 0,"+ - "LINK_END_SLOP int default 0,"+ - "LINK_ID int default -1,"+ - "LINK_EMBEDDED enum('N','Y') default 'N',"+ - "EXT_START_TIME time,"+ - "EXT_LENGTH int,"+ - "EXT_CART_NAME char(32),"+ - "EXT_DATA char(32),"+ - "EXT_EVENT_ID char(32),"+ - "EXT_ANNC_TYPE char(8),"+ - "index COUNT_IDX (COUNT),"+ - "index CART_NUMBER_IDX (CART_NUMBER),"+ - "index LABEL_IDX (LABEL))"+ + "(`ID` int not null primary key,"+ + "`COUNT` int NOT NULL,"+ + "`TYPE` int DEFAULT 0,"+ + "`SOURCE` int NOT NULL,"+ + "`START_TIME` int,"+ + "`GRACE_TIME` int default 0,"+ + "`CART_NUMBER` int UNSIGNED NOT NULL default 0,"+ + "`TIME_TYPE` int NOT NULL,"+ + "`POST_POINT` enum('N','Y') default 'N',"+ + "`TRANS_TYPE` int NOT NULL,"+ + "`START_POINT` int NOT NULL DEFAULT -1,"+ + "`END_POINT` int NOT NULL DEFAULT -1,"+ + "`FADEUP_POINT` int default -1,"+ + QString().sprintf("`FADEUP_GAIN` int default %d,",RD_FADE_DEPTH)+ + "`FADEDOWN_POINT` int default -1,"+ + QString().sprintf("`FADEDOWN_GAIN` int default %d,",RD_FADE_DEPTH)+ + "`SEGUE_START_POINT` int NOT NULL DEFAULT -1,"+ + "`SEGUE_END_POINT` int NOT NULL DEFAULT -1,"+ + QString().sprintf("`SEGUE_GAIN` int default %d,",RD_FADE_DEPTH)+ + "`DUCK_UP_GAIN` int default 0,"+ + "`DUCK_DOWN_GAIN` int default 0,"+ + "`COMMENT` char(255),"+ + "`LABEL` char(64),"+ + "`ORIGIN_USER` char(255),"+ + "`ORIGIN_DATETIME` datetime,"+ + "`EVENT_LENGTH` int default -1,"+ + "`LINK_EVENT_NAME` char(64),"+ + "`LINK_START_TIME` int,"+ + "`LINK_LENGTH` int default 0,"+ + "`LINK_START_SLOP` int default 0,"+ + "`LINK_END_SLOP` int default 0,"+ + "`LINK_ID` int default -1,"+ + "`LINK_EMBEDDED` enum('N','Y') default 'N',"+ + "`EXT_START_TIME` time,"+ + "`EXT_LENGTH` int,"+ + "`EXT_CART_NAME` char(32),"+ + "`EXT_DATA` char(32),"+ + "`EXT_EVENT_ID` char(32),"+ + "`EXT_ANNC_TYPE` char(8),"+ + "index `COUNT_IDX` (`COUNT`),"+ + "index `CART_NUMBER_IDX` (`CART_NUMBER`),"+ + "index `LABEL_IDX` (`LABEL`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("insert into LOGS set ")+ - "NAME=\"SAMPLE\","+ - "SERVICE=\""+RDEscapeString(RD_SERVICE_NAME)+"\","+ - "DESCRIPTION=\"Sample Log\","+ - "ORIGIN_USER=\""+RDEscapeString(RD_USER_LOGIN_NAME)+"\","+ - "ORIGIN_DATETIME=now()," - "MODIFIED_DATETIME=now()"; + sql=QString("insert into `LOGS` set ")+ + "`NAME`='SAMPLE',"+ + "`SERVICE`='"+RDEscapeString(RD_SERVICE_NAME)+"',"+ + "`DESCRIPTION`='Sample Log',"+ + "`ORIGIN_USER`='"+RDEscapeString(RD_USER_LOGIN_NAME)+"',"+ + "`ORIGIN_DATETIME`=now()," + "`MODIFIED_DATETIME`=now()"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2472,7 +2472,7 @@ bool MainObject::InititalizeNewDb(const QString &station_name,bool gen_audio, // // Generate Version Number // - sql=QString("insert into VERSION set DB=286"); + sql=QString("insert into `VERSION` set DB=286"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2505,200 +2505,200 @@ bool MainObject::InsertImportFormats(QString *err_msg) const { QString sql; - sql=QString("insert into IMPORT_TEMPLATES set ")+ - "NAME=\"Rivendell Standard Import\","+ - "CART_OFFSET=10,"+ - "CART_LENGTH=6,"+ - "TITLE_OFFSET=25,"+ - "TITLE_LENGTH=34,"+ - "HOURS_OFFSET=0,"+ - "HOURS_LENGTH=2,"+ - "MINUTES_OFFSET=3,"+ - "MINUTES_LENGTH=2,"+ - "SECONDS_OFFSET=6,"+ - "SECONDS_LENGTH=2,"+ - "LEN_HOURS_OFFSET=60,"+ - "LEN_HOURS_LENGTH=2,"+ - "LEN_MINUTES_OFFSET=63,"+ - "LEN_MINUTES_LENGTH=2,"+ - "LEN_SECONDS_OFFSET=66,"+ - "LEN_SECONDS_LENGTH=2,"+ - "DATA_OFFSET=69,"+ - "DATA_LENGTH=32"; + sql=QString("insert into `IMPORT_TEMPLATES` set ")+ + "`NAME='Rivendell Standard Import',"+ + "`CART_OFFSET`=10,"+ + "`CART_LENGTH`=6,"+ + "`TITLE_OFFSET`=25,"+ + "`TITLE_LENGTH`=34,"+ + "`HOURS_OFFSET`=0,"+ + "`HOURS_LENGTH`=2,"+ + "`MINUTES_OFFSET`=3,"+ + "`MINUTES_LENGTH`=2,"+ + "`SECONDS_OFFSET`=6,"+ + "`SECONDS_LENGTH`=2,"+ + "`LEN_HOURS_OFFSET`=60,"+ + "`LEN_HOURS_LENGTH`=2,"+ + "`LEN_MINUTES_OFFSET`=63,"+ + "`LEN_MINUTES_LENGTH`=2,"+ + "`LEN_SECONDS_OFFSET`=66,"+ + "`LEN_SECONDS_LENGTH`=2,"+ + "`DATA_OFFSET`=69,"+ + "`DATA_LENGTH`=32"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("insert into IMPORT_TEMPLATES set ")+ - "NAME=\"PowerGold Music Scheduling\","+ - "CART_OFFSET=10,"+ - "CART_LENGTH=6,"+ - "TITLE_OFFSET=25,"+ - "TITLE_LENGTH=34,"+ - "HOURS_OFFSET=0,"+ - "HOURS_LENGTH=2,"+ - "MINUTES_OFFSET=3,"+ - "MINUTES_LENGTH=2,"+ - "SECONDS_OFFSET=6,"+ - "SECONDS_LENGTH=2,"+ - "LEN_HOURS_OFFSET=60,"+ - "LEN_HOURS_LENGTH=2,"+ - "LEN_MINUTES_OFFSET=63,"+ - "LEN_MINUTES_LENGTH=2,"+ - "LEN_SECONDS_OFFSET=66,"+ - "LEN_SECONDS_LENGTH=2,"+ - "DATA_OFFSET=69,"+ - "DATA_LENGTH=32"; + sql=QString("insert into `IMPORT_TEMPLATES` set ")+ + "`NAME='PowerGold Music Scheduling',"+ + "`CART_OFFSET`=10,"+ + "`CART_LENGTH`=6,"+ + "`TITLE_OFFSET`=25,"+ + "`TITLE_LENGTH`=34,"+ + "`HOURS_OFFSET`=0,"+ + "`HOURS_LENGTH`=2,"+ + "`MINUTES_OFFSET`=3,"+ + "`MINUTES_LENGTH`=2,"+ + "`SECONDS_OFFSET`=6,"+ + "`SECONDS_LENGTH`=2,"+ + "`LEN_HOURS_OFFSET`=60,"+ + "`LEN_HOURS_LENGTH`=2,"+ + "`LEN_MINUTES_OFFSET`=63,"+ + "`LEN_MINUTES_LENGTH`=2,"+ + "`LEN_SECONDS_OFFSET`=66,"+ + "`LEN_SECONDS_LENGTH`=2,"+ + "`DATA_OFFSET`=69,"+ + "`DATA_LENGTH`=32"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("insert into IMPORT_TEMPLATES set ")+ - "NAME=\"RadioTraffic.com\","+ - "CART_OFFSET=10,"+ - "CART_LENGTH=6,"+ - "TITLE_OFFSET=25,"+ - "TITLE_LENGTH=34,"+ - "HOURS_OFFSET=0,"+ - "HOURS_LENGTH=2,"+ - "MINUTES_OFFSET=3,"+ - "MINUTES_LENGTH=2,"+ - "SECONDS_OFFSET=6,"+ - "SECONDS_LENGTH=2,"+ - "LEN_HOURS_OFFSET=60,"+ - "LEN_HOURS_LENGTH=2,"+ - "LEN_MINUTES_OFFSET=63,"+ - "LEN_MINUTES_LENGTH=2,"+ - "LEN_SECONDS_OFFSET=66,"+ - "LEN_SECONDS_LENGTH=2,"+ - "DATA_OFFSET=69,"+ - "DATA_LENGTH=32"; + sql=QString("insert into `IMPORT_TEMPLATES` set ")+ + "`NAME`='RadioTraffic.com',"+ + "`CART_OFFSET`=10,"+ + "`CART_LENGTH`=6,"+ + "`TITLE_OFFSET`=25,"+ + "`TITLE_LENGTH`=34,"+ + "`HOURS_OFFSET`=0,"+ + "`HOURS_LENGTH`=2,"+ + "`MINUTES_OFFSET`=3,"+ + "`MINUTES_LENGTH`=2,"+ + "`SECONDS_OFFSET`=6,"+ + "`SECONDS_LENGTH`=2,"+ + "`LEN_HOURS_OFFSET`=60,"+ + "`LEN_HOURS_LENGTH`=2,"+ + "`LEN_MINUTES_OFFSET`=63,"+ + "`LEN_MINUTES_LENGTH`=2,"+ + "`LEN_SECONDS_OFFSET`=66,"+ + "`LEN_SECONDS_LENGTH`=2,"+ + "`DATA_OFFSET`=69,"+ + "`DATA_LENGTH`=32"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("insert into IMPORT_TEMPLATES set ")+ - "NAME=\"CounterPoint Traffic\","+ - "CART_OFFSET=10,"+ - "CART_LENGTH=6,"+ - "TITLE_OFFSET=25,"+ - "TITLE_LENGTH=34,"+ - "HOURS_OFFSET=0,"+ - "HOURS_LENGTH=2,"+ - "MINUTES_OFFSET=3,"+ - "MINUTES_LENGTH=2,"+ - "SECONDS_OFFSET=6,"+ - "SECONDS_LENGTH=2,"+ - "LEN_HOURS_OFFSET=60,"+ - "LEN_HOURS_LENGTH=2,"+ - "LEN_MINUTES_OFFSET=63,"+ - "LEN_MINUTES_LENGTH=2,"+ - "LEN_SECONDS_OFFSET=66,"+ - "LEN_SECONDS_LENGTH=2,"+ - "EVENT_ID_OFFSET=69,"+ - "EVENT_ID_LENGTH=32,"+ - "DATA_OFFSET=102,"+ - "DATA_LENGTH=32"; + sql=QString("insert into `IMPORT_TEMPLATES` set ")+ + "`NAME`='CounterPoint Traffic',"+ + "`CART_OFFSET`=10,"+ + "`CART_LENGTH`=6,"+ + "`TITLE_OFFSET`=25,"+ + "`TITLE_LENGTH`=34,"+ + "`HOURS_OFFSET`=0,"+ + "`HOURS_LENGTH`=2,"+ + "`MINUTES_OFFSET`=3,"+ + "`MINUTES_LENGTH`=2,"+ + "`SECONDS_OFFSET`=6,"+ + "`SECONDS_LENGTH`=2,"+ + "`LEN_HOURS_OFFSET`=60,"+ + "`LEN_HOURS_LENGTH`=2,"+ + "`LEN_MINUTES_OFFSET`=63,"+ + "`LEN_MINUTES_LENGTH`=2,"+ + "`LEN_SECONDS_OFFSET`=66,"+ + "`LEN_SECONDS_LENGTH`=2,"+ + "`EVENT_ID_OFFSET`=69,"+ + "`EVENT_ID_LENGTH`=32,"+ + "`DATA_OFFSET`=102,"+ + "`DATA_LENGTH`=32"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("insert into IMPORT_TEMPLATES set ")+ - "NAME=\"WideOrbit Traffic\","+ - "CART_OFFSET=10,"+ - "CART_LENGTH=6,"+ - "TITLE_OFFSET=25,"+ - "TITLE_LENGTH=34,"+ - "HOURS_OFFSET=0,"+ - "HOURS_LENGTH=2,"+ - "MINUTES_OFFSET=3,"+ - "MINUTES_LENGTH=2,"+ - "SECONDS_OFFSET=6,"+ - "SECONDS_LENGTH=2,"+ - "LEN_HOURS_OFFSET=60,"+ - "LEN_HOURS_LENGTH=2,"+ - "LEN_MINUTES_OFFSET=63,"+ - "LEN_MINUTES_LENGTH=2,"+ - "LEN_SECONDS_OFFSET=66,"+ - "LEN_SECONDS_LENGTH=2,"+ - "EVENT_ID_OFFSET=69,"+ - "EVENT_ID_LENGTH=32,"+ - "DATA_OFFSET=102,"+ - "DATA_LENGTH=32"; + sql=QString("insert into `IMPORT_TEMPLATES` set ")+ + "`NAME`='WideOrbit Traffic',"+ + "`CART_OFFSET`=10,"+ + "`CART_LENGTH`=6,"+ + "`TITLE_OFFSET`=25,"+ + "`TITLE_LENGTH`=34,"+ + "`HOURS_OFFSET`=0,"+ + "`HOURS_LENGTH`=2,"+ + "`MINUTES_OFFSET`=3,"+ + "`MINUTES_LENGTH`=2,"+ + "`SECONDS_OFFSET`=6,"+ + "`SECONDS_LENGTH`=2,"+ + "`LEN_HOURS_OFFSET`=60,"+ + "`LEN_HOURS_LENGTH`=2,"+ + "`LEN_MINUTES_OFFSET`=63,"+ + "`LEN_MINUTES_LENGTH`=2,"+ + "`LEN_SECONDS_OFFSET`=66,"+ + "`LEN_SECONDS_LENGTH`=2,"+ + "`EVENT_ID_OFFSET`=69,"+ + "`EVENT_ID_LENGTH`=32,"+ + "`DATA_OFFSET`=102,"+ + "`DATA_LENGTH`=32"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("insert into IMPORT_TEMPLATES set ")+ - "NAME=\"Visual Traffic\","+ - "CART_OFFSET=14,"+ - "CART_LENGTH=6,"+ - "TITLE_OFFSET=25,"+ - "TITLE_LENGTH=39,"+ - "HOURS_OFFSET=5,"+ - "HOURS_LENGTH=2,"+ - "MINUTES_OFFSET=8,"+ - "MINUTES_LENGTH=2,"+ - "SECONDS_OFFSET=11,"+ - "SECONDS_LENGTH=2,"+ - "LEN_HOURS_OFFSET=0,"+ - "LEN_HOURS_LENGTH=0,"+ - "LEN_MINUTES_OFFSET=97,"+ - "LEN_MINUTES_LENGTH=2,"+ - "LEN_SECONDS_OFFSET=99,"+ - "LEN_SECONDS_LENGTH=2,"+ - "EVENT_ID_OFFSET=0,"+ - "EVENT_ID_LENGTH=0,"+ - "DATA_OFFSET=0,"+ - "DATA_LENGTH=0"; + sql=QString("insert into `IMPORT_TEMPLATES` set ")+ + "`NAME`='Visual Traffic',"+ + "`CART_OFFSET`=14,"+ + "`CART_LENGTH`=6,"+ + "`TITLE_OFFSET`=25,"+ + "`TITLE_LENGTH`=39,"+ + "`HOURS_OFFSET`=5,"+ + "`HOURS_LENGTH`=2,"+ + "`MINUTES_OFFSET`=8,"+ + "`MINUTES_LENGTH`=2,"+ + "`SECONDS_OFFSET`=11,"+ + "`SECONDS_LENGTH`=2,"+ + "`LEN_HOURS_OFFSET`=0,"+ + "`LEN_HOURS_LENGTH`=0,"+ + "`LEN_MINUTES_OFFSET`=97,"+ + "`LEN_MINUTES_LENGTH`=2,"+ + "`LEN_SECONDS_OFFSET`=99,"+ + "`LEN_SECONDS_LENGTH`=2,"+ + "`EVENT_ID_OFFSET`=0,"+ + "`EVENT_ID_LENGTH`=0,"+ + "`DATA_OFFSET`=0,"+ + "`DATA_LENGTH`=0"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("insert into IMPORT_TEMPLATES set ")+ - "NAME=\"Music 1\","+ - "CART_OFFSET=10,"+ - "CART_LENGTH=6,"+ - "TITLE_OFFSET=25,"+ - "TITLE_LENGTH=34,"+ - "HOURS_OFFSET=0,"+ - "HOURS_LENGTH=2,"+ - "MINUTES_OFFSET=3,"+ - "MINUTES_LENGTH=2,"+ - "SECONDS_OFFSET=6,"+ - "SECONDS_LENGTH=2,"+ - "LEN_HOURS_OFFSET=60,"+ - "LEN_HOURS_LENGTH=2,"+ - "LEN_MINUTES_OFFSET=63,"+ - "LEN_MINUTES_LENGTH=2,"+ - "LEN_SECONDS_OFFSET=66,"+ - "LEN_SECONDS_LENGTH=2,"+ - "DATA_OFFSET=69,"+ - "DATA_LENGTH=32"; + sql=QString("insert into `IMPORT_TEMPLATES` set ")+ + "`NAME`='Music 1',"+ + "`CART_OFFSET`=10,"+ + "`CART_LENGTH`=6,"+ + "`TITLE_OFFSET`=25,"+ + "`TITLE_LENGTH`=34,"+ + "`HOURS_OFFSET`=0,"+ + "`HOURS_LENGTH`=2,"+ + "`MINUTES_OFFSET`=3,"+ + "`MINUTES_LENGTH`=2,"+ + "`SECONDS_OFFSET`=6,"+ + "`SECONDS_LENGTH`=2,"+ + "`LEN_HOURS_OFFSET`=60,"+ + "`LEN_HOURS_LENGTH`=2,"+ + "`LEN_MINUTES_OFFSET`=63,"+ + "`LEN_MINUTES_LENGTH`=2,"+ + "`LEN_SECONDS_OFFSET`=66,"+ + "`LEN_SECONDS_LENGTH`=2,"+ + "`DATA_OFFSET`=69,"+ + "`DATA_LENGTH`=32"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("insert into IMPORT_TEMPLATES set ")+ - "NAME=\"NaturalLog\","+ - "CART_OFFSET=9,"+ - "CART_LENGTH=6,"+ - "TITLE_OFFSET=19,"+ - "TITLE_LENGTH=40,"+ - "HOURS_OFFSET=0,"+ - "HOURS_LENGTH=2,"+ - "MINUTES_OFFSET=3,"+ - "MINUTES_LENGTH=2,"+ - "SECONDS_OFFSET=6,"+ - "SECONDS_LENGTH=2,"+ - "LEN_HOURS_OFFSET=61,"+ - "LEN_HOURS_LENGTH=2,"+ - "LEN_MINUTES_OFFSET=64,"+ - "LEN_MINUTES_LENGTH=2,"+ - "LEN_SECONDS_OFFSET=67,"+ - "LEN_SECONDS_LENGTH=2,"+ - "DATA_OFFSET=0,"+ - "DATA_LENGTH=0"; + sql=QString("insert into `IMPORT_TEMPLATES` set ")+ + "`NAME`='NaturalLog',"+ + "`CART_OFFSET`=9,"+ + "`CART_LENGTH`=6,"+ + "`TITLE_OFFSET`=19,"+ + "`TITLE_LENGTH`=40,"+ + "`HOURS_OFFSET`=0,"+ + "`HOURS_LENGTH`=2,"+ + "`MINUTES_OFFSET`=3,"+ + "`MINUTES_LENGTH`=2,"+ + "`SECONDS_OFFSET`=6,"+ + "`SECONDS_LENGTH`=2,"+ + "`LEN_HOURS_OFFSET`=61,"+ + "`LEN_HOURS_LENGTH`=2,"+ + "`LEN_MINUTES_OFFSET`=64,"+ + "`LEN_MINUTES_LENGTH`=2,"+ + "`LEN_SECONDS_OFFSET`=67,"+ + "`LEN_SECONDS_LENGTH`=2,"+ + "`DATA_OFFSET`=0,"+ + "`DATA_LENGTH`=0"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2744,11 +2744,11 @@ bool MainObject::InsertRDAirplayHotkeys(const QString &station_name, labels.push_back(QObject::tr("Aux Log 2")); for(int i=0;i +// (C) Copyright 2018-2021 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -20,8 +20,6 @@ #include -#include - #include #include #include @@ -79,10 +77,10 @@ bool MainObject::ModifyCharset(const QString &charset, // Per-table Attributes // sql=QString("select ")+ - "TABLE_NAME,"+ // 00 - "TABLE_COLLATION "+ // 01 - "from information_schema.TABLES where "+ - "TABLE_SCHEMA='"+RDEscapeString(db_mysql_database)+"'"; + "`TABLE_NAME`,"+ // 00 + "`TABLE_COLLATION` "+ // 01 + "from `information_schema`.`TABLES` where "+ + "`TABLE_SCHEMA`='"+RDEscapeString(db_mysql_database)+"'"; q=new RDSqlQuery(sql,false); while(q->next()) { QStringList f0=q->value(1).toString().split("_"); @@ -98,10 +96,10 @@ bool MainObject::ModifyCharset(const QString &charset, // Database Attributes // sql=QString("select ")+ - "SCHEMA_NAME,"+ // 00 - "DEFAULT_CHARACTER_SET_NAME,"+ // 01 - "DEFAULT_COLLATION_NAME "+ // 02 - "from information_schema.SCHEMATA"; + "`SCHEMA_NAME`,"+ // 00 + "`DEFAULT_CHARACTER_SET_NAME`,"+ // 01 + "`DEFAULT_COLLATION_NAME` "+ // 02 + "from `information_schema`.`SCHEMATA`"; q=new RDSqlQuery(sql); while(q->next()) { if(q->value(0).toString()==db_mysql_database) { @@ -116,4 +114,3 @@ bool MainObject::ModifyCharset(const QString &charset, delete q; return true; } - diff --git a/utils/rddbmgr/rddbmgr.cpp b/utils/rddbmgr/rddbmgr.cpp index 9cfaa30d..69766a92 100644 --- a/utils/rddbmgr/rddbmgr.cpp +++ b/utils/rddbmgr/rddbmgr.cpp @@ -277,8 +277,8 @@ MainObject::MainObject(QObject *parent) // Check that Orphan group exists if(!db_orphan_group_name.isEmpty()) { - QString sql=QString("select NAME from GROUPS where ")+ - "NAME=\""+RDEscapeString(db_orphan_group_name)+"\""; + QString sql=QString("select `NAME` from `GROUPS` where ")+ + "NAME='"+RDEscapeString(db_orphan_group_name)+"'"; RDSqlQuery *q=new RDSqlQuery(sql,false); if(!q->first()) { fprintf(stderr,"rddbmgr: invalid group \"%s\"\n", @@ -380,8 +380,8 @@ MainObject::MainObject(QObject *parent) void MainObject::WriteSchemaVersion(int ver) const { - QString sql=QString("update VERSION set ")+ - QString().sprintf("DB=%d",ver); + QString sql=QString("update `VERSION` set ")+ + QString().sprintf("`DB`=%d",ver); RDSqlQuery::apply(sql); } @@ -393,7 +393,7 @@ bool MainObject::TableExists(const QString &tbl_name) const bool ret=false; sql=QString("show tables where ")+ - "Tables_in_"+db_config->mysqlDbname()+"=\""+RDEscapeString(tbl_name)+"\""; + "`Tables_in_"+db_config->mysqlDbname()+"`='"+RDEscapeString(tbl_name)+"'"; q=new RDSqlQuery(sql,false); ret=q->first(); delete q; @@ -409,7 +409,7 @@ bool MainObject::DropTable(const QString &tbl_name,QString *err_msg) const bool ret=false; sql=QString("show tables where ")+ - "Tables_in_"+db_config->mysqlDbname()+"=\""+RDEscapeString(tbl_name)+"\""; + "`Tables_in_"+db_config->mysqlDbname()+"`='"+RDEscapeString(tbl_name)+"'"; q=new RDSqlQuery(sql,false); if(q->first()) { sql=QString("drop table `")+q->value(0).toString()+"`"; @@ -432,10 +432,10 @@ bool MainObject::ColumnExists(const QString &tbl_name, RDSqlQuery *q; bool ret=false; - sql=QString("select * from INFORMATION_SCHEMA.COLUMNS where ")+ - "TABLE_SCHEMA=\""+db_config->mysqlDbname()+"\" && "+ - "TABLE_NAME=\""+tbl_name+"\" && "+ - "COLUMN_NAME=\""+col_name+"\""; + sql=QString("select * from `INFORMATION_SCHEMA`.`COLUMNS` where ")+ + "`TABLE_SCHEMA`='"+db_config->mysqlDbname()+"' && "+ + "`TABLE_NAME`='"+tbl_name+"' && "+ + "`COLUMN_NAME`='"+col_name+"'"; q=new RDSqlQuery(sql,false); ret=q->first(); delete q; diff --git a/utils/rddbmgr/revertschema.cpp b/utils/rddbmgr/revertschema.cpp index 4ef3d2c3..99c1505b 100644 --- a/utils/rddbmgr/revertschema.cpp +++ b/utils/rddbmgr/revertschema.cpp @@ -64,9 +64,9 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) if((cur_schema==346)&&(set_schemanext()) { QString password(QByteArray::fromBase64(q->value(1).toString().toUtf8())); - sql=QString("update FEEDS set ")+ - "PURGE_PASSWORD=\""+RDEscapeString(password)+"\" where "+ - "KEY_NAME=\""+RDEscapeString(q->value(0).toString())+"\""; + sql=QString("update `FEEDS` set ")+ + "`PURGE_PASSWORD`='"+RDEscapeString(password)+"' where "+ + "`KEY_NAME`='"+RDEscapeString(q->value(0).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } delete q; - sql=QString("alter table FEEDS modify column ")+ - "PURGE_PASSWORD varchar(64)"; + sql=QString("alter table `FEEDS` modify column ")+ + "`PURGE_PASSWORD` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -279,57 +279,57 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) // Revert 331 // if((cur_schema==331)&&(set_schemanext()) { if(q->value(2).isNull()) { - sql=QString("update PODCASTS set ")+ - "SHELF_LIFE=0 where "+ - QString().sprintf("ID=%u",q->value(0).toUInt()); + sql=QString("update `PODCASTS` set ")+ + "`SHELF_LIFE`=0 where "+ + QString().sprintf("`ID`=%u",q->value(0).toUInt()); } else { - sql=QString("update PODCASTS set ")+ - QString().sprintf("SHELF_LIFE=%lld where ", + sql=QString("update `PODCASTS` set ")+ + QString().sprintf("`SHELF_LIFE`=%lld where ", q->value(1).toDateTime(). daysTo(q->value(2).toDateTime()))+ - QString().sprintf("ID=%u",q->value(0).toUInt()); + QString().sprintf("`ID`=%u",q->value(0).toUInt()); } if(!RDSqlQuery::apply(sql,err_msg)) { return false; @@ -390,43 +390,43 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) // Revert 328 // if((cur_schema==328)&&(set_schemanext()) { sql=QString("select ")+ - "HEADER_XML,"+ // 00 - "CHANNEL_XML,"+ // 01 - "ITEM_XML "+ // 02 - "from RSS_SCHEMAS where "+ + "`HEADER_XML`,"+ // 00 + "`CHANNEL_XML`,"+ // 01 + "`ITEM_XML` "+ // 02 + "from `RSS_SCHEMAS` where "+ QString().sprintf("ID=%u",q->value(1).toUInt()); q1=new RDSqlQuery(sql); if(q1->first()) { - QString("update FEEDS set ")+ - "HEADER_XML=\""+RDEscapeString(q1->value(0).toString())+"\","+ - "CHANNEL_XML=\""+RDEscapeString(q1->value(1).toString())+"\","+ - "ITEM_XML=\""+RDEscapeString(q1->value(2).toString())+"\" "+ + QString("update `FEEDS` set ")+ + "`HEADER_XML`='"+RDEscapeString(q1->value(0).toString())+"',"+ + "`CHANNEL_XML`='"+RDEscapeString(q1->value(1).toString())+"',"+ + "`ITEM_XML`='"+RDEscapeString(q1->value(2).toString())+"' "+ "where "+ - QString().sprintf("ID=%u",q->value(0).toUInt()); + QString().sprintf("`ID`=%u",q->value(0).toUInt()); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -582,8 +582,8 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) // Revert 316 // if((cur_schema==316)&&(set_schemanext()) { sql=QString("select ")+ - "SCHED_CODE " // 00 - "from STACK_SCHED_CODES where "+ - QString().sprintf("STACK_LINES_ID=%u",q->value(0).toUInt()); + "`SCHED_CODE` " // 00 + "from `STACK_SCHED_CODES` where "+ + QString().sprintf("`STACK_LINES_ID`=%u",q->value(0).toUInt()); q1=new RDSqlQuery(sql,false); while(q1->next()) { codes+=q1->value(0).toString(); @@ -716,9 +709,9 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) } delete q1; codes+="."; - sql=QString("update STACK_LINES set ")+ - "SCHED_CODES=\""+RDEscapeString(codes)+"\" where "+ - QString().sprintf("ID=%u",q->value(0).toUInt()); + sql=QString("update `STACK_LINES` set ")+ + "`SCHED_CODES`='"+RDEscapeString(codes)+"' where "+ + QString().sprintf("`ID`=%u",q->value(0).toUInt()); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -747,14 +740,14 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) // Revert 306 // if((cur_schema==306)&&(set_schemanext()) { schedcode=QString().sprintf("%-11s", q->value(1).toString().toUtf8().constData()); - q1=new RDSqlQuery(QString().sprintf("update CART set SCHED_CODES=CONCAT(\"%s\",SCHED_CODES) where NUMBER=%d",schedcode.toUtf8().constData(), + q1=new RDSqlQuery(QString().sprintf("update `CART` set `SCHED_CODES`=CONCAT('%s',`SCHED_CODES`) where `NUMBER`=%d",schedcode.toUtf8().constData(), q->value(0).toUInt()),false); delete q1; } delete q; - q=new RDSqlQuery("drop table CART_SCHED_CODES",false); + q=new RDSqlQuery("drop table `CART_SCHED_CODES`",false); delete q; WriteSchemaVersion(--cur_schema); @@ -901,14 +894,14 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) // Revert 298 // if((cur_schema==298)&&(set_schemanext()) { QString tablename=q->value(0).toString()+"_FLG"; tablename.replace(" ","_"); sql=QString("create table if not exists `")+tablename+"` ("+ - "ID int unsigned primary key auto_increment,"+ - "CAST_ID int unsigned,"+ - "ACCESS_DATE date,"+ - "ACCESS_COUNT int unsigned default 0,"+ - "index CAST_ID_IDX(CAST_ID,ACCESS_DATE))"+ + "`ID` int unsigned primary key auto_increment,"+ + "`CAST_ID` int unsigned,"+ + "`ACCESS_DATE` date,"+ + "`ACCESS_COUNT` int unsigned default 0,"+ + "index `CAST_ID_IDX` (`CAST_ID`,`ACCESS_DATE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -2754,19 +2747,19 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) } sql=QString("select ")+ - "CAST_ID,"+ // 00 - "ACCESS_DATE,"+ // 01 - "ACCESS_COUNT "+ // 02 - "from CAST_DOWNLOADS where "+ - "FEED_KEY_NAME=\""+RDEscapeString(q->value(0).toString())+"\" "+ - "order by CAST_ID,ACCESS_DATE"; + "`CAST_ID`,"+ // 00 + "`ACCESS_DATE`,"+ // 01 + "`ACCESS_COUNT` "+ // 02 + "from `CAST_DOWNLOADS` where "+ + "`FEED_KEY_NAME`='"+RDEscapeString(q->value(0).toString())+"' "+ + "order by `CAST_ID`,`ACCESS_DATE`"; q1=new RDSqlQuery(sql,false); while(q1->next()) { sql=QString("insert into `")+tablename+"` set "+ - QString().sprintf("CAST_ID=%u,",q1->value(0).toUInt())+ - "ACCESS_DATE=\""+ - RDEscapeString(q1->value(1).toDate().toString("yyyy-MM-dd"))+"\","+ - QString().sprintf("ACCESS_COUNT=%u",q1->value(2).toUInt()); + QString().sprintf("`CAST_ID`=%u,",q1->value(0).toUInt())+ + "`ACCESS_DATE`='"+ + RDEscapeString(q1->value(1).toDate().toString("yyyy-MM-dd"))+"',"+ + QString().sprintf("`ACCESS_COUNT`=%u",q1->value(2).toUInt()); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2785,46 +2778,46 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) // Revert 293 // if((cur_schema==293)&&(set_schemanext()) { QString tablename=q->value(0).toString()+"_STACK"; tablename.replace(" ","_"); sql=QString("create table `")+tablename+"` ("+ - "SCHED_STACK_ID int unsigned not null primary key,"+ - "CART int unsigned not null,"+ - "ARTIST varchar(255),"+ - "SCHED_CODES varchar(255),"+ - "SCHEDULED_AT datetime default '1000-01-01 00:00:00')"+ + "`SCHED_STACK_ID` int unsigned not null primary key,"+ + "`CART` int unsigned not null,"+ + "`ARTIST` varchar(255),"+ + "`SCHED_CODES` varchar(255),"+ + "`SCHEDULED_AT` datetime default '1000-01-01 00:00:00')"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("select ")+ - "SCHED_STACK_ID,"+ // 00 - "CART,"+ // 01 - "ARTIST,"+ // 02 - "SCHED_CODES,"+ // 03 - "SCHEDULED_AT "+ // 04 - "from STACK_LINES where "+ - "SERVICE_NAME=\""+RDEscapeString(q->value(0).toString())+"\""; + "`SCHED_STACK_ID`,"+ // 00 + "`CART`,"+ // 01 + "`ARTIST`,"+ // 02 + "`SCHED_CODES`,"+ // 03 + "`SCHEDULED_AT` "+ // 04 + "from `STACK_LINES` where "+ + "`SERVICE_NAME`='"+RDEscapeString(q->value(0).toString())+"'"; q1=new RDSqlQuery(sql,false); while(q1->next()) { sql=QString("insert into `")+tablename+"` set "+ - QString().sprintf("SCHED_STACK_ID=%u,",q1->value(0).toUInt())+ - QString().sprintf("CART=%u,",q1->value(1).toUInt())+ - "ARTIST=\""+RDEscapeString(q1->value(2).toString())+"\","+ - "SCHED_CODES=\""+RDEscapeString(q1->value(3).toString())+"\","+ - "SCHEDULED_AT=\""+RDEscapeString(q1->value(4).toDateTime(). - toString("yyyy-MM-dd hh:mm:ss"))+"\""; + QString().sprintf("`SCHED_STACK_ID`=%u,",q1->value(0).toUInt())+ + QString().sprintf("`CART`=%u,",q1->value(1).toUInt())+ + "`ARTIST`='"+RDEscapeString(q1->value(2).toString())+"',"+ + "`SCHED_CODES`='"+RDEscapeString(q1->value(3).toString())+"',"+ + "`SCHEDULED_AT`='"+RDEscapeString(q1->value(4).toDateTime(). + toString("yyyy-MM-dd hh:mm:ss"))+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } sql=QString("update `")+tablename+"` set "+ - "SCHEDULED_AT=\"1000-01-01 00:00:00\" where "+ - "SCHEDULED_AT=\"1752-09-14 00:00:00\""; + "`SCHEDULED_AT`='1000-01-01 00:00:00' where "+ + "`SCHEDULED_AT`='1752-09-14 00:00:00'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2842,18 +2835,18 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) // Revert 292 // if((cur_schema==292)&&(set_schemanext()) { QString tablename=q->value(0).toString()+"_RULES"; tablename.replace(" ","_"); sql=QString("create table `")+tablename+"` ("+ - "CODE varchar(10) not null primary key,"+ - "MAX_ROW int unsigned,"+ - "MIN_WAIT int unsigned,"+ - "NOT_AFTER varchar(10),"+ - "OR_AFTER varchar(10),"+ - "OR_AFTER_II varchar(10))"+ + "`CODE` varchar(10) not null primary key,"+ + "`MAX_ROW` int unsigned,"+ + "`MIN_WAIT` int unsigned,"+ + "`NOT_AFTER` varchar(10),"+ + "`OR_AFTER` varchar(10),"+ + "`OR_AFTER_II` varchar(10))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -2861,24 +2854,24 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) } sql=QString("select ")+ - "CODE,"+ // 00 - "MAX_ROW,"+ // 01 - "MIN_WAIT,"+ // 02 - "NOT_AFTER,"+ // 03 - "OR_AFTER,"+ // 04 - "OR_AFTER_II "+ // 05 + "`CODE`,"+ // 00 + "`MAX_ROW`,"+ // 01 + "`MIN_WAIT`,"+ // 02 + "`NOT_AFTER`,"+ // 03 + "`OR_AFTER`,"+ // 04 + "`OR_AFTER_II` "+ // 05 "from RULE_LINES where "+ - "CLOCK_NAME=\""+RDEscapeString(q->value(0).toString())+"\" "+ - "order by CODE"; + "`CLOCK_NAME`='"+RDEscapeString(q->value(0).toString())+"' "+ + "order by `CODE`"; q1=new RDSqlQuery(sql,false); while(q1->next()) { sql=QString("insert into `")+tablename+"` set "+ - "CODE=\""+RDEscapeString(q1->value(0).toString())+"\","+ - QString().sprintf("MAX_ROW=%u,",q1->value(1).toUInt())+ - QString().sprintf("MIN_WAIT=%u,",q1->value(2).toUInt())+ - "NOT_AFTER=\""+RDEscapeString(q1->value(3).toString())+"\","+ - "OR_AFTER=\""+RDEscapeString(q1->value(4).toString())+"\","+ - "OR_AFTER_II=\""+RDEscapeString(q1->value(5).toString())+"\""; + "`CODE`='"+RDEscapeString(q1->value(0).toString())+"',"+ + QString().sprintf("`MAX_ROW`=%u,",q1->value(1).toUInt())+ + QString().sprintf("`MIN_WAIT`=%u,",q1->value(2).toUInt())+ + "`NOT_AFTER`='"+RDEscapeString(q1->value(3).toString())+"',"+ + "`OR_AFTER`='"+RDEscapeString(q1->value(4).toString())+"',"+ + "`OR_AFTER_II`='"+RDEscapeString(q1->value(5).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2898,17 +2891,17 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) // Revert 291 // if((cur_schema==291)&&(set_schemanext()) { QString tablename=q->value(0).toString()+"_CLK"; tablename.replace(" ","_"); sql=QString("create table `")+tablename+"` ("+ - "ID int unsigned auto_increment not null primary key,"+ - "EVENT_NAME char(64) not null,"+ - "START_TIME int not null,"+ - "LENGTH int not null,"+ - "INDEX EVENT_NAME_IDX (EVENT_NAME))"+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`EVENT_NAME` char(64) not null,"+ + "`START_TIME` int not null,"+ + "`LENGTH` int not null,"+ + "`index EVENT_NAME_IDX` (`EVENT_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -2916,18 +2909,18 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) } sql=QString("select ")+ - "EVENT_NAME,"+ // 00 - "START_TIME,"+ // 01 - "LENGTH "+ // 02 - "from CLOCK_LINES where "+ - "CLOCK_NAME=\""+RDEscapeString(q->value(0).toString())+"\" "+ - "order by START_TIME"; + "`EVENT_NAME`,"+ // 00 + "`START_TIME`,"+ // 01 + "`LENGTH` "+ // 02 + "from `CLOCK_LINES` where "+ + "`CLOCK_NAME`='"+RDEscapeString(q->value(0).toString())+"' "+ + "order by `START_TIME`"; q1=new RDSqlQuery(sql); while(q1->next()) { sql=QString("insert into `")+tablename+"` set "+ - "EVENT_NAME=\""+RDEscapeString(q1->value(0).toString())+"\","+ - QString().sprintf("START_TIME=%d,",q1->value(1).toInt())+ - QString().sprintf("LENGTH=%d",q1->value(2).toInt()); + "`EVENT_NAME`='"+RDEscapeString(q1->value(0).toString())+"',"+ + QString().sprintf("`START_TIME`=%d,",q1->value(1).toInt())+ + QString().sprintf("`LENGTH`=%d",q1->value(2).toInt()); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2947,7 +2940,7 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) // Revert 290 // if((cur_schema==290)&&(set_schemanext()) { // @@ -2956,73 +2949,73 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) QString tablename=q->value(0).toString()+"_PRE"; tablename.replace(" ","_"); sql=QString("create table if not exists `")+tablename+"` ("+ - "ID int not null primary key,"+ - "COUNT int not null,"+ - "TYPE int default 0,"+ - "SOURCE int not null,"+ - "START_TIME int,"+ - "GRACE_TIME int default 0,"+ - "CART_NUMBER int UNSIGNED not null default 0,"+ - "TIME_TYPE int not null,"+ - "POST_POINT enum('N','Y') default 'N',"+ - "TRANS_TYPE int not null,"+ - "START_POINT int not null default -1,"+ - "END_POINT int not null default -1,"+ - "FADEUP_POINT int default -1,"+ - QString().sprintf("FADEUP_GAIN int default %d,",RD_FADE_DEPTH)+ - "FADEDOWN_POINT int default -1,"+ - QString().sprintf("FADEDOWN_GAIN int default %d,",RD_FADE_DEPTH)+ - "SEGUE_START_POINT int not null default -1,"+ - "SEGUE_END_POINT int not null default -1,"+ - QString().sprintf("SEGUE_GAIN int default %d,",RD_FADE_DEPTH)+ - "DUCK_UP_GAIN int default 0,"+ - "DUCK_DOWN_GAIN int default 0,"+ - "COMMENT CHAR(255),"+ - "LABEL CHAR(64),"+ - "ORIGIN_USER char(255),"+ - "ORIGIN_DATETIME datetime,"+ - "EVENT_LENGTH int default -1,"+ - "LINK_EVENT_NAME char(64),"+ - "LINK_START_TIME int,"+ - "LINK_LENGTH int default 0,"+ - "LINK_START_SLOP int default 0,"+ - "LINK_END_SLOP int default 0,"+ - "LINK_ID int default -1,"+ - "LINK_EMBEDDED enum('N','Y') default 'N',"+ - "EXT_START_TIME time,"+ - "EXT_LENGTH int,"+ - "EXT_CART_NAME char(32),"+ - "EXT_DATA char(32),"+ - "EXT_EVENT_ID char(32),"+ - "EXT_ANNC_TYPE char(8),"+ - "index COUNT_IDX (COUNT),"+ - "index CART_NUMBER_IDX (CART_NUMBER),"+ - "index LABEL_IDX (LABEL))"+ + "`ID` int not null primary key,"+ + "`COUNT` int not null,"+ + "`TYPE` int default 0,"+ + "`SOURCE` int not null,"+ + "`START_TIME` int,"+ + "`GRACE_TIME` int default 0,"+ + "`CART_NUMBER` int UNSIGNED not null default 0,"+ + "`TIME_TYPE` int not null,"+ + "`POST_POINT` enum('N','Y') default 'N',"+ + "`TRANS_TYPE` int not null,"+ + "`START_POINT` int not null default -1,"+ + "`END_POINT` int not null default -1,"+ + "`FADEUP_POINT` int default -1,"+ + QString().sprintf("`FADEUP_GAIN` int default %d,",RD_FADE_DEPTH)+ + "`FADEDOWN_POINT` int default -1,"+ + QString().sprintf("`FADEDOWN_GAIN` int default %d,",RD_FADE_DEPTH)+ + "`SEGUE_START_POINT` int not null default -1,"+ + "`SEGUE_END_POINT` int not null default -1,"+ + QString().sprintf("`SEGUE_GAIN` int default %d,",RD_FADE_DEPTH)+ + "`DUCK_UP_GAIN` int default 0,"+ + "`DUCK_DOWN_GAIN` int default 0,"+ + "`COMMENT` CHAR(255),"+ + "`LABEL` CHAR(64),"+ + "`ORIGIN_USER` char(255),"+ + "`ORIGIN_DATETIME` datetime,"+ + "`EVENT_LENGTH` int default -1,"+ + "`LINK_EVENT_NAME` char(64),"+ + "`LINK_START_TIME` int,"+ + "`LINK_LENGTH` int default 0,"+ + "`LINK_START_SLOP` int default 0,"+ + "`LINK_END_SLOP` int default 0,"+ + "`LINK_ID` int default -1,"+ + "`LINK_EMBEDDED` enum('N','Y') default 'N',"+ + "`EXT_START_TIME` time,"+ + "`EXT_LENGTH` int,"+ + "`EXT_CART_NAME` char(32),"+ + "`EXT_DATA` char(32),"+ + "`EXT_EVENT_ID` char(32),"+ + "`EXT_ANNC_TYPE` char(8),"+ + "index `COUNT_IDX` (`COUNT`),"+ + "index `CART_NUMBER_IDX` (`CART_NUMBER`),"+ + "index `LABEL_IDX` (`LABEL`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("select ")+ - "COUNT,"+ // 00 - "EVENT_TYPE,"+ // 01 - "CART_NUMBER,"+ // 02 - "TRANS_TYPE,"+ // 03 - "MARKER_COMMENT "+ // 04 - "from EVENT_LINES where "+ - "EVENT_NAME=\""+RDEscapeString(q->value(0).toString())+"\" && "+ - "TYPE=0"; + "`COUNT`,"+ // 00 + "`EVENT_TYPE`,"+ // 01 + "`CART_NUMBER`,"+ // 02 + "`TRANS_TYPE`,"+ // 03 + "`MARKER_COMMENT` "+ // 04 + "from `EVENT_LINES` where "+ + "`EVENT_NAME`='"+RDEscapeString(q->value(0).toString())+"' && "+ + "`TYPE`=0"; q1=new RDSqlQuery(sql,false); while(q1->next()) { sql=QString("insert into `")+tablename+"` set "+ - "SOURCE=0,"+ - "TIME_TYPE=0,"+ - QString().sprintf("ID=%d,",1+q1->value(0).toInt())+ - QString().sprintf("COUNT=%d,",q1->value(0).toInt())+ - QString().sprintf("TYPE=%d,",q1->value(1).toInt())+ - QString().sprintf("CART_NUMBER=%u,",q1->value(2).toUInt())+ - QString().sprintf("TRANS_TYPE=%d,",q1->value(3).toInt())+ - "COMMENT=\""+RDEscapeString(q1->value(4).toString())+"\""; + "`SOURCE`=0,"+ + "`TIME_TYPE`=0,"+ + QString().sprintf("`ID`=%d,",1+q1->value(0).toInt())+ + QString().sprintf("`COUNT`=%d,",q1->value(0).toInt())+ + QString().sprintf("`TYPE`=%d,",q1->value(1).toInt())+ + QString().sprintf("`CART_NUMBER`=%u,",q1->value(2).toUInt())+ + QString().sprintf("`TRANS_TYPE`=%d,",q1->value(3).toInt())+ + "`COMMENT`='"+RDEscapeString(q1->value(4).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3035,73 +3028,73 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) tablename=q->value(0).toString()+"_POST"; tablename.replace(" ","_"); sql=QString("create table if not exists `")+tablename+"` ("+ - "ID int not null primary key,"+ - "COUNT int not null,"+ - "TYPE int default 0,"+ - "SOURCE int not null,"+ - "START_TIME int,"+ - "GRACE_TIME int default 0,"+ - "CART_NUMBER int UNSIGNED not null default 0,"+ - "TIME_TYPE int not null,"+ - "POST_POINT enum('N','Y') default 'N',"+ - "TRANS_TYPE int not null,"+ - "START_POINT int not null default -1,"+ - "END_POINT int not null default -1,"+ - "FADEUP_POINT int default -1,"+ - QString().sprintf("FADEUP_GAIN int default %d,",RD_FADE_DEPTH)+ - "FADEDOWN_POINT int default -1,"+ - QString().sprintf("FADEDOWN_GAIN int default %d,",RD_FADE_DEPTH)+ - "SEGUE_START_POINT int not null default -1,"+ - "SEGUE_END_POINT int not null default -1,"+ - QString().sprintf("SEGUE_GAIN int default %d,",RD_FADE_DEPTH)+ - "DUCK_UP_GAIN int default 0,"+ - "DUCK_DOWN_GAIN int default 0,"+ - "COMMENT CHAR(255),"+ - "LABEL CHAR(64),"+ - "ORIGIN_USER char(255),"+ - "ORIGIN_DATETIME datetime,"+ - "EVENT_LENGTH int default -1,"+ - "LINK_EVENT_NAME char(64),"+ - "LINK_START_TIME int,"+ - "LINK_LENGTH int default 0,"+ - "LINK_START_SLOP int default 0,"+ - "LINK_END_SLOP int default 0,"+ - "LINK_ID int default -1,"+ - "LINK_EMBEDDED enum('N','Y') default 'N',"+ - "EXT_START_TIME time,"+ - "EXT_LENGTH int,"+ - "EXT_CART_NAME char(32),"+ - "EXT_DATA char(32),"+ - "EXT_EVENT_ID char(32),"+ - "EXT_ANNC_TYPE char(8),"+ - "index COUNT_IDX (COUNT),"+ - "index CART_NUMBER_IDX (CART_NUMBER),"+ - "index LABEL_IDX (LABEL))"+ + "`ID` int not null primary key,"+ + "`COUNT` int not null,"+ + "`TYPE` int default 0,"+ + "`SOURCE` int not null,"+ + "`START_TIME` int,"+ + "`GRACE_TIME` int default 0,"+ + "`CART_NUMBER` int UNSIGNED not null default 0,"+ + "`TIME_TYPE` int not null,"+ + "`POST_POINT` enum('N','Y') default 'N',"+ + "`TRANS_TYPE` int not null,"+ + "`START_POINT` int not null default -1,"+ + "`END_POINT` int not null default -1,"+ + "`FADEUP_POINT` int default -1,"+ + QString().sprintf("`FADEUP_GAIN` int default %d,",RD_FADE_DEPTH)+ + "`FADEDOWN_POINT` int default -1,"+ + QString().sprintf("`FADEDOWN_GAIN` int default %d,",RD_FADE_DEPTH)+ + "`SEGUE_START_POINT` int not null default -1,"+ + "`SEGUE_END_POINT` int not null default -1,"+ + QString().sprintf("`SEGUE_GAIN` int default %d,",RD_FADE_DEPTH)+ + "`DUCK_UP_GAIN` int default 0,"+ + "`DUCK_DOWN_GAIN` int default 0,"+ + "`COMMENT` CHAR(255),"+ + "`LABEL` CHAR(64),"+ + "`ORIGIN_USER` char(255),"+ + "`ORIGIN_DATETIME` datetime,"+ + "`EVENT_LENGTH` int default -1,"+ + "`LINK_EVENT_NAME` char(64),"+ + "`LINK_START_TIME` int,"+ + "`LINK_LENGTH` int default 0,"+ + "`LINK_START_SLOP` int default 0,"+ + "`LINK_END_SLOP` int default 0,"+ + "`LINK_ID` int default -1,"+ + "`LINK_EMBEDDED` enum('N','Y') default 'N',"+ + "`EXT_START_TIME` time,"+ + "`EXT_LENGTH` int,"+ + "`EXT_CART_NAME` char(32),"+ + "`EXT_DATA` char(32),"+ + "`EXT_EVENT_ID` char(32),"+ + "`EXT_ANNC_TYPE` char(8),"+ + "index `COUNT_IDX` (`COUNT`),"+ + "index `CART_NUMBER_IDX` (`CART_NUMBER`),"+ + "index `LABEL_IDX` (`LABEL`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("select ")+ - "COUNT,"+ // 00 - "EVENT_TYPE,"+ // 01 - "CART_NUMBER,"+ // 02 - "TRANS_TYPE,"+ // 03 - "MARKER_COMMENT "+ // 04 - "from EVENT_LINES where "+ - "EVENT_NAME=\""+RDEscapeString(q->value(0).toString())+"\" && "+ - "TYPE=1"; + "`COUNT`,"+ // 00 + "`EVENT_TYPE`,"+ // 01 + "`CART_NUMBER`,"+ // 02 + "`TRANS_TYPE`,"+ // 03 + "`MARKER_COMMENT` "+ // 04 + "from `EVENT_LINES` where "+ + "`EVENT_NAME`='"+RDEscapeString(q->value(0).toString())+"' && "+ + "`TYPE`=1"; q1=new RDSqlQuery(sql,false); while(q1->next()) { sql=QString("insert into `")+tablename+"` set "+ - "SOURCE=0,"+ - "TIME_TYPE=0,"+ - QString().sprintf("ID=%d,",1+q1->value(0).toInt())+ - QString().sprintf("COUNT=%d,",q1->value(0).toInt())+ - QString().sprintf("TYPE=%d,",q1->value(1).toInt())+ - QString().sprintf("CART_NUMBER=%u,",q1->value(2).toUInt())+ - QString().sprintf("TRANS_TYPE=%d,",q1->value(3).toInt())+ - "COMMENT=\""+RDEscapeString(q1->value(4).toString())+"\""; + "`SOURCE`=0,"+ + "`TIME_TYPE`=0,"+ + QString().sprintf("`ID`=%d,",1+q1->value(0).toInt())+ + QString().sprintf("`COUNT`=%d,",q1->value(0).toInt())+ + QString().sprintf("`TYPE`=%d,",q1->value(1).toInt())+ + QString().sprintf("`CART_NUMBER`=%u,",q1->value(2).toUInt())+ + QString().sprintf("`TRANS_TYPE`=%d,",q1->value(3).toInt())+ + "`COMMENT`='"+RDEscapeString(q1->value(4).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3120,48 +3113,48 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) // Revert 289 // if((cur_schema==289)&&(set_schemanext()) { QString tablename=q->value(0).toString()+"_SRT"; tablename.replace(" ","_"); sql=QString("create table if not exists `")+tablename+"` ("+ - "ID int unsigned auto_increment primary key,"+ - "LENGTH int,"+ - "LOG_NAME char(64),"+ - "LOG_ID int,"+ - "CART_NUMBER int unsigned,"+ - "CUT_NUMBER int,"+ - "TITLE char(255),"+ - "ARTIST char(255),"+ - "PUBLISHER char(64),"+ - "COMPOSER char(64),"+ - "USER_DEFINED char(255),"+ - "SONG_ID char(32),"+ - "ALBUM char(255),"+ - "LABEL char(64),"+ - "CONDUCTOR char(64),"+ - "USAGE_CODE int,"+ - "DESCRIPTION char(64),"+ - "OUTCUE char(64),"+ - "ISRC char(12),"+ - "ISCI char(32),"+ - "STATION_NAME char(64),"+ - "EVENT_DATETIME datetime,"+ - "SCHEDULED_TIME time,"+ - "EVENT_TYPE int,"+ - "EVENT_SOURCE int,"+ - "PLAY_SOURCE int,"+ - "START_SOURCE int default 0,"+ - "ONAIR_FLAG enum('N','Y') default 'N',"+ - "EXT_START_TIME time,"+ - "EXT_LENGTH int,"+ - "EXT_CART_NAME char(32),"+ - "EXT_DATA char(32),"+ - "EXT_EVENT_ID char(8),"+ - "EXT_ANNC_TYPE char(8),"+ - "index EVENT_DATETIME_IDX(EVENT_DATETIME))"+ + "`ID` int unsigned auto_increment primary key,"+ + "`LENGTH` int,"+ + "`LOG_NAME` char(64),"+ + "`LOG_ID` int,"+ + "`CART_NUMBER` int unsigned,"+ + "`CUT_NUMBER` int,"+ + "`TITLE` char(255),"+ + "`ARTIST` char(255),"+ + "`PUBLISHER` char(64),"+ + "`COMPOSER` char(64),"+ + "`USER_DEFINED` char(255),"+ + "`SONG_ID` char(32),"+ + "`ALBUM` char(255),"+ + "`LABEL` char(64),"+ + "`CONDUCTOR` char(64),"+ + "`USAGE_CODE` int,"+ + "`DESCRIPTION` char(64),"+ + "`OUTCUE` char(64),"+ + "`ISRC` char(12),"+ + "`ISCI` char(32),"+ + "`STATION_NAME` char(64),"+ + "`EVENT_DATETIME` datetime,"+ + "`SCHEDULED_TIME` time,"+ + "`EVENT_TYPE` int,"+ + "`EVENT_SOURCE` int,"+ + "`PLAY_SOURCE` int,"+ + "`START_SOURCE` int default 0,"+ + "`ONAIR_FLAG` enum('N','Y') default 'N',"+ + "`EXT_START_TIME` time,"+ + "`EXT_LENGTH` int,"+ + "`EXT_CART_NAME` char(32),"+ + "`EXT_DATA` char(32),"+ + "`EXT_EVENT_ID` char(8),"+ + "`EXT_ANNC_TYPE` char(8),"+ + "index `EVENT_DATETIME_IDX` (`EVENT_DATETIME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -3169,80 +3162,80 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) } sql=QString("select ")+ - "LENGTH,"+ // 00 - "LOG_NAME,"+ // 01 - "LOG_ID,"+ // 02 - "CART_NUMBER,"+ // 03 - "CUT_NUMBER,"+ // 04 - "TITLE,"+ // 05 - "ARTIST,"+ // 06 - "PUBLISHER,"+ // 07 - "COMPOSER,"+ // 08 - "USER_DEFINED,"+ // 09 - "SONG_ID,"+ // 10 - "ALBUM,"+ // 11 - "LABEL,"+ // 12 - "CONDUCTOR,"+ // 13 - "USAGE_CODE,"+ // 14 - "DESCRIPTION,"+ // 15 - "OUTCUE,"+ // 16 - "ISRC,"+ // 17 - "ISCI,"+ // 18 - "STATION_NAME,"+ // 19 - "EVENT_DATETIME,"+ // 20 - "SCHEDULED_TIME,"+ // 21 - "EVENT_TYPE,"+ // 22 - "EVENT_SOURCE,"+ // 23 - "PLAY_SOURCE,"+ // 24 - "START_SOURCE,"+ // 25 - "ONAIR_FLAG,"+ // 26 - "EXT_START_TIME,"+ // 27 - "EXT_LENGTH,"+ // 28 - "EXT_CART_NAME,"+ // 29 - "EXT_DATA,"+ // 30 - "EXT_EVENT_ID,"+ // 31 - "EXT_ANNC_TYPE "+ // 32 - "from ELR_LINES where "+ - "SERVICE_NAME=\""+RDEscapeString(q->value(0).toString())+"\""; + "`LENGTH`,"+ // 00 + "`LOG_NAME`,"+ // 01 + "`LOG_ID`,"+ // 02 + "`CART_NUMBER`,"+ // 03 + "`CUT_NUMBER`,"+ // 04 + "`TITLE`,"+ // 05 + "`ARTIST`,"+ // 06 + "`PUBLISHER`,"+ // 07 + "`COMPOSER`,"+ // 08 + "`USER_DEFINED`,"+ // 09 + "`SONG_ID`,"+ // 10 + "`ALBUM`,"+ // 11 + "`LABEL`,"+ // 12 + "`CONDUCTOR`,"+ // 13 + "`USAGE_CODE`,"+ // 14 + "`DESCRIPTION`,"+ // 15 + "`OUTCUE`,"+ // 16 + "`ISRC`,"+ // 17 + "`ISCI`,"+ // 18 + "`STATION_NAME`,"+ // 19 + "`EVENT_DATETIME`,"+ // 20 + "`SCHEDULED_TIME`,"+ // 21 + "`EVENT_TYPE`,"+ // 22 + "`EVENT_SOURCE`,"+ // 23 + "`PLAY_SOURCE`,"+ // 24 + "`START_SOURCE`,"+ // 25 + "`ONAIR_FLAG`,"+ // 26 + "`EXT_START_TIME`,"+ // 27 + "`EXT_LENGTH`,"+ // 28 + "`EXT_CART_NAME`,"+ // 29 + "`EXT_DATA`,"+ // 30 + "`EXT_EVENT_ID`,"+ // 31 + "`EXT_ANNC_TYPE` "+ // 32 + "from `ELR_LINES` where "+ + "`SERVICE_NAME`='"+RDEscapeString(q->value(0).toString())+"'"; q1=new RDSqlQuery(sql,false); while(q1->next()) { sql=QString("insert into `")+tablename+"` set "+ - QString().sprintf("LENGTH=%d,",q1->value(0).toInt())+ - "LOG_NAME=\""+RDEscapeString(q1->value(1).toString())+"\","+ - QString().sprintf("LOG_ID=%d,",q1->value(2).toInt())+ - QString().sprintf("CART_NUMBER=%u,",q1->value(3).toUInt())+ - QString().sprintf("CUT_NUMBER=%d,",q1->value(4).toInt())+ - "TITLE=\""+RDEscapeString(q1->value(5).toString())+"\","+ - "ARTIST=\""+RDEscapeString(q1->value(6).toString())+"\","+ - "PUBLISHER=\""+RDEscapeString(q1->value(7).toString())+"\","+ - "COMPOSER=\""+RDEscapeString(q1->value(8).toString())+"\","+ - "USER_DEFINED=\""+RDEscapeString(q1->value(9).toString())+"\","+ - "SONG_ID=\""+RDEscapeString(q1->value(10).toString())+"\","+ - "ALBUM=\""+RDEscapeString(q1->value(11).toString())+"\","+ - "LABEL=\""+RDEscapeString(q1->value(12).toString())+"\","+ - "CONDUCTOR=\""+RDEscapeString(q1->value(13).toString())+"\","+ - "USAGE_CODE=\""+RDEscapeString(q1->value(14).toString())+"\","+ - "DESCRIPTION=\""+RDEscapeString(q1->value(15).toString())+"\","+ - "OUTCUE=\""+RDEscapeString(q1->value(16).toString())+"\","+ - "ISRC=\""+RDEscapeString(q1->value(17).toString())+"\","+ - "ISCI=\""+RDEscapeString(q1->value(18).toString())+"\","+ - "STATION_NAME=\""+RDEscapeString(q1->value(19).toString())+"\","+ - "EVENT_DATETIME="+ + QString().sprintf("`LENGTH`=%d,",q1->value(0).toInt())+ + "`LOG_NAME`='"+RDEscapeString(q1->value(1).toString())+"',"+ + QString().sprintf("`LOG_ID`=%d,",q1->value(2).toInt())+ + QString().sprintf("`CART_NUMBER`=%u,",q1->value(3).toUInt())+ + QString().sprintf("`CUT_NUMBER`=%d,",q1->value(4).toInt())+ + "`TITLE`='"+RDEscapeString(q1->value(5).toString())+"',"+ + "`ARTIST`='"+RDEscapeString(q1->value(6).toString())+"',"+ + "`PUBLISHER`='"+RDEscapeString(q1->value(7).toString())+"',"+ + "`COMPOSER`='"+RDEscapeString(q1->value(8).toString())+"',"+ + "`USER_DEFINED`='"+RDEscapeString(q1->value(9).toString())+"',"+ + "`SONG_ID`='"+RDEscapeString(q1->value(10).toString())+"',"+ + "`ALBUM`='"+RDEscapeString(q1->value(11).toString())+"',"+ + "`LABEL`='"+RDEscapeString(q1->value(12).toString())+"',"+ + "`CONDUCTOR`='"+RDEscapeString(q1->value(13).toString())+"',"+ + "`USAGE_CODE`='"+RDEscapeString(q1->value(14).toString())+"',"+ + "`DESCRIPTION`='"+RDEscapeString(q1->value(15).toString())+"',"+ + "`OUTCUE`='"+RDEscapeString(q1->value(16).toString())+"',"+ + "`ISRC`='"+RDEscapeString(q1->value(17).toString())+"',"+ + "`ISCI`='"+RDEscapeString(q1->value(18).toString())+"',"+ + "`STATION_NAME`='"+RDEscapeString(q1->value(19).toString())+"',"+ + "`EVENT_DATETIME`="+ RDCheckDateTime(q1->value(20).toDateTime(),"yyyy-MM-dd hh:mm:ss")+","+ - "SCHEDULED_TIME="+ + "`SCHEDULED_TIME`="+ RDCheckDateTime(q1->value(21).toTime(),"hh:mm:ss")+","+ - QString().sprintf("EVENT_TYPE=%d,",q1->value(22).toInt())+ - QString().sprintf("EVENT_SOURCE=%d,",q1->value(23).toInt())+ - QString().sprintf("PLAY_SOURCE=%d,",q1->value(24).toInt())+ - QString().sprintf("START_SOURCE=%d,",q1->value(25).toInt())+ - "ONAIR_FLAG=\""+RDEscapeString(q1->value(26).toString())+"\","+ - "EXT_START_TIME="+ + QString().sprintf("`EVENT_TYPE`=%d,",q1->value(22).toInt())+ + QString().sprintf("`EVENT_SOURCE`=%d,",q1->value(23).toInt())+ + QString().sprintf("`PLAY_SOURCE`=%d,",q1->value(24).toInt())+ + QString().sprintf("`START_SOURCE`=%d,",q1->value(25).toInt())+ + "`ONAIR_FLAG`='"+RDEscapeString(q1->value(26).toString())+"',"+ + "`EXT_START_TIME`="+ RDCheckDateTime(q1->value(27).toTime(),"hh:mm:ss")+","+ - QString().sprintf("EXT_LENGTH=%d,",q1->value(28).toInt())+ - "EXT_CART_NAME=\""+RDEscapeString(q1->value(29).toString())+"\","+ - "EXT_DATA=\""+RDEscapeString(q1->value(30).toString())+"\","+ - "EXT_EVENT_ID=\""+RDEscapeString(q1->value(31).toString())+"\","+ - "EXT_ANNC_TYPE=\""+RDEscapeString(q1->value(32).toString())+"\""; + QString().sprintf("`EXT_LENGTH`=%d,",q1->value(28).toInt())+ + "`EXT_CART_NAME`='"+RDEscapeString(q1->value(29).toString())+"',"+ + "`EXT_DATA`='"+RDEscapeString(q1->value(30).toString())+"',"+ + "`EXT_EVENT_ID`='"+RDEscapeString(q1->value(31).toString())+"',"+ + "`EXT_ANNC_TYPE`='"+RDEscapeString(q1->value(32).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3262,54 +3255,54 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) // Revert 288 // if((cur_schema==288)&&(set_schemanext()) { QString tablename=q->value(0).toString()+"_LOG"; tablename.replace(" ","_"); sql=QString("create table if not exists `")+tablename+"` ("+ - "ID int not null primary key,"+ - "COUNT int not null,"+ - "TYPE int default 0,"+ - "SOURCE int not null,"+ - "START_TIME int,"+ - "GRACE_TIME int default 0,"+ - "CART_NUMBER int UNSIGNED not null default 0,"+ - "TIME_TYPE int not null,"+ - "POST_POINT enum('N','Y') default 'N',"+ - "TRANS_TYPE int not null,"+ - "START_POINT int not null default -1,"+ - "END_POINT int not null default -1,"+ - "FADEUP_POINT int default -1,"+ - QString().sprintf("FADEUP_GAIN int default %d,",RD_FADE_DEPTH)+ - "FADEDOWN_POINT int default -1,"+ - QString().sprintf("FADEDOWN_GAIN int default %d,",RD_FADE_DEPTH)+ - "SEGUE_START_POINT int not null default -1,"+ - "SEGUE_END_POINT int not null default -1,"+ - QString().sprintf("SEGUE_GAIN int default %d,",RD_FADE_DEPTH)+ - "DUCK_UP_GAIN int default 0,"+ - "DUCK_DOWN_GAIN int default 0,"+ - "COMMENT CHAR(255),"+ - "LABEL CHAR(64),"+ - "ORIGIN_USER char(255),"+ - "ORIGIN_DATETIME datetime,"+ - "EVENT_LENGTH int default -1,"+ - "LINK_EVENT_NAME char(64),"+ - "LINK_START_TIME int,"+ - "LINK_LENGTH int default 0,"+ - "LINK_START_SLOP int default 0,"+ - "LINK_END_SLOP int default 0,"+ - "LINK_ID int default -1,"+ - "LINK_EMBEDDED enum('N','Y') default 'N',"+ - "EXT_START_TIME time,"+ - "EXT_LENGTH int,"+ - "EXT_CART_NAME char(32),"+ - "EXT_DATA char(32),"+ - "EXT_EVENT_ID char(32),"+ - "EXT_ANNC_TYPE char(8),"+ - "index COUNT_IDX (COUNT),"+ - "index CART_NUMBER_IDX (CART_NUMBER),"+ - "index LABEL_IDX (LABEL))"+ + "`ID` int not null primary key,"+ + "`COUNT` int not null,"+ + "`TYPE` int default 0,"+ + "`SOURCE` int not null,"+ + "`START_TIME` int,"+ + "`GRACE_TIME` int default 0,"+ + "`CART_NUMBER` int UNSIGNED not null default 0,"+ + "`TIME_TYPE` int not null,"+ + "`POST_POINT` enum('N','Y') default 'N',"+ + "`TRANS_TYPE` int not null,"+ + "`START_POINT` int not null default -1,"+ + "`END_POINT` int not null default -1,"+ + "`FADEUP_POINT` int default -1,"+ + QString().sprintf("`FADEUP_GAIN` int default %d,",RD_FADE_DEPTH)+ + "`FADEDOWN_POINT` int default -1,"+ + QString().sprintf("`FADEDOWN_GAIN` int default %d,",RD_FADE_DEPTH)+ + "`SEGUE_START_POINT` int not null default -1,"+ + "`SEGUE_END_POINT` int not null default -1,"+ + QString().sprintf("`SEGUE_GAIN` int default %d,",RD_FADE_DEPTH)+ + "`DUCK_UP_GAIN` int default 0,"+ + "`DUCK_DOWN_GAIN` int default 0,"+ + "`COMMENT` char(255),"+ + "`LABEL` char(64),"+ + "`ORIGIN_USER` char(255),"+ + "`ORIGIN_DATETIME` datetime,"+ + "`EVENT_LENGTH` int default -1,"+ + "`LINK_EVENT_NAME` char(64),"+ + "`LINK_START_TIME` int,"+ + "`LINK_LENGTH` int default 0,"+ + "`LINK_START_SLOP` int default 0,"+ + "`LINK_END_SLOP` int default 0,"+ + "`LINK_ID` int default -1,"+ + "`LINK_EMBEDDED` enum('N','Y') default 'N',"+ + "`EXT_START_TIME` time,"+ + "`EXT_LENGTH` int,"+ + "`EXT_CART_NAME` char(32),"+ + "`EXT_DATA` char(32),"+ + "`EXT_EVENT_ID` char(32),"+ + "`EXT_ANNC_TYPE` char(8),"+ + "index `COUNT_IDX` (`COUNT`),"+ + "index `CART_NUMBER_IDX` (`CART_NUMBER`),"+ + "index `LABEL_IDX` (`LABEL`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -3317,92 +3310,92 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) } sql=QString("select ")+ - "LINE_ID,"+ // 00 - "COUNT,"+ // 01 - "TYPE,"+ // 02 - "SOURCE,"+ // 03 - "START_TIME,"+ // 04 - "GRACE_TIME,"+ // 05 - "CART_NUMBER,"+ // 06 - "TIME_TYPE,"+ // 07 - "POST_POINT,"+ // 08 - "TRANS_TYPE,"+ // 09 - "START_POINT,"+ // 10 - "END_POINT,"+ // 11 - "FADEUP_POINT,"+ // 12 - "FADEUP_GAIN,"+ // 13 - "FADEDOWN_POINT,"+ // 14 - "FADEDOWN_GAIN,"+ // 15 - "SEGUE_START_POINT,"+ // 16 - "SEGUE_END_POINT,"+ // 17 - "SEGUE_GAIN,"+ // 18 - "DUCK_UP_GAIN,"+ // 19 - "DUCK_DOWN_GAIN,"+ // 20 - "COMMENT,"+ // 21 - "LABEL,"+ // 22 - "ORIGIN_USER,"+ // 23 - "ORIGIN_DATETIME,"+ // 24 - "EVENT_LENGTH,"+ // 25 - "LINK_EVENT_NAME,"+ // 26 - "LINK_START_TIME,"+ // 27 - "LINK_LENGTH,"+ // 28 - "LINK_START_SLOP,"+ // 29 - "LINK_END_SLOP,"+ // 30 - "LINK_ID,"+ // 31 - "LINK_EMBEDDED,"+ // 32 - "EXT_START_TIME,"+ // 33 - "EXT_LENGTH,"+ // 34 - "EXT_CART_NAME,"+ // 35 - "EXT_DATA,"+ // 36 - "EXT_EVENT_ID,"+ // 37 - "EXT_ANNC_TYPE "+ // 38 - "from LOG_LINES where "+ - "LOG_NAME=\""+RDEscapeString(q->value(0).toString())+"\" "+ - "order by COUNT"; + "`LINE_ID`,"+ // 00 + "`COUNT`,"+ // 01 + "`TYPE`,"+ // 02 + "`SOURCE`,"+ // 03 + "`START_TIME`,"+ // 04 + "`GRACE_TIME`,"+ // 05 + "`CART_NUMBER`,"+ // 06 + "`TIME_TYPE`,"+ // 07 + "`POST_POINT`,"+ // 08 + "`TRANS_TYPE`,"+ // 09 + "`START_POINT`,"+ // 10 + "`END_POINT`,"+ // 11 + "`FADEUP_POINT`,"+ // 12 + "`FADEUP_GAIN`,"+ // 13 + "`FADEDOWN_POINT`,"+ // 14 + "`FADEDOWN_GAIN`,"+ // 15 + "`SEGUE_START_POINT`,"+ // 16 + "`SEGUE_END_POINT`,"+ // 17 + "`SEGUE_GAIN`,"+ // 18 + "`DUCK_UP_GAIN`,"+ // 19 + "`DUCK_DOWN_GAIN`,"+ // 20 + "`COMMENT`,"+ // 21 + "`LABEL`,"+ // 22 + "`ORIGIN_USER`,"+ // 23 + "`ORIGIN_DATETIME`,"+ // 24 + "`EVENT_LENGTH`,"+ // 25 + "`LINK_EVENT_NAME`,"+ // 26 + "`LINK_START_TIME`,"+ // 27 + "`LINK_LENGTH`,"+ // 28 + "`LINK_START_SLOP`,"+ // 29 + "`LINK_END_SLOP`,"+ // 30 + "`LINK_ID`,"+ // 31 + "`LINK_EMBEDDED`,"+ // 32 + "`EXT_START_TIME`,"+ // 33 + "`EXT_LENGTH`,"+ // 34 + "`EXT_CART_NAME`,"+ // 35 + "`EXT_DATA`,"+ // 36 + "`EXT_EVENT_ID`,"+ // 37 + "`EXT_ANNC_TYPE` "+ // 38 + "from `LOG_LINES` where "+ + "`LOG_NAME`='"+RDEscapeString(q->value(0).toString())+"' "+ + "order by `COUNT`"; q1=new RDSqlQuery(sql); while(q1->next()) { sql=QString("insert into `")+tablename+"` set "+ - QString().sprintf("ID=%d,",q1->value(0).toInt())+ - QString().sprintf("COUNT=%d,",q1->value(1).toInt())+ - QString().sprintf("TYPE=%d,",q1->value(2).toInt())+ - QString().sprintf("SOURCE=%d,",q1->value(3).toInt())+ - QString().sprintf("START_TIME=%d,",q1->value(4).toInt())+ - QString().sprintf("GRACE_TIME=%d,",q1->value(5).toInt())+ - QString().sprintf("CART_NUMBER=%u,",q1->value(6).toUInt())+ - QString().sprintf("TIME_TYPE=%d,",q1->value(7).toInt())+ - "POST_POINT=\""+RDEscapeString(q1->value(8).toString())+"\","+ - QString().sprintf("TRANS_TYPE=%d,",q1->value(9).toInt())+ - QString().sprintf("START_POINT=%d,",q1->value(10).toInt())+ - QString().sprintf("END_POINT=%d,",q1->value(11).toInt())+ - QString().sprintf("FADEUP_POINT=%d,",q1->value(12).toInt())+ - QString().sprintf("FADEUP_GAIN=%d,",q1->value(13).toInt())+ - QString().sprintf("FADEDOWN_POINT=%d,",q1->value(14).toInt())+ - QString().sprintf("FADEDOWN_GAIN=%d,",q1->value(15).toInt())+ - QString().sprintf("SEGUE_START_POINT=%d,",q1->value(16).toInt())+ - QString().sprintf("SEGUE_END_POINT=%d,",q1->value(17).toInt())+ - QString().sprintf("SEGUE_GAIN=%d,",q1->value(18).toInt())+ - QString().sprintf("DUCK_UP_GAIN=%d,",q1->value(19).toInt())+ - QString().sprintf("DUCK_DOWN_GAIN=%d,",q1->value(20).toInt())+ - "COMMENT=\""+RDEscapeString(q1->value(21).toString())+"\","+ - "LABEL=\""+RDEscapeString(q1->value(22).toString())+"\","+ - "ORIGIN_USER=\""+RDEscapeString(q1->value(23).toString())+"\","+ - "ORIGIN_DATETIME="+ + QString().sprintf("`ID`=%d,",q1->value(0).toInt())+ + QString().sprintf("`COUNT`=%d,",q1->value(1).toInt())+ + QString().sprintf("`TYPE`=%d,",q1->value(2).toInt())+ + QString().sprintf("`SOURCE`=%d,",q1->value(3).toInt())+ + QString().sprintf("`START_TIME`=%d,",q1->value(4).toInt())+ + QString().sprintf("`GRACE_TIME`=%d,",q1->value(5).toInt())+ + QString().sprintf("`CART_NUMBER`=%u,",q1->value(6).toUInt())+ + QString().sprintf("`TIME_TYPE`=%d,",q1->value(7).toInt())+ + "`POST_POINT`='"+RDEscapeString(q1->value(8).toString())+"',"+ + QString().sprintf("`TRANS_TYPE`=%d,",q1->value(9).toInt())+ + QString().sprintf("`START_POINT`=%d,",q1->value(10).toInt())+ + QString().sprintf("`END_POINT`=%d,",q1->value(11).toInt())+ + QString().sprintf("`FADEUP_POINT`=%d,",q1->value(12).toInt())+ + QString().sprintf("`FADEUP_GAIN`=%d,",q1->value(13).toInt())+ + QString().sprintf("`FADEDOWN_POINT`=%d,",q1->value(14).toInt())+ + QString().sprintf("`FADEDOWN_GAIN`=%d,",q1->value(15).toInt())+ + QString().sprintf("`SEGUE_START_POINT`=%d,",q1->value(16).toInt())+ + QString().sprintf("`SEGUE_END_POINT`=%d,",q1->value(17).toInt())+ + QString().sprintf("`SEGUE_GAIN`=%d,",q1->value(18).toInt())+ + QString().sprintf("`DUCK_UP_GAIN`=%d,",q1->value(19).toInt())+ + QString().sprintf("`DUCK_DOWN_GAIN`=%d,",q1->value(20).toInt())+ + "`COMMENT`='"+RDEscapeString(q1->value(21).toString())+"',"+ + "`LABEL`='"+RDEscapeString(q1->value(22).toString())+"',"+ + "`ORIGIN_USER`='"+RDEscapeString(q1->value(23).toString())+"',"+ + "`ORIGIN_DATETIME`="+ RDCheckDateTime(q1->value(24).toDateTime(),"yyyy-MM-dd hh:mm:ss")+","+ - QString().sprintf("EVENT_LENGTH=%d,",q1->value(25).toInt())+ - "LINK_EVENT_NAME=\""+RDEscapeString(q1->value(26).toString())+"\","+ - QString().sprintf("LINK_START_TIME=%d,",q1->value(27).toInt())+ - QString().sprintf("LINK_LENGTH=%d,",q1->value(28).toInt())+ - QString().sprintf("LINK_START_SLOP=%d,",q1->value(29).toInt())+ - QString().sprintf("LINK_END_SLOP=%d,",q1->value(30).toInt())+ - QString().sprintf("LINK_ID=%d,",q1->value(31).toInt())+ - "LINK_EMBEDDED=\""+RDEscapeString(q1->value(32).toString())+"\","+ - "EXT_START_TIME="+ + QString().sprintf("`EVENT_LENGTH`=%d,",q1->value(25).toInt())+ + "`LINK_EVENT_NAME`='"+RDEscapeString(q1->value(26).toString())+"',"+ + QString().sprintf("`LINK_START_TIME`=%d,",q1->value(27).toInt())+ + QString().sprintf("`LINK_LENGTH`=%d,",q1->value(28).toInt())+ + QString().sprintf("`LINK_START_SLOP`=%d,",q1->value(29).toInt())+ + QString().sprintf("`LINK_END_SLOP`=%d,",q1->value(30).toInt())+ + QString().sprintf("`LINK_ID`=%d,",q1->value(31).toInt())+ + "`LINK_EMBEDDED`='"+RDEscapeString(q1->value(32).toString())+"',"+ + "`EXT_START_TIME`="+ RDCheckDateTime(q1->value(33).toTime(),"hh:mm:ss")+","+ - QString().sprintf("EXT_LENGTH=%d,",q1->value(34).toInt())+ - "EXT_CART_NAME=\""+RDEscapeString(q1->value(35).toString())+"\","+ - "EXT_DATA=\""+RDEscapeString(q1->value(36).toString())+"\","+ - "EXT_EVENT_ID=\""+RDEscapeString(q1->value(37).toString())+"\","+ - "EXT_ANNC_TYPE=\""+RDEscapeString(q1->value(38).toString())+"\""; + QString().sprintf("`EXT_LENGTH`=%d,",q1->value(34).toInt())+ + "`EXT_CART_NAME`='"+RDEscapeString(q1->value(35).toString())+"',"+ + "`EXT_DATA`='"+RDEscapeString(q1->value(36).toString())+"',"+ + "`EXT_EVENT_ID`='"+RDEscapeString(q1->value(37).toString())+"',"+ + "`EXT_ANNC_TYPE`='"+RDEscapeString(q1->value(38).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3431,26 +3424,26 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) // Revert 286 // if((cur_schema==286)&&(set_schema=0;i--) { - sql=QString("alter table RDAIRPLAY add column ")+ - QString().sprintf("STOP_RML%d char(255) after INSTANCE",i); + sql=QString("alter table `RDAIRPLAY` add column ")+ + QString().sprintf("`STOP_RML%d` char(255) after `INSTANCE`",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column ")+ - QString().sprintf("START_RML%d char(255) after INSTANCE",i); + sql=QString("alter table `RDAIRPLAY` add column ")+ + QString().sprintf("`START_RML%d` char(255) after `INSTANCE`",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column ")+ - QString().sprintf("PORT%d int default 0 after INSTANCE",i); + sql=QString("alter table `RDAIRPLAY` add column ")+ + QString().sprintf("`PORT%d` int default 0 after `INSTANCE`",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column ")+ - QString().sprintf("CARD%d int default 0 after INSTANCE",i); + sql=QString("alter table `RDAIRPLAY` add column ")+ + QString().sprintf("`CARD%d` int default 0 after `INSTANCE`",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } - sql=QString("alter table RDAIRPLAY add column ")+ - "OP_MODE int default 2 after TRANS_LENGTH"; + sql=QString("alter table `RDAIRPLAY` add column ")+ + "`OP_MODE` int default 2 after `TRANS_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column ")+ - "START_MODE int default 0 after OP_MODE"; + sql=QString("alter table `RDAIRPLAY` add column ")+ + "`START_MODE` int default 0 after `OP_MODE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDPANEL add column INSTANCE int unsigned ")+ - "not null default 0 after STATION"; + sql=QString("alter table `RDPANEL` add column `INSTANCE` int unsigned ")+ + "not null default 0 after `STATION`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } for(int i=9;i>=6;i--) { - sql=QString("alter table RDPANEL add column ")+ - QString().sprintf("STOP_RML%d char(255) after INSTANCE",i); + sql=QString("alter table `RDPANEL` add column ")+ + QString().sprintf("`STOP_RML%d` char(255) after `INSTANCE`",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDPANEL add column ")+ - QString().sprintf("START_RML%d char(255) after INSTANCE",i); + sql=QString("alter table `RDPANEL` add column ")+ + QString().sprintf("`START_RML%d` char(255) after `INSTANCE`",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDPANEL add column ")+ - QString().sprintf("PORT%d int default 0 after INSTANCE",i); + sql=QString("alter table `RDPANEL` add column ")+ + QString().sprintf("`PORT%d` int default 0 after `INSTANCE`",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDPANEL add column ")+ - QString().sprintf("CARD%d int default 0 after INSTANCE",i); + sql=QString("alter table `RDPANEL` add column ")+ + QString().sprintf("`CARD%d` int default 0 after `INSTANCE`",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } for(int i=3;i>=2;i--) { - sql=QString("alter table RDPANEL add column ")+ - QString().sprintf("STOP_RML%d char(255) after INSTANCE",i); + sql=QString("alter table `RDPANEL` add column ")+ + QString().sprintf("`STOP_RML%d` char(255) after `INSTANCE`",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDPANEL add column ")+ - QString().sprintf("START_RML%d char(255) after INSTANCE",i); + sql=QString("alter table `RDPANEL` add column ")+ + QString().sprintf("`START_RML%d` char(255) after `INSTANCE`",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDPANEL add column ")+ - QString().sprintf("PORT%d int default 0 after INSTANCE",i); + sql=QString("alter table `RDPANEL` add column ")+ + QString().sprintf("`PORT%d` int default 0 after `INSTANCE`",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDPANEL add column ")+ - QString().sprintf("CARD%d int default 0 after INSTANCE",i); + sql=QString("alter table `RDPANEL` add column ")+ + QString().sprintf("`CARD%d` int default 0 after `INSTANCE`",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } - sql=QString("alter table MATRICES alter column PORT drop default"); + sql=QString("alter table `MATRICES` alter column `PORT` drop default"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table MATRICES alter column PORT_2 drop default"); + sql=QString("alter table `MATRICES` alter column `PORT_2` drop default"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table MATRICES alter column INPUTS drop default"); + sql=QString("alter table `MATRICES` alter column `INPUTS` drop default"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table MATRICES alter column OUTPUTS drop default"); + sql=QString("alter table `MATRICES` alter column `OUTPUTS` drop default"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table MATRICES alter column GPIS drop default"); + sql=QString("alter table `MATRICES` alter column `GPIS` drop default"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table MATRICES alter column GPOS drop default"); + sql=QString("alter table `MATRICES` alter column `GPOS` drop default"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPLICATORS alter column TYPE_ID drop default"); + sql=QString("alter table `REPLICATORS` alter column `TYPE_ID` drop default"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3684,57 +3677,57 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) // Revert 283 // if((cur_schema==283)&&(set_schemanext()) { for(int i=0;i<8;i++) { - sql=QString("insert into AUDIO_PORTS set ")+ - "STATION_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - QString().sprintf("CARD_NUMBER=%d",i); + sql=QString("insert into `AUDIO_PORTS` set ")+ + "`STATION_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + QString().sprintf("`CARD_NUMBER`=%d",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3742,24 +3735,24 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) } delete q; sql=QString("select ")+ - "STATION_NAME,"+ // 00 - "CARD_NUMBER,"+ // 01 - "PORT_NUMBER,"+ // 02 - "LEVEL,"+ // 03 - "TYPE,"+ // 04 - "MODE "+ // 05 - "from AUDIO_INPUTS where PORT_NUMBER<8"; + "`STATION_NAME`,"+ // 00 + "`CARD_NUMBER`,"+ // 01 + "`PORT_NUMBER`,"+ // 02 + "`LEVEL`,"+ // 03 + "`TYPE`,"+ // 04 + "`MODE` "+ // 05 + "from `AUDIO_INPUTS` where `PORT_NUMBER`<8"; q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("update AUDIO_PORTS set ")+ - QString().sprintf("INPUT_%d_LEVEL=%d,", + sql=QString("update `AUDIO_PORTS` set ")+ + QString().sprintf("`INPUT_%d_LEVEL`=%d,", q->value(2).toInt(),q->value(3).toInt())+ - QString().sprintf("INPUT_%d_TYPE=%d,", + QString().sprintf("`INPUT_%d_TYPE`=%d,", q->value(2).toInt(),q->value(4).toInt())+ - QString().sprintf("INPUT_%d_MODE=%d where ", + QString().sprintf("`INPUT_%d_MODE`=%d where ", q->value(2).toInt(),q->value(5).toInt())+ - "STATION_NAME=\""+RDEscapeString(q->value(0).toString())+"\" && "+ - QString().sprintf("CARD_NUMBER=%d",q->value(1).toInt()); + "STATION_NAME='"+RDEscapeString(q->value(0).toString())+"' && "+ + QString().sprintf("`CARD_NUMBER`=%d",q->value(1).toInt()); } delete q; if(!DropTable("AUDIO_INPUTS",err_msg)) { @@ -3767,18 +3760,18 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) } sql=QString("select ")+ - "STATION_NAME,"+ // 00 - "CARD_NUMBER,"+ // 01 - "PORT_NUMBER,"+ // 02 - "LEVEL "+ // 03 - "from AUDIO_OUTPUTS where PORT_NUMBER<8"; + "`STATION_NAME`,"+ // 00 + "`CARD_NUMBER`,"+ // 01 + "`PORT_NUMBER`,"+ // 02 + "`LEVEL` "+ // 03 + "from `AUDIO_OUTPUTS` where `PORT_NUMBER`<8"; q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("update AUDIO_PORTS set ")+ - QString().sprintf("OUTPUT_%d_LEVEL=%d where ", + sql=QString("update `AUDIO_PORTS` set ")+ + QString().sprintf("`OUTPUT_%d_LEVEL`=%d where ", q->value(2).toInt(),q->value(3).toInt())+ - "STATION_NAME=\""+RDEscapeString(q->value(0).toString())+"\" && "+ - QString().sprintf("CARD_NUMBER=%d",q->value(1).toInt()); + "`STATION_NAME`='"+RDEscapeString(q->value(0).toString())+"' && "+ + QString().sprintf("`CARD_NUMBER`=%d",q->value(1).toInt()); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3789,16 +3782,16 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) } sql=QString("select ")+ - "STATION_NAME,"+ // 00 - "CARD_NUMBER,"+ // 01 - "CLOCK_SOURCE "+ // 02 - "from AUDIO_CARDS where CARD_NUMBER<8"; + "`STATION_NAME`,"+ // 00 + "`CARD_NUMBER`,"+ // 01 + "`CLOCK_SOURCE` "+ // 02 + "from `AUDIO_CARDS` where `CARD_NUMBER`<8"; q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("update AUDIO_PORTS set ")+ - QString().sprintf("CLOCK_SOURCE=%d where ",q->value(2).toInt())+ - "STATION_NAME=\""+RDEscapeString(q->value(0).toString())+"\" && "+ - QString().sprintf("CARD_NUMBER=%d",q->value(1).toInt()); + sql=QString("update `AUDIO_PORTS` set ")+ + QString().sprintf("`CLOCK_SOURCE`=%d where ",q->value(2).toInt())+ + "`STATION_NAME`='"+RDEscapeString(q->value(0).toString())+"' && "+ + QString().sprintf("`CARD_NUMBER`=%d",q->value(1).toInt()); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3814,26 +3807,26 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) // if((cur_schema==282)&&(set_schema=0;i--) { - sql=QString("alter table STATIONS add column ")+ - QString().sprintf("CARD%d_OUTPUTS int default -1 after ALSA_VERSION",i); + sql=QString("alter table `STATIONS` add column ")+ + QString().sprintf("`CARD%d_OUTPUTS` int default -1 after `ALSA_VERSION`",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STATIONS add column ")+ - QString().sprintf("CARD%d_INPUTS int default -1 after ALSA_VERSION",i); + sql=QString("alter table `STATIONS` add column ")+ + QString().sprintf("`CARD%d_INPUTS` int default -1 after `ALSA_VERSION`",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STATIONS add column ")+ - QString().sprintf("CARD%d_NAME char(64) after ALSA_VERSION",i); + sql=QString("alter table `STATIONS` add column ")+ + QString().sprintf("`CARD%d_NAME` char(64) after `ALSA_VERSION`",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STATIONS add column ")+ - QString().sprintf("CARD%d_DRIVER int default 0 after ALSA_VERSION",i); + sql=QString("alter table `STATIONS` add column ")+ + QString().sprintf("`CARD%d_DRIVER` int default 0 after `ALSA_VERSION`",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3859,7 +3852,7 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) // Revert 280 // if((cur_schema==280)&&(set_schema=100"); + sql=QString("delete from `LOG_MODES` where `MACHINE`>=100"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3871,7 +3864,7 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) // Revert 279 // if((cur_schema==279)&&(set_schema=100"); + sql=QString("delete from `RDAIRPLAY_CHANNELS` where `INSTANCE`>=100"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3884,142 +3877,142 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) // if((cur_schema==278)&&(set_schema=0;i--) { - sql=QString("alter table RDAIRPLAY add column ")+ - QString().sprintf("LOG_RML%d char(255) after DESCRIPTION_TEMPLATE",i); + sql=QString("alter table `RDAIRPLAY` add column ")+ + QString().sprintf("`LOG_RML%d` char(255) after `DESCRIPTION_TEMPLATE`",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column ")+ - QString().sprintf("UDP_STRING%d char(255) after DESCRIPTION_TEMPLATE",i); + sql=QString("alter table `RDAIRPLAY` add column ")+ + QString().sprintf("`UDP_STRING%d` char(255) after `DESCRIPTION_TEMPLATE`",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column ")+ - QString().sprintf("UDP_PORT%d int unsigned after DESCRIPTION_TEMPLATE",i); + sql=QString("alter table `RDAIRPLAY` add column ")+ + QString().sprintf("`UDP_PORT%d` int unsigned after `DESCRIPTION_TEMPLATE`",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column ")+ - QString().sprintf("UDP_ADDR%d char(255) after DESCRIPTION_TEMPLATE",i); + sql=QString("alter table `RDAIRPLAY` add column ")+ + QString().sprintf("`UDP_ADDR%d` char(255) after `DESCRIPTION_TEMPLATE`",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column ")+ - QString().sprintf("LOG%d_START_MODE int default 0 ",i)+ - "after AUDITION_PREROLL"; + sql=QString("alter table `RDAIRPLAY` add column ")+ + QString().sprintf("`LOG%d_START_MODE` int default 0 ",i)+ + "after `AUDITION_PREROLL`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column ")+ - QString().sprintf("LOG%d_NEXT_CART int unsigned default 0 ",i)+ - "after AUDITION_PREROLL"; + sql=QString("alter table `RDAIRPLAY` add column ")+ + QString().sprintf("`LOG%d_NEXT_CART` int unsigned default 0 ",i)+ + "after `AUDITION_PREROLL`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column ")+ - QString().sprintf("LOG%d_NOW_CART int unsigned default 0 ",i)+ - "after AUDITION_PREROLL"; + sql=QString("alter table `RDAIRPLAY` add column ")+ + QString().sprintf("`LOG%d_NOW_CART` int unsigned default 0 ",i)+ + "after `AUDITION_PREROLL`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column ")+ - QString().sprintf("LOG%d_LOG_LINE int default -1 ",i)+ - "after AUDITION_PREROLL"; + sql=QString("alter table `RDAIRPLAY` add column ")+ + QString().sprintf("`LOG%d_LOG_LINE` int default -1 ",i)+ + "after `AUDITION_PREROLL`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column ")+ - QString().sprintf("LOG%d_LOG_ID int default -1 ",i)+ - "after AUDITION_PREROLL"; + sql=QString("alter table `RDAIRPLAY` add column ")+ + QString().sprintf("`LOG%d_LOG_ID` int default -1 ",i)+ + "after `AUDITION_PREROLL`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column ")+ - QString().sprintf("LOG%d_RUNNING enum('N','Y') default 'N' ",i)+ - "after AUDITION_PREROLL"; + sql=QString("alter table `RDAIRPLAY` add column ")+ + QString().sprintf("`LOG%d_RUNNING` enum('N','Y') default 'N' ",i)+ + "after `AUDITION_PREROLL`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column ")+ - QString().sprintf("LOG%d_CURRENT_LOG char(64) ",i)+ - "after AUDITION_PREROLL"; + sql=QString("alter table `RDAIRPLAY` add column ")+ + QString().sprintf("`LOG%d_CURRENT_LOG` char(64) ",i)+ + "after `AUDITION_PREROLL`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column ")+ - QString().sprintf("LOG%d_LOG_NAME char(64) ",i)+ - "after AUDITION_PREROLL"; + sql=QString("alter table `RDAIRPLAY` add column ")+ + QString().sprintf("`LOG%d_LOG_NAME` char(64) ",i)+ + "after `AUDITION_PREROLL`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column ")+ - QString().sprintf("LOG%d_AUTO_RESTART enum('N','Y') default 'N' ",i)+ - "after AUDITION_PREROLL"; + sql=QString("alter table `RDAIRPLAY` add column ")+ + QString().sprintf("`LOG%d_AUTO_RESTART` enum('N','Y') default 'N' ",i)+ + "after `AUDITION_PREROLL`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } sql=QString("select ")+ - "STATION_NAME,"+ // 00 - "MACHINE,"+ // 01 - "START_MODE,"+ // 02 - "AUTO_RESTART,"+ // 03 - "LOG_NAME,"+ // 04 - "CURRENT_LOG,"+ // 05 - "RUNNING,"+ // 06 - "LOG_ID,"+ // 07 - "LOG_LINE,"+ // 08 - "NOW_CART,"+ // 09 - "NEXT_CART,"+ // 10 - "UDP_ADDR,"+ // 11 - "UDP_PORT,"+ // 12 - "UDP_STRING,"+ // 13 - "LOG_RML "+ // 14 - "from LOG_MACHINES where "+ - "MACHINE<3"; + "`STATION_NAME`,"+ // 00 + "`MACHINE`,"+ // 01 + "`START_MODE`,"+ // 02 + "`AUTO_RESTART`,"+ // 03 + "`LOG_NAME`,"+ // 04 + "`CURRENT_LOG`,"+ // 05 + "`RUNNING`,"+ // 06 + "`LOG_ID`,"+ // 07 + "`LOG_LINE`,"+ // 08 + "`NOW_CART`,"+ // 09 + "`NEXT_CART`,"+ // 10 + "`UDP_ADDR`,"+ // 11 + "`UDP_PORT`,"+ // 12 + "`UDP_STRING`,"+ // 13 + "`LOG_RML` "+ // 14 + "from `LOG_MACHINES` where "+ + "`MACHINE`<3"; q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("update RDAIRPLAY set ")+ - QString().sprintf("UDP_ADDR%d=\"",q->value(1).toInt())+ - RDEscapeString(q->value(11).toString())+"\","+ - QString().sprintf("UDP_PORT%d=%u,", + sql=QString("update `RDAIRPLAY` set ")+ + QString().sprintf("`UDP_ADDR%d`='",q->value(1).toInt())+ + RDEscapeString(q->value(11).toString())+"',"+ + QString().sprintf("`UDP_PORT%d`=%u,", q->value(1).toInt(),q->value(12).toUInt())+ - QString().sprintf("UDP_STRING%d=\"",q->value(1).toInt())+ - RDEscapeString(q->value(13).toString())+"\","+ - QString().sprintf("LOG_RML%d=\"",q->value(1).toInt())+ - RDEscapeString(q->value(14).toString())+"\","+ - QString().sprintf("LOG%d_START_MODE=%d,", + QString().sprintf("`UDP_STRING%d`='",q->value(1).toInt())+ + RDEscapeString(q->value(13).toString())+"',"+ + QString().sprintf("`LOG_RML%d`='",q->value(1).toInt())+ + RDEscapeString(q->value(14).toString())+"',"+ + QString().sprintf("`LOG%d_START_MODE`=%d,", q->value(1).toInt(),q->value(2).toInt())+ - QString().sprintf("LOG%d_AUTO_RESTART=\"",q->value(1).toInt())+ - RDEscapeString(q->value(3).toString())+"\","+ - QString().sprintf("LOG%d_LOG_NAME=\"",q->value(1).toInt())+ - RDEscapeString(q->value(4).toString())+"\","+ - QString().sprintf("LOG%d_CURRENT_LOG=\"",q->value(1).toInt())+ - RDEscapeString(q->value(5).toString())+"\","+ - QString().sprintf("LOG%d_RUNNING=\"",q->value(1).toInt())+ - RDEscapeString(q->value(6).toString())+"\","+ - QString().sprintf("LOG%d_LOG_ID=%d,", + QString().sprintf("`LOG%d_AUTO_RESTART`='",q->value(1).toInt())+ + RDEscapeString(q->value(3).toString())+"',"+ + QString().sprintf("`LOG%d_LOG_NAME`='",q->value(1).toInt())+ + RDEscapeString(q->value(4).toString())+"',"+ + QString().sprintf("`LOG%d_CURRENT_LOG`='",q->value(1).toInt())+ + RDEscapeString(q->value(5).toString())+"',"+ + QString().sprintf("`LOG%d_RUNNING`='",q->value(1).toInt())+ + RDEscapeString(q->value(6).toString())+"',"+ + QString().sprintf("`LOG%d_LOG_ID`=%d,", q->value(1).toInt(),q->value(7).toInt())+ - QString().sprintf("LOG%d_LOG_LINE=%d,", + QString().sprintf("`LOG%d_LOG_LINE`=%d,", q->value(1).toInt(),q->value(8).toInt())+ - QString().sprintf("LOG%d_NOW_CART=%d,", + QString().sprintf("`LOG%d_NOW_CART`=%d,", q->value(1).toInt(),q->value(9).toInt())+ - QString().sprintf("LOG%d_NEXT_CART=%d ", + QString().sprintf("`LOG%d_NEXT_CART`=%d ", q->value(1).toInt(),q->value(10).toInt())+ - "where STATION=\""+RDEscapeString(q->value(0).toString())+"\""; + "where `STATION`='"+RDEscapeString(q->value(0).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4064,7 +4057,7 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) // Revert 274 // if((cur_schema==274)&&(set_schemanext()) { - sql=QString("update SERVICES set ")+ - QString().sprintf("CLOCK%d=",q->value(1).toInt()); + sql=QString("update `SERVICES` set ")+ + QString().sprintf("`CLOCK%d`=",q->value(1).toInt()); if(q->value(2).isNull()) { sql+="null "; } else { - sql+="\""+RDEscapeString(q->value(2).toString())+"\" "; + sql+="'"+RDEscapeString(q->value(2).toString())+"' "; } - sql+="where NAME=\""+RDEscapeString(q->value(0).toString())+"\""; + sql+="where `NAME`='"+RDEscapeString(q->value(0).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4255,14 +4248,14 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) // Revert 258 // if((cur_schema==258)&&(set_schemanext()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table ")+ "`"+tablename+"_LOG` "+ - "modify column CART_NUMBER int unsigned not null"; + "modify column `CART_NUMBER` int unsigned not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4276,17 +4269,17 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) // Revert 257 // if((cur_schema==257)&&(set_schemanext()) { tablename=q->value(0).toString(); @@ -4421,7 +4414,7 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg) // Revert 244 // if((cur_schema==244)&&(set_schema=3)) { + if((cur_schema<3)&&(set_schema>=3)) { // // Create RDAIRPLAY Table // - sql=QString("create table if not exists RDAIRPLAY (")+ - "ID int not null primary key,"+ - "STATION char(40) not null,"+ - "INSTANCE int unsigned not null,"+ - "AUTO_CARD0 int default -1,"+ - "AUTO_STREAM0 int default -1,"+ - "AUTO_PORT0 int default -1,"+ - "AUTO_CARD1 int default -1,"+ - "AUTO_STREAM1 int default -1,"+ - "AUTO_PORT1 int default -1,"+ - "PANEL_CARD0 int default -1,"+ - "PANEL_STREAM0 int default -1,"+ - "PANEL_PORT0 int default -1,"+ - "PANEL_CARD1 int default -1,"+ - "PANEL_STREAM1 int default -1,"+ - "PANEL_PORT1 int default -1,"+ - "index STATION_IDX (STATION,INSTANCE))"+ + sql=QString("create table if not exists `RDAIRPLAY` (")+ + "`ID` int not null primary key,"+ + "`STATION` char(40) not null,"+ + "`INSTANCE` int unsigned not null,"+ + "`AUTO_CARD0` int default -1,"+ + "`AUTO_STREAM0` int default -1,"+ + "`AUTO_PORT0` int default -1,"+ + "`AUTO_CARD1` int default -1,"+ + "`AUTO_STREAM1` int default -1,"+ + "`AUTO_PORT1` int default -1,"+ + "`PANEL_CARD0` int default -1,"+ + "`PANEL_STREAM0` int default -1,"+ + "`PANEL_PORT0` int default -1,"+ + "`PANEL_CARD1` int default -1,"+ + "`PANEL_STREAM1` int default -1,"+ + "`PANEL_PORT1` int default -1,"+ + "index `STATION_IDX` (`STATION`,`INSTANCE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -66,8 +66,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // // Create Default RDAirPlay Configuration // - sql=QString("insert into RDAIRPLAY (STATION,INSTANCE) ")+ - "values (\"DEFAULT\",0)"; + sql=QString("insert into `RDAIRPLAY` (`STATION`,`INSTANCE`) ")+ + "values ('`DEFAULT`',0)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -77,7 +77,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<4)&&(set_schema>cur_schema)) { - sql=QString("alter table RDAIRPLAY modify ID int not null auto_increment"); + sql=QString("alter table `RDAIRPLAY` modify `ID` int not null auto_increment"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -86,10 +86,10 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<5)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("select NAME from LOGS",false); + q=new RDSqlQuery("select `NAME` from `LOGS`",false); while(q->next()) { sql=QString("alter table `")+q->value(0).toString()+"_LOG` "+ - "add SOURCE int not null after COUNT"; + "add `SOURCE` int not null after `COUNT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -103,67 +103,67 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // // Update RDAIRPLAY Structure // - sql=QString("alter table RDAIRPLAY add column CARD int default -1"); + sql=QString("alter table `RDAIRPLAY` add column `CARD` int default -1"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column PORT0 int default -1"); + sql=QString("alter table `RDAIRPLAY` add column `PORT0` int default -1"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column PORT1 int default -1"); + sql=QString("alter table `RDAIRPLAY` add column `PORT1` int default -1"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column PORT2 int default -1"); + sql=QString("alter table `RDAIRPLAY` add column `PORT2` int default -1"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column STREAM0 int default -1"); + sql=QString("alter table `RDAIRPLAY` add column `STREAM0` int default -1"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column STREAM1 int default -1"); + sql=QString("alter table `RDAIRPLAY` add column `STREAM1` int default -1"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column STREAM2 int default -1"); + sql=QString("alter table `RDAIRPLAY` add column `STREAM2` int default -1"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column STREAM3 int default -1"); + sql=QString("alter table `RDAIRPLAY` add column `STREAM3` int default -1"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column STREAM4 int default -1"); + sql=QString("alter table `RDAIRPLAY` add column `STREAM4` int default -1"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column STREAM5 int default -1"); + sql=QString("alter table `RDAIRPLAY` add column `STREAM5` int default -1"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column STREAM6 int default -1"); + sql=QString("alter table `RDAIRPLAY` add column `STREAM6` int default -1"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column STREAM7 int default -1"); + sql=QString("alter table `RDAIRPLAY` add column `STREAM7` int default -1"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } for(int i=0;i<2;i++) { - DropColumn("RDAIRPLAY",QString().sprintf("AUTO_CARD%d",i)); - DropColumn("RDAIRPLAY",QString().sprintf("AUTO_STREAM%d",i)); - DropColumn("RDAIRPLAY",QString().sprintf("AUTO_PORT%d",i)); - DropColumn("RDAIRPLAY",QString().sprintf("PANEL_CARD%d",i)); - DropColumn("RDAIRPLAY",QString().sprintf("PANEL_STREAM%d",i)); - DropColumn("RDAIRPLAY",QString().sprintf("PANEL_PORT%d",i)); + DropColumn("`RDAIRPLAY`",QString().sprintf("`AUTO_CARD%d`",i)); + DropColumn("`RDAIRPLAY`",QString().sprintf("`AUTO_STREAM%d`",i)); + DropColumn("`RDAIRPLAY`",QString().sprintf("`AUTO_PORT%d`",i)); + DropColumn("`RDAIRPLAY`",QString().sprintf("`PANEL_CARD%d`",i)); + DropColumn("`RDAIRPLAY`",QString().sprintf("`PANEL_STREAM%d`",i)); + DropColumn("`RDAIRPLAY`",QString().sprintf("`PANEL_PORT%d`",i)); } WriteSchemaVersion(++cur_schema); } if((cur_schema<7)&&(set_schema>cur_schema)) { - sql=QString("alter table RDAIRPLAY add column SEGUE_LENGTH int default 0"); + sql=QString("alter table `RDAIRPLAY` add column `SEGUE_LENGTH` int default 0"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -172,23 +172,23 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<8)&&(set_schema>cur_schema)) { - sql=QString("alter table RDAIRPLAY add column PORT3 int default -1"); + sql=QString("alter table `RDAIRPLAY` add column `PORT3` int default -1"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column OP_MODE int default 0"); + sql=QString("alter table `RDAIRPLAY` add column `OP_MODE` int default 0"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column START_MODE int default 0"); + sql=QString("alter table `RDAIRPLAY` add column `START_MODE` int default 0"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column PIE_COUNT_LENGTH int default 15000"); + sql=QString("alter table `RDAIRPLAY` add column `PIE_COUNT_LENGTH` int default 15000"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column PIE_COUNT_ENDPOINT int default 0"); + sql=QString("alter table `RDAIRPLAY` add column `PIE_COUNT_ENDPOINT` int default 0"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -197,11 +197,11 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<9)&&(set_schema>cur_schema)) { - sql=QString("alter table RDAIRPLAY add column PORT4 int default -1"); + sql=QString("alter table `RDAIRPLAY` add column `PORT4` int default -1"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column PORT5 int default -1"); + sql=QString("alter table `RDAIRPLAY` add column `PORT5` int default -1"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -210,34 +210,34 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<10)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("select NAME from LOGS",false); + q=new RDSqlQuery("select `NAME` from `LOGS`",false); while(q->next()) { sql=QString("alter table `")+ - q->value(0).toString()+"_LOG` add TYPE int default 0 after COUNT"; + q->value(0).toString()+"_LOG` add `TYPE` int default 0 after `COUNT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+ - q->value(0).toString()+"_LOG` add COMMENT char(255)"; + q->value(0).toString()+"_LOG` add `COMMENT` char(255)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+ - q->value(0).toString()+"_LOG` add LABEL char(10)"; + q->value(0).toString()+"_LOG` add `LABEL` char(10)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+ - q->value(0).toString()+"_LOG` add POST_TIME time default '24:00:00'"; + q->value(0).toString()+"_LOG` add `POST_TIME` time default '24:00:00'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+ - q->value(0).toString()+"_LOG` add index LABEL_IDX (LABEL)"; + q->value(0).toString()+"_LOG` add index `LABEL_IDX` (`LABEL`)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -249,23 +249,23 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) if((cur_schema<11)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table RDAIRPLAY add column CHECK_TIMESYNC enum('N','Y') default 'N'",false); + q=new RDSqlQuery("alter table `RDAIRPLAY` add column `CHECK_TIMESYNC` enum('N','Y') default 'N'",false); delete q; // // Create PANELS Table // sql=QString("create table if not exists PANELS (")+ - "ID int not null primary key,"+ - "TYPE int not null,"+ - "OWNER char(64) not null,"+ - "PANEL_NO int not null,"+ - "ROW_NO int not null,"+ - "COLUMN_NO int not null,"+ - "LABEL char(64),"+ - "CART int,"+ - "DEFAULT_COLOR char(6),"+ - "index OWNER_IDX (OWNER))"+ + "`ID` int not null primary key,"+ + "`TYPE` int not null,"+ + "`OWNER` char(64) not null,"+ + "`PANEL_NO` int not null,"+ + "`ROW_NO` int not null,"+ + "`COLUMN_NO` int not null,"+ + "`LABEL` char(64),"+ + "`CART` int,"+ + "`DEFAULT_COLOR` char(6),"+ + "index `OWNER_IDX` (`OWNER`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -276,10 +276,10 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<12)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table RDAIRPLAY add column STATION_PANELS int default 3",false); + q=new RDSqlQuery("alter table `RDAIRPLAY` add column `STATION_PANELS` int default 3",false); delete q; - q=new RDSqlQuery("alter table RDAIRPLAY add column USER_PANELS int default 3",false); + q=new RDSqlQuery("alter table `RDAIRPLAY` add column `USER_PANELS` int default 3",false); delete q; WriteSchemaVersion(++cur_schema); @@ -290,17 +290,17 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) return false; } - sql=QString("create table if not exists PANELS (")+ - "ID int auto_increment not null primary key,"+ - "TYPE int not null,"+ - "OWNER char(64) not null,"+ - "PANEL_NO int not null,"+ - "ROW_NO int not null,"+ - "COLUMN_NO int not null,"+ - "LABEL char(64),"+ - "CART int,"+ - "DEFAULT_COLOR char(6),"+ - "index OWNER_IDX (OWNER))"+ + sql=QString("create table if not exists `PANELS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`TYPE` int not null,"+ + "`OWNER` char(64) not null,"+ + "`PANEL_NO` int not null,"+ + "`ROW_NO` int not null,"+ + "`COLUMN_NO` int not null,"+ + "`LABEL` char(64),"+ + "`CART` int,"+ + "`DEFAULT_COLOR` char(6),"+ + "index `OWNER_IDX` (`OWNER`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -315,18 +315,18 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) return false; } - sql=QString("create table if not exists PANELS (")+ - "ID int auto_increment not null primary key,"+ - "TYPE int not null,"+ - "OWNER char(64) not null,"+ - "PANEL_NO int not null,"+ - "ROW_NO int not null,"+ - "COLUMN_NO int not null,"+ - "LABEL char(64),"+ - "CART int,"+ - "DEFAULT_COLOR char(6),"+ - "index LOAD_IDX (TYPE,OWNER,PANEL_NO),"+ - "index SAVE_IDX (TYPE,OWNER,PANEL_NO,ROW_NO,COLUMN_NO))"+ + sql=QString("create table if not exists `PANELS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`TYPE` int not null,"+ + "`OWNER` char(64) not null,"+ + "`PANEL_NO` int not null,"+ + "`ROW_NO` int not null,"+ + "`COLUMN_NO` int not null,"+ + "`LABEL` char(64),"+ + "`CART` int,"+ + "`DEFAULT_COLOR` char(6),"+ + "index `LOAD_IDX` (`TYPE`,`OWNER`,`PANEL_NO`),"+ + "index `SAVE_IDX` (`TYPE`,`OWNER`,`PANEL_NO`,`ROW_NO`,`COLUMN_NO`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -338,7 +338,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) if((cur_schema<15)&&(set_schema>cur_schema)) { DropColumn("PANELS","DEFAULT_COLOR"); - q=new RDSqlQuery("alter table PANELS add column DEFAULT_COLOR char(7)", + q=new RDSqlQuery("alter table `PANELS` add column `DEFAULT_COLOR` char(7)", false); delete q; @@ -349,19 +349,19 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // // Create MATRICES Table // - sql=QString("create table if not exists MATRICES (")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "NAME char(64),"+ - "MATRIX int not null,"+ - "TYPE int not null,"+ - "PORT int not null,"+ - "GPIO_DEVICE char(255),"+ - "INPUTS int not null,"+ - "OUTPUTS int not null,"+ - "GPIS int not null,"+ - "GPOS int not null,"+ - "index MATRIX_IDX (STATION_NAME,MATRIX))"+ + sql=QString("create table if not exists `MATRICES` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`NAME` char(64),"+ + "`MATRIX` int not null,"+ + "`TYPE` int not null,"+ + "`PORT` int not null,"+ + "`GPIO_DEVICE` char(255),"+ + "`INPUTS` int not null,"+ + "`OUTPUTS` int not null,"+ + "`GPIS` int not null,"+ + "`GPOS` int not null,"+ + "index `MATRIX_IDX` (`STATION_NAME`,`MATRIX`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -371,14 +371,14 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // // Create INPUTS Table // - sql=QString("create table if not exists INPUTS (")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "MATRIX int not null,"+ - "NUMBER int not null,"+ - "NAME char(64),"+ - "FEED_NAME char(8),"+ - "index MATRIX_IDX (STATION_NAME,MATRIX,NUMBER))"+ + sql=QString("create table if not exists `INPUTS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`MATRIX` int not null,"+ + "`NUMBER` int not null,"+ + "`NAME` char(64),"+ + "`FEED_NAME` char(8),"+ + "index `MATRIX_IDX` (`STATION_NAME`,`MATRIX,NUMBER`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -388,13 +388,13 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // // Create OUTPUTS Table // - sql=QString("create table if not exists OUTPUTS (")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "MATRIX int not null,"+ - "NUMBER int not null,"+ - "NAME char(64),"+ - "index MATRIX_IDX (STATION_NAME,MATRIX,NUMBER))"+ + sql=QString("create table if not exists `OUTPUTS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`MATRIX` int not null,"+ + "`NUMBER` int not null,"+ + "`NAME` char(64),"+ + "index `MATRIX_IDX` (`STATION_NAME`,`MATRIX,NUMBER`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -405,14 +405,14 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<17)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table INPUTS add column CHANNEL_MODE int",false); + q=new RDSqlQuery("alter table `INPUTS` add column `CHANNEL_MODE` int",false); delete q; WriteSchemaVersion(++cur_schema); } if((cur_schema<18)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table STATIONS add column IPV4_ADDRESS char(15)", + q=new RDSqlQuery("alter table `STATIONS` add column `IPV4_ADDRESS` char(15)", false); delete q; @@ -420,27 +420,27 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<19)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists EVENTS (")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "SUN enum('N','Y') not null,"+ - "MON enum('N','Y') not null,"+ - "TUE enum('N','Y') not null,"+ - "WED enum('N','Y') not null,"+ - "THU enum('N','Y') not null,"+ - "FRI enum('N','Y') not null,"+ - "SAT enum('N','Y') not null,"+ - "TIME time not null,"+ - "DESCRIPTION char(64),"+ - "COMMAND char(255),"+ - "index STATION_IDX (STATION_NAME),"+ - "index SUN_IDX (STATION_NAME,SUN),"+ - "index MON_IDX (STATION_NAME,MON),"+ - "index TUE_IDX (STATION_NAME,TUE),"+ - "index WED_IDX (STATION_NAME,WED),"+ - "index THU_IDX (STATION_NAME,THU),"+ - "index FRI_IDX (STATION_NAME,FRI),"+ - "index SAT_IDX (STATION_NAME,SAT))"+ + sql=QString("create table if not exists `EVENTS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`SUN` enum('N','Y') not null,"+ + "`MON` enum('N','Y') not null,"+ + "`TUE` enum('N','Y') not null,"+ + "`WED` enum('N','Y') not null,"+ + "`THU` enum('N','Y') not null,"+ + "`FRI` enum('N','Y') not null,"+ + "`SAT` enum('N','Y') not null,"+ + "`TIME` time not null,"+ + "`DESCRIPTION` char(64),"+ + "`COMMAND` char(255),"+ + "index `STATION_IDX` (`STATION_NAME`),"+ + "index `SUN_IDX` (`STATION_NAME`,`SUN`),"+ + "index `MON_IDX` (`STATION_NAME`,`MON`),"+ + "index `TUE_IDX` (`STATION_NAME`,`TUE`),"+ + "index `WED_IDX` (`STATION_NAME`,`WED`),"+ + "index `THU_IDX` (`STATION_NAME`,`THU`),"+ + "index `FRI_IDX` (`STATION_NAME`,`FRI`),"+ + "index `SAT_IDX` (`STATION_NAME`,`SAT`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -451,17 +451,19 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<20)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table CART add column MACROS text",false); - delete q; + sql=QString("alter table `CART` add column `MACROS` text"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<21)&&(set_schema>cur_schema)) { - q=new - RDSqlQuery("alter table RECORDINGS add column MACRO_CART int default -1", - false); - delete q; + sql=QString("alter table `RECORDINGS` add column `MACRO_CART` int default -1"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } if(!DropTable("EVENTS",err_msg)) { return false; } @@ -472,30 +474,35 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) if((cur_schema<22)&&(set_schema>cur_schema)) { DropColumn("DECKS","SWITCH_TYPE"); DropColumn("DECKS","TTY_ID"); - q=new RDSqlQuery("alter table DECKS add column SWITCH_STATION char(64)", - false); - delete q; - q=new - RDSqlQuery("alter table DECKS add column SWITCH_MATRIX int default -1", - false); - delete q; - q=new - RDSqlQuery("alter table DECKS add column SWITCH_OUTPUT int default -1", - false); - delete q; - q=new - RDSqlQuery("alter table DECKS add column SWITCH_DELAY int default 0", - false); - delete q; + sql=QString("alter table `DECKS` add column `SWITCH_STATION` char(64)"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + sql=QString("alter table `DECKS` add column `SWITCH_MATRIX` int default -1"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `DECKS` add column `SWITCH_OUTPUT` int default -1"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `DECKS` add column `SWITCH_DELAY` int default 0"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<23)&&(set_schema>cur_schema)) { DropColumn("RECORDINGS","SOURCE_NAME"); - q=new - RDSqlQuery("alter table RECORDINGS add column SWITCH_INPUT int default -1",false); - delete q; + sql=QString("alter table `RECORDINGS` add column `SWITCH_INPUT` int default -1"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + if(!DropTable("SOURCES",err_msg)) { return false; } @@ -504,72 +511,145 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<24)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table RECORDINGS add column TYPE int default 0 after STATION_NAME",false); - delete q; - q=new RDSqlQuery("alter table RECORDINGS add column SWITCH_OUTPUT int default -1",false); - delete q; - q=new RDSqlQuery("update RECORDINGS set TYPE=1 where MACRO_CART!=-1",false); - delete q; + sql=QString("alter table `RECORDINGS` add column `TYPE` int default 0 after `STATION_NAME`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RECORDINGS` add column `SWITCH_OUTPUT` int default -1"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("update `RECORDINGS` set `TYPE`=1 where `MACRO_CART`!=-1"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<25)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table RECORDINGS drop index SUN_IDX",false); - delete q; - q=new RDSqlQuery("alter table RECORDINGS drop index MON_IDX",false); - delete q; - q=new RDSqlQuery("alter table RECORDINGS drop index TUE_IDX",false); - delete q; - q=new RDSqlQuery("alter table RECORDINGS drop index WED_IDX",false); - delete q; - q=new RDSqlQuery("alter table RECORDINGS drop index THU_IDX",false); - delete q; - q=new RDSqlQuery("alter table RECORDINGS drop index FRI_IDX",false); - delete q; - q=new RDSqlQuery("alter table RECORDINGS drop index SAT_IDX",false); - delete q; - q=new RDSqlQuery("alter table RECORDINGS add column IS_ACTIVE enum('N','Y') default 'Y' after ID",false); - delete q; - q=new RDSqlQuery("alter table RECORDINGS add index SUN_IDX (STATION_NAME,SUN,IS_ACTIVE)",false); - q=new RDSqlQuery("alter table RECORDINGS add index MON_IDX (STATION_NAME,MON,IS_ACTIVE)",false); - q=new RDSqlQuery("alter table RECORDINGS add index TUE_IDX (STATION_NAME,TUE,IS_ACTIVE)",false); - q=new RDSqlQuery("alter table RECORDINGS add index WED_IDX (STATION_NAME,WED,IS_ACTIVE)",false); - q=new RDSqlQuery("alter table RECORDINGS add index THU_IDX (STATION_NAME,THU,IS_ACTIVE)",false); - q=new RDSqlQuery("alter table RECORDINGS add index FRI_IDX (STATION_NAME,FRI,IS_ACTIVE)",false); - q=new RDSqlQuery("alter table RECORDINGS add index SAT_IDX (STATION_NAME,SAT,IS_ACTIVE)",false); - delete q; + sql=QString("alter table `RECORDINGS` drop index `SUN_IDX`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RECORDINGS` drop index `MON_IDX`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RECORDINGS` drop index `TUE_IDX`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RECORDINGS` drop index `WED_IDX`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RECORDINGS` drop index `THU_IDX`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RECORDINGS` drop index `FRI_IDX`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RECORDINGS` drop index `SAT_IDX`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RECORDINGS` add column `IS_ACTIVE` enum('N','Y') default 'Y' after ID"); + + sql=QString("alter table `RECORDINGS` add index `SUN_IDX` (`STATION_NAME`,`SUN`,`IS_ACTIVE)"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + sql=QString("alter table `RECORDINGS` add index `MON_IDX` (`STATION_NAME`,`MON`,`IS_ACTIVE)"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RECORDINGS` add index `TUE_IDX` (`STATION_NAME`,`TUE`,`IS_ACTIVE)"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RECORDINGS` add index `WED_IDX` (`STATION_NAME`,`WED`,`IS_ACTIVE)"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RECORDINGS` add index `THU_IDX` (`STATION_NAME`,`THU`,`IS_ACTIVE)"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RECORDINGS` add index `FRI_IDX` (`STATION_NAME`,`FRI`,`IS_ACTIVE)"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + sql=QString("alter table `RECORDINGS` add index `SAT_IDX` (`STATION_NAME`,`SAT`,`IS_ACTIVE)"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<26)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table RECORDINGS drop index SUN_IDX",false); - delete q; - q=new RDSqlQuery("alter table RECORDINGS drop index MON_IDX",false); - delete q; - q=new RDSqlQuery("alter table RECORDINGS drop index TUE_IDX",false); - delete q; - q=new RDSqlQuery("alter table RECORDINGS drop index WED_IDX",false); - delete q; - q=new RDSqlQuery("alter table RECORDINGS drop index THU_IDX",false); - delete q; - q=new RDSqlQuery("alter table RECORDINGS drop index FRI_IDX",false); - delete q; - q=new RDSqlQuery("alter table RECORDINGS drop index SAT_IDX",false); - delete q; + sql=QString("alter table `RECORDINGS` drop index `SUN_IDX"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RECORDINGS` drop index `MON_IDX"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RECORDINGS` drop index `TUE_IDX"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RECORDINGS` drop index `WED_IDX"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RECORDINGS` drop index `THU_IDX"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RECORDINGS` drop index `FRI_IDX"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RECORDINGS` drop index `SAT_IDX"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<27)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists GPIS (")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "MATRIX int not null,"+ - "NUMBER int not null,"+ - "MACRO_CART int default -1,"+ - "index MATRIX_IDX (STATION_NAME,MATRIX,NUMBER))"+ + sql=QString("create table if not exists `GPIS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`MATRIX` int not null,"+ + "`NUMBER` int not null,"+ + "`MACRO_CART` int default -1,"+ + "index `MATRIX_IDX` (`STATION_NAME`,`MATRIX,NUMBER`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -580,69 +660,69 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<28)&&(set_schema>cur_schema)) { - sql="alter table CUTS alter column ORIGIN_DATETIME set default NULL"; + sql=QString("alter table `CUTS` alter column `ORIGIN_DATETIME` set default NULL"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table CUTS alter column START_DATETIME set default NULL"; + sql=QString("alter table `CUTS` alter column `START_DATETIME` set default NULL"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table CUTS alter column END_DATETIME set default NULL"; + sql=QString("alter table `CUTS` alter column `END_DATETIME` set default NULL"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table CUTS alter column START_DAYPART set default NULL"; + sql=QString("alter table `CUTS` alter column `START_DAYPART` set default NULL"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table CUTS alter column END_DAYPART set default NULL"; + sql=QString("alter table `CUTS` alter column `END_DAYPART` set default NULL"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="update CUTS set ORIGIN_DATETIME=NULL where ORIGIN_DATETIME=\"0000-00-00 00:00:00\""; + sql=QString("update `CUTS` set `ORIGIN_DATETIME`=NULL where `ORIGIN_DATETIME`='0000-00-00 00:00:00'"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="update CUTS set START_DATETIME=NULL where START_DATETIME=\"0000-00-00 00:00:00\""; + sql=QString("update `CUTS` set `START_DATETIME`=NULL where `START_DATETIME`='0000-00-00 00:00:00'"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="update CUTS set END_DATETIME=NULL where END_DATETIME=\"0000-00-00 00:00:00\""; + sql=QString("update `CUTS` set `END_DATETIME`=NULL where `END_DATETIME`='0000-00-00 00:00:00'"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select NAME from LOGS"; + sql=QString("select `NAME` from `LOGS`"); q=new RDSqlQuery(sql,false); while(q->next()) { sql=QString("alter table `")+q->value(0).toString()+"_LOG` "+ - "drop index START_TIME_IDX"; + "drop index `START_TIME_IDX`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+q->value(0).toString()+"_LOG` "+ - "alter column START_TIME set default NULL"; + "alter column `START_TIME` set default NULL"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+q->value(0).toString()+"_LOG` "+ - "modify column START_TIME int"; + "modify column `START_TIME` int"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+q->value(0).toString()+"_LOG` "+ - "alter column POST_TIME set default NULL"; + "alter column `POST_TIME` set default NULL"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("update `")+q->value(0).toString()+"_LOG` "+ - "set START_TIME=NULL where START_TIME=\"00:00:00\""; + "set `START_TIME`=NULL where `START_TIME`='00:00:00'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("update `")+q->value(0).toString()+"_LOG` "+ - "set POST_TIME=NULL where POST_TIME=\"00:00:00\""; + "set `POST_TIME`=NULL where `POST_TIME`='00:00:00'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -653,51 +733,90 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<29)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table RECORDINGS add column EXIT_CODE int default 0",false); - delete q; + sql=QString("alter table `RECORDINGS` add column `EXIT_CODE` int default 0"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<30)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table RECORDINGS add column ONE_SHOT enum('N','Y') default 'N'",false); - delete q; + sql=QString("alter table `RECORDINGS` add column `ONE_SHOT` enum('N','Y') default 'N'"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<31)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table STATIONS add column TIME_OFFSET int default 0",false); - delete q; + sql=QString("alter table `STATIONS` add column `TIME_OFFSET` int default 0"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<32)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table GROUPS add column DEFAULT_LOW_CART int unsigned default 0",false); - q=new RDSqlQuery("alter table GROUPS add column DEFAULT_HIGH_CART int unsigned default 0",false); - delete q; + sql=QString("alter table `GROUPS` add column `DEFAULT_LOW_CART` int unsigned default 0"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `GROUPS` add column `DEFAULT_HIGH_CART` int unsigned default 0"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<33)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table CUTS add column SUN enum('N','Y') default 'Y' after END_DAYPART",false); - q=new RDSqlQuery("alter table CUTS add column MON enum('N','Y') default 'Y' after END_DAYPART",false); - q=new RDSqlQuery("alter table CUTS add column TUE enum('N','Y') default 'Y' after END_DAYPART",false); - q=new RDSqlQuery("alter table CUTS add column WED enum('N','Y') default 'Y' after END_DAYPART",false); - q=new RDSqlQuery("alter table CUTS add column THU enum('N','Y') default 'Y' after END_DAYPART",false); - q=new RDSqlQuery("alter table CUTS add column FRI enum('N','Y') default 'Y' after END_DAYPART",false); - q=new RDSqlQuery("alter table CUTS add column SAT enum('N','Y') default 'Y' after END_DAYPART",false); + sql=QString("alter table `CUTS` add column `SUN` enum('N','Y') default 'Y' after `END_DAYPART`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `CUTS` add column `MON` enum('N','Y') default 'Y' after `END_DAYPART`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `CUTS` add column `TUE` enum('N','Y') default 'Y' after `END_DAYPART`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `CUTS` add column `WED` enum('N','Y') default 'Y' after `END_DAYPART`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `CUTS` add column `THU` enum('N','Y') default 'Y' after `END_DAYPART`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `CUTS` add column `FRI` enum('N','Y') default 'Y' after `END_DAYPART`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `CUTS` add column `SAT` enum('N','Y') default 'Y' after `END_DAYPART`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<34)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("select NAME from LOGS",false); + q=new RDSqlQuery("select `NAME` from `LOGS`",false); while(q->next()) { - sql=QString("alter table `")+q->value(0).toString()+"_LOG "+ - "add GRACE_TIME int default 0 after START_TIME"; + sql=QString("alter table `")+q->value(0).toString()+"_LOG` "+ + "add `GRACE_TIME` int default 0 after `START_TIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -708,17 +827,20 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<35)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table RDAIRPLAY add column TRANS_LENGTH int default 0 after SEGUE_LENGTH",false); - delete q; + sql=QString("alter table `RDAIRPLAY` add column `TRANS_LENGTH` int default 0 after `SEGUE_LENGTH`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<36)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("select NAME from LOGS",false); + sql=QString("select `NAME` from `LOGS`"); + q=new RDSqlQuery(sql); while(q->next()) { sql=QString("alter table `")+q->value(0).toString()+"_LOG` "+ - "add POST_POINT enum('N','Y') default 'N' after TIME_TYPE"; + "add `POST_POINT` enum('N','Y') default 'N' after `TIME_TYPE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -729,30 +851,32 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<37)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table LOGS add column TYPE int not null default 0 after NAME",false); - delete q; + sql=QString("alter table `LOGS` add column `TYPE` int not null default 0 after `NAME`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<38)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists EVENTS (")+ - "NAME char(64) not null primary key,"+ - "PROPERTIES char(64),"+ - "DISPLAY_TEXT char(64),"+ - "NOTE_TEXT char(255),"+ - "PREPOSITION int default -1,"+ - "TIME_TYPE int default 0,"+ - "GRACE_TIME int default 0,"+ - "POST_POINT enum('N','Y') default 'N',"+ - "USE_AUTOFILL enum('N','Y') default 'N',"+ - "USE_TIMESCALE enum('N','Y') default 'N',"+ - "IMPORT_SOURCE int default 0,"+ - "START_SLOP int default 0,"+ - "END_SLOP int default 0,"+ - "FIRST_TRANS_TYPE int default 0,"+ - "DEFAULT_TRANS_TYPE int default 0,"+ - "COLOR char(7))"+ + sql=QString("create table if not exists `EVENTS` (")+ + "`NAME` char(64) not null primary key,"+ + "`PROPERTIES` char(64),"+ + "`DISPLAY_TEXT` char(64),"+ + "`NOTE_TEXT` char(255),"+ + "`PREPOSITION` int default -1,"+ + "`TIME_TYPE` int default 0,"+ + "`GRACE_TIME` int default 0,"+ + "`POST_POINT` enum('N','Y') default 'N',"+ + "`USE_AUTOFILL` enum('N','Y') default 'N',"+ + "`USE_TIMESCALE` enum('N','Y') default 'N',"+ + "`IMPORT_SOURCE` int default 0,"+ + "`START_SLOP` int default 0,"+ + "`END_SLOP` int default 0,"+ + "`FIRST_TRANS_TYPE` int default 0,"+ + "`DEFAULT_TRANS_TYPE` int default 0,"+ + "`COLOR` char(7))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -764,21 +888,21 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) if((cur_schema<39)&&(set_schema>cur_schema)) { // Transpose RDLogLine::Stop and RDLogLine::Segue - sql="select NAME from LOGS"; + sql=QString("select `NAME` from `LOGS`"); q=new RDSqlQuery(sql,false); while(q->next()) { sql=QString("update `")+q->value(0).toString()+"_LOG` set "+ - "TRANS_TYPE=100 where TRANS_TYPE=1"; + "`TRANS_TYPE`=100 where `TRANS_TYPE`=1"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("update `")+q->value(0).toString()+"_LOG` set "+ - "TRANS_TYPE=1 where TRANS_TYPE=2"; + "`TRANS_TYPE`=1 where `TRANS_TYPE`=2"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("update `")+q->value(0).toString()+"_LOG` set "+ - "TRANS_TYPE=2 where TRANS_TYPE=100"; + "`TRANS_TYPE`=2 where `TRANS_TYPE`=100"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -789,10 +913,10 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<40)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists CLOCKS (")+ - "NAME char(64) not null primary key,"+ - "SHORT_NAME char(8),"+ - "COLOR char(7))"+ + sql=QString("create table if not exists `CLOCKS` (")+ + "`NAME` char(64) not null primary key,"+ + "`SHORT_NAME` char(8),"+ + "`COLOR` char(7))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -803,75 +927,94 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<41)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table RDAIRPLAY add column CARD0 int default -1 after INSTANCE",false); - delete q; + sql=QString("alter table `RDAIRPLAY` add column `CARD0` int default -1 after `INSTANCE`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } - q=new RDSqlQuery("alter table RDAIRPLAY add column CARD1 int default -1 after PORT0",false); - delete q; + sql=QString("alter table `RDAIRPLAY` add column `CARD1` int default -1 after `PORT0`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } - q=new RDSqlQuery("alter table RDAIRPLAY add column CARD2 int default -1 after PORT1",false); - delete q; + sql=QString("alter table `RDAIRPLAY` add column `CARD2` int default -1 after `PORT1`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } - q=new RDSqlQuery("alter table RDAIRPLAY add column CARD3 int default -1 after PORT2",false); - delete q; + sql=QString("alter table `RDAIRPLAY` add column `CARD3` int default -1 after `PORT2`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } - q=new RDSqlQuery("alter table RDAIRPLAY add column CARD4 int default -1 after PORT3",false); - delete q; + sql=QString("alter table `RDAIRPLAY` add column `CARD4` int default -1 after `PORT3`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } - q=new RDSqlQuery("alter table RDAIRPLAY add column CARD5 int default -1 after PORT4",false); - delete q; - - WriteSchemaVersion(++cur_schema); - } - - if((cur_schema<42)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table SERVICES add column CLOCK0 char(64) after DESCRIPTION",false); - delete q; - for(int i=1;i<168;i++) { - sql=QString("alter table SERVICES add column ")+ - QString().sprintf("CLOCK%d char(64) after CLOCK%d",i,i-1); - q=new RDSqlQuery(sql,false); - delete q; + sql=QString("alter table `RDAIRPLAY` add column `CARD5` int default -1 after `PORT4`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; } WriteSchemaVersion(++cur_schema); } + if((cur_schema<42)&&(set_schema>cur_schema)) { + sql=QString("alter table `SERVICES` add column `CLOCK0` char(64) after DESCRIPTION"); + q=new RDSqlQuery(sql); + for(int i=1;i<168;i++) { + sql=QString("alter table `SERVICES` add column ")+ + QString().sprintf("`CLOCK%d` char(64) after `CLOCK%d`",i,i-1); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + } + delete q; + WriteSchemaVersion(++cur_schema); + } + if((cur_schema<43)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table RDAIRPLAY add column SHOW_AUX_1 enum('N','Y') default 'Y' after USER_PANELS",false); - delete q; - q=new RDSqlQuery("alter table RDAIRPLAY add column SHOW_AUX_2 enum('N','Y') default 'Y' after SHOW_AUX_1",false); - delete q; + sql=QString("alter table `RDAIRPLAY` add column `SHOW_AUX_1` enum('N','Y') default 'Y' after `USER_PANELS`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RDAIRPLAY` add column `SHOW_AUX_2` enum('N','Y') default 'Y' after `SHOW_AUX_1`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<44)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table CUTS add column LOCAL_COUNTER int unsigned default 0 after PLAY_COUNTER",false); - delete q; + sql=QString("alter table `CUTS` add column `LOCAL_COUNTER` int unsigned default 0 after `PLAY_COUNTER`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<45)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table CUTS add column EVERGREEN enum('N','Y') default 'N' after CART_NUMBER",false); - delete q; + sql=QString("alter table `CUTS` add column `EVERGREEN` enum('N','Y') default 'N' after `CART_NUMBER`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<46)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table CART add column LENGTH_DEVIATION int unsigned default 0 after FORCED_LENGTH",false); - delete q; - q=new RDSqlQuery("select NUMBER from CART where TYPE=1",false); + sql=QString("alter table `CART` add column `LENGTH_DEVIATION` int unsigned default 0 after `FORCED_LENGTH`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + sql=QString("select `NUMBER` from `CART` where `TYPE`=1"); + q=new RDSqlQuery(sql); while(q->next()) { AverageCuts89(q->value(0).toUInt()); - /* - cart=new RDCart(q->value(0).toUInt()); - cart->calculateAverageLength(&dev); - cart->setLengthDeviation(dev); - delete cart; - */ } delete q; @@ -879,58 +1022,104 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<47)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table SERVICES add column NAME_TEMPLATE char(255) after DESCRIPTION",false); - delete q; - q=new RDSqlQuery("alter table SERVICES add column TFC_PATH char(255) after NAME_TEMPLATE",false); - delete q; - q=new RDSqlQuery("alter table SERVICES add column TFC_WIN_PATH char(255) after TFC_PATH",false); - delete q; - q=new RDSqlQuery("alter table SERVICES add column TFC_CART_OFFSET int after TFC_WIN_PATH",false); - delete q; - q=new RDSqlQuery("alter table SERVICES add column TFC_CART_LENGTH int after TFC_CART_OFFSET",false); - delete q; - q=new RDSqlQuery("alter table SERVICES add column TFC_START_OFFSET int after TFC_CART_LENGTH",false); - delete q; - q=new RDSqlQuery("alter table SERVICES add column TFC_START_LENGTH int after TFC_START_OFFSET",false); - delete q; - q=new RDSqlQuery("alter table SERVICES add column MUS_PATH char(255) after TFC_START_LENGTH",false); - delete q; - q=new RDSqlQuery("alter table SERVICES add column MUS_WIN_PATH char(255) after MUS_PATH",false); - delete q; - q=new RDSqlQuery("alter table SERVICES add column MUS_CART_OFFSET int after MUS_PATH",false); - delete q; - q=new RDSqlQuery("alter table SERVICES add column MUS_CART_LENGTH int after MUS_CART_OFFSET",false); - delete q; - q=new RDSqlQuery("alter table SERVICES add column MUS_START_OFFSET int after MUS_CART_LENGTH",false); - delete q; - q=new RDSqlQuery("alter table SERVICES add column MUS_START_LENGTH int after MUS_START_OFFSET",false); - delete q; + sql=QString("alter table `SERVICES` add column `NAME_TEMPLATE` char(255) after `DESCRIPTION`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `SERVICES` add column `TFC_PATH` char(255) after `NAME_TEMPLATE`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `SERVICES` add column `TFC_WIN_PATH` char(255) after `TFC_PATH`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `SERVICES` add column `TFC_CART_OFFSET` int after `TFC_WIN_PATH`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `SERVICES` add column `TFC_CART_LENGTH` int after `TFC_CART_OFFSET`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `SERVICES` add column `TFC_START_OFFSET` int after `TFC_CART_LENGTH`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `SERVICES` add column `TFC_START_LENGTH` int after `TFC_START_OFFSET`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `SERVICES` add column `MUS_PATH` char(255) after `TFC_START_LENGTH`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `SERVICES` add column `MUS_WIN_PATH` char(255) after `MUS_PATH`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `SERVICES` add column `MUS_CART_OFFSET` int after `MUS_PATH`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `SERVICES` add column `MUS_CART_LENGTH` int after `MUS_CART_OFFSET`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `SERVICES` add column `MUS_START_OFFSET` int after `MUS_CART_LENGTH`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `SERVICES` add column `MUS_START_LENGTH` int after `MUS_START_OFFSET`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<48)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table SERVICES add column TFC_LENGTH_OFFSET int after TFC_START_LENGTH",false); - delete q; + sql=QString("alter table `SERVICES` add column `TFC_LENGTH_OFFSET` int after `TFC_START_LENGTH`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } - q=new RDSqlQuery("alter table SERVICES add column TFC_LENGTH_LENGTH int after TFC_LENGTH_OFFSET",false); - delete q; + sql=QString("alter table `SERVICES` add column `TFC_LENGTH_LENGTH` int after `TFC_LENGTH_OFFSET`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } - q=new RDSqlQuery("alter table SERVICES add column MUS_LENGTH_OFFSET int after MUS_START_LENGTH",false); - delete q; + sql=QString("alter table `SERVICES` add column `MUS_LENGTH_OFFSET` int after `MUS_START_LENGTH`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } - q=new RDSqlQuery("alter table SERVICES add column MUS_LENGTH_LENGTH int after MUS_LENGTH_OFFSET",false); - delete q; + sql=QString("alter table `SERVICES` add column `MUS_LENGTH_LENGTH` int after `MUS_LENGTH_OFFSET`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<49)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists AUTOFILLS (")+ - "ID int not null primary key auto_increment,"+ - "SERVICE char(10),"+ - "CART_NUMBER int unsigned,"+ - "index SERVICE_IDX (SERVICE))"+ + sql=QString("create table if not exists `AUTOFILLS` (")+ + "`ID` int not null primary key auto_increment,"+ + "`SERVICE` char(10),"+ + "`CART_NUMBER` int unsigned,"+ + "index `SERVICE_IDX` (`SERVICE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -941,9 +1130,9 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<50)&&(set_schema>cur_schema)) { - sql=QString("alter table SERVICES ")+ - "add column CHAIN_LOG enum('N','Y') default 'N'"+ - "after NAME_TEMPLATE"; + sql=QString("alter table `SERVICES` ")+ + "add column `CHAIN_LOG` enum('N','Y') default 'N'"+ + "after `NAME_TEMPLATE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -952,9 +1141,9 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<51)&&(set_schema>cur_schema)) { - sql=QString("alter table USERS ")+ - "modify column PASSWORD char(32)"+ - "after DESCRIPTION"; + sql=QString("alter table `USERS` ")+ + "modify column `PASSWORD` char(32)"+ + "after `DESCRIPTION`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -963,13 +1152,13 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<52)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists HOSTVARS (")+ - "ID int not null primary key auto_increment,"+ - "STATION_NAME char(64) not null,"+ - "NAME char(32) not null,"+ - "VARVALUE char(255),"+ - "REMARK char(255),"+ - "index NAME_IDX (STATION_NAME))"+ + sql=QString("create table if not exists `HOSTVARS` (")+ + "`ID` int not null primary key auto_increment,"+ + "`STATION_NAME` char(64) not null,"+ + "`NAME` char(32) not null,"+ + "`VARVALUE` char(255),"+ + "`REMARK` char(255),"+ + "index `NAME_IDX` (`STATION_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -980,58 +1169,77 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<53)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table STATIONS add column BACKUP_DIR char(255)",false); - delete q; - q=new RDSqlQuery("alter table STATIONS add column BACKUP_LIFE int default 0",false); - delete q; + sql=QString("alter table `STATIONS` add column `BACKUP_DIR` char(255)"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `STATIONS` add column `BACKUP_LIFE` int default 0"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<54)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table RDAIRPLAY add column CLEAR_FILTER enum(\'N\',\'Y\') default \'N\'",false); - delete q; - q=new RDSqlQuery("alter table RDAIRPLAY add column BAR_ACTION int unsigned default 0",false); - delete q; + sql=QString("alter table `RDAIRPLAY` add column `CLEAR_FILTER` enum('N','Y') default 'N'"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RDAIRPLAY` add column `BAR_ACTION` int unsigned default 0"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<55)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table RDAIRPLAY add column FLASH_PANEL enum(\'N\',\'Y\') default \'N\'",false); - delete q; + sql=QString("alter table `RDAIRPLAY` add column `FLASH_PANEL` enum('N','Y') default 'N'"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<56)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table STATIONS add column HEARTBEAT_CART int unsigned default 0",false); - delete q; - q=new RDSqlQuery("alter table STATIONS add column HEARTBEAT_INTERVAL int unsigned default 0",false); - delete q; + sql=QString("alter table `STATIONS` add column `HEARTBEAT_CART` int unsigned default 0"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `STATIONS` add column `HEARTBEAT_INTERVAL` int unsigned default 0"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<57)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists SERVICE_PERMS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "STATION_NAME char(64),"+ - "SERVICE_NAME char(10),"+ - "index STATION_IDX (STATION_NAME),"+ - "index SERVICE_IDX (SERVICE_NAME))"+ + sql=QString("create table if not exists `SERVICE_PERMS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`STATION_NAME` char(64),"+ + "`SERVICE_NAME` char(10),"+ + "index `STATION_IDX` (`STATION_NAME`),"+ + "index `SERVICE_IDX` (`SERVICE_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - q=new RDSqlQuery("select NAME from STATIONS",false); + sql=QString("select `NAME` from `STATIONS`"); + q=new RDSqlQuery(sql,false); while(q->next()) { - q1=new RDSqlQuery("select NAME from SERVICES",false); + sql=QString("select `NAME` from `SERVICES`"); + q1=new RDSqlQuery(sql,false); while(q1->next()) { - sql=QString("insert into SERVICE_PERMS set ")+ - "STATION_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - "SERVICE_NAME=\""+RDEscapeString(q1->value(0).toString())+"\""; + sql=QString("insert into `SERVICE_PERMS` set ")+ + "`STATION_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + "`SERVICE_NAME`='"+RDEscapeString(q1->value(0).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -1044,25 +1252,26 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<58)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("select NAME from LOGS",false); + sql=QString("select `NAME` from `LOGS`"); + q=new RDSqlQuery(sql,false); while(q->next()) { sql=QString("alter table `")+q->value(0).toString()+"_LOG` "+ - "add column EXT_START_TIME time"; + "add column `EXT_START_TIME` time"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+q->value(0).toString()+"_LOG` "+ - "add column EXT_LENGTH int"; + "add column `EXT_LENGTH` int"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table '")+q->value(0).toString()+"_LOG` "+ - "add column EXT_DATA char(32)"; + "add column `EXT_DATA` char(32)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+q->value(0).toString()+"_LOG` "+ - "add column EXT_EVENT_ID char(8)"; + "add column `EXT_EVENT_ID` char(8)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -1073,22 +1282,45 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<59)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table SERVICES add column TFC_DATA_OFFSET int after TFC_LENGTH_LENGTH",false); - delete q; - q=new RDSqlQuery("alter table SERVICES add column TFC_DATA_LENGTH int after TFC_DATA_OFFSET",false); - delete q; - q=new RDSqlQuery("alter table SERVICES add column TFC_EVENT_ID_OFFSET int after TFC_DATA_LENGTH",false); - delete q; - q=new RDSqlQuery("alter table SERVICES add column TFC_EVENT_ID_LENGTH int after TFC_EVENT_ID_OFFSET",false); - delete q; - q=new RDSqlQuery("alter table SERVICES add column MUS_DATA_OFFSET int after MUS_LENGTH_LENGTH",false); - delete q; - q=new RDSqlQuery("alter table SERVICES add column MUS_DATA_LENGTH int after MUS_DATA_OFFSET",false); - delete q; - q=new RDSqlQuery("alter table SERVICES add column MUS_EVENT_ID_OFFSET int after MUS_DATA_LENGTH",false); - delete q; - q=new RDSqlQuery("alter table SERVICES add column MUS_EVENT_ID_LENGTH int after MUS_EVENT_ID_OFFSET",false); - delete q; + sql=QString("alter table `SERVICES` add column `TFC_DATA_OFFSET` int after `TFC_LENGTH_LENGTH`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `SERVICES` add column `TFC_DATA_LENGTH` int after `TFC_DATA_OFFSET`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `SERVICES` add column `TFC_EVENT_ID_OFFSET` int after `TFC_DATA_LENGTH`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `SERVICES` add column `TFC_EVENT_ID_LENGTH` int after `TFC_EVENT_ID_OFFSET`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `SERVICES` add column `MUS_DATA_OFFSET` int after `MUS_LENGTH_LENGTH`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `SERVICES` add column `MUS_DATA_LENGTH` int after `MUS_DATA_OFFSET`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `SERVICES` add column `MUS_EVENT_ID_OFFSET` int after `MUS_DATA_LENGTH`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `SERVICES` add column `MUS_EVENT_ID_LENGTH` int after `MUS_EVENT_ID_OFFSET`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } @@ -1102,47 +1334,58 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<62)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table GROUPS add column REPORT_TFC enum('N','Y') default 'N'",false); - delete q; - q=new RDSqlQuery("alter table GROUPS add column REPORT_MUS enum('N','Y') default 'N'",false); - delete q; - q=new RDSqlQuery("alter table GROUPS add index IDX_REPORT_TFC (REPORT_TFC)",false); - delete q; - q=new RDSqlQuery("alter table GROUPS add index IDX_REPORT_MUS (REPORT_MUS)",false); - delete q; + sql=QString("alter table `GROUPS` add column `REPORT_TFC` enum('N','Y') default 'N'"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `GROUPS` add column `REPORT_MUS` enum('N','Y') default 'N'"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `GROUPS` add index `IDX_REPORT_TFC` (`REPORT_TFC`)"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `GROUPS' add index `IDX_REPORT_MUS` (`REPORT_MUS`)"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<63)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists REPORTS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "NAME char(64) not null unique,"+ - "DESCRIPTION char(64),"+ - "EXPORT_FILTER int,"+ - "EXPORT_PATH char(255),"+ - "WIN_EXPORT_PATH char(255),"+ - "index IDX_NAME (NAME))"+ + sql=QString("create table if not exists `REPORTS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`NAME` char(64) not null unique,"+ + "`DESCRIPTION` char(64),"+ + "`EXPORT_FILTER` int,"+ + "`EXPORT_PATH` char(255),"+ + "`WIN_EXPORT_PATH` char(255),"+ + "index `IDX_NAME` (`NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("create table if not exists REPORT_SERVICES (")+ - "ID int unsigned auto_increment not null primary key,"+ - "REPORT_NAME char(64) not null,"+ - "SERVICE_NAME char(10),"+ - "index IDX_REPORT_NAME (REPORT_NAME))"+ + sql=QString("create table if not exists `REPORT_SERVICES` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`REPORT_NAME` char(64) not null,"+ + "`SERVICE_NAME` char(10),"+ + "index `IDX_REPORT_NAME` (`REPORT_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("create table if not exists REPORT_STATIONS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "REPORT_NAME char(64) not null,"+ - "STATION_NAME char(64),"+ - "index IDX_REPORT_NAME (REPORT_NAME))"+ + sql=QString("create table if not exists `REPORT_STATIONS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`REPORT_NAME` char(64) not null,"+ + "`STATION_NAME` char(64),"+ + "index `IDX_REPORT_NAME` (`REPORT_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1153,85 +1396,135 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<64)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table REPORTS add column EXPORT_TFC enum('N','Y') default 'N'",false); - delete q; - q=new RDSqlQuery("alter table REPORTS add column EXPORT_MUS enum('N','Y') default 'N'",false); - delete q; - q=new RDSqlQuery("alter table REPORTS add column EXPORT_GEN enum('N','Y') default 'N'",false); - delete q; + sql=QString("alter table `REPORTS` add column `EXPORT_TFC` enum('N','Y') default 'N'"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `REPORTS` add column `EXPORT_MUS` enum('N','Y') default 'N'"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `REPORTS` add column `EXPORT_GEN` enum('N','Y') default 'N'"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<65)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table REPORTS add column STATION_ID char(16)",false); - delete q; + sql=QString("alter table `REPORTS` add column `STATION_ID` char(16)"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<66)&&(set_schema>cur_schema)) { - q=new - RDSqlQuery("alter table RDAIRPLAY alter column OP_MODE set default 2",false); - delete q; + sql=QString("alter table `RDAIRPLAY` alter column `OP_MODE` set default 2"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<67)&&(set_schema>cur_schema)) { - q=new - RDSqlQuery("alter table RDAIRPLAY add column PAUSE_ENABLED enum('N','Y') default 'N'",false); - delete q; + sql=QString("alter table `RDAIRPLAY` add column `PAUSE_ENABLED` enum('N','Y') default 'N'"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<68)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table RDAIRPLAY add column UDP_ADDR0 char(255)",false); - delete q; - q=new RDSqlQuery("alter table RDAIRPLAY add column UDP_PORT0 int unsigned",false); - delete q; - q=new RDSqlQuery("alter table RDAIRPLAY add column UDP_STRING0 char(255)",false); - delete q; - q=new RDSqlQuery("alter table RDAIRPLAY add column UDP_ADDR1 char(255)",false); - delete q; - q=new RDSqlQuery("alter table RDAIRPLAY add column UDP_PORT1 int unsigned",false); - delete q; - q=new RDSqlQuery("alter table RDAIRPLAY add column UDP_STRING1 char(255)",false); - delete q; - q=new RDSqlQuery("alter table RDAIRPLAY add column UDP_ADDR2 char(255)",false); - delete q; - q=new RDSqlQuery("alter table RDAIRPLAY add column UDP_PORT2 int unsigned",false); - delete q; - q=new RDSqlQuery("alter table RDAIRPLAY add column UDP_STRING2 char(255)",false); - delete q; - q=new RDSqlQuery("alter table GROUPS add column ENABLE_NOW_NEXT enum('N','Y') default 'N'",false); - delete q; + sql=QString("alter table `RDAIRPLAY` add column `UDP_ADDR0` char(255)"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RDAIRPLAY` add column `UDP_PORT0` int unsigned"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RDAIRPLAY` add column `UDP_STRING0` char(255)"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RDAIRPLAY` add column `UDP_ADDR1` char(255)"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RDAIRPLAY` add column `UDP_PORT1` int unsigned"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RDAIRPLAY` add column `UDP_STRING1` char(255)"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RDAIRPLAY` add column `UDP_ADDR2` char(255)"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RDAIRPLAY` add column `UDP_PORT2` int unsigned"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `RDAIRPLAY` add column `UDP_STRING2` char(255)"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `GROUPS` add column `ENABLE_NOW_NEXT` enum('N','Y') default 'N'"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<69)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table MATRICES add column PORT_TYPE int default 0 after TYPE",false); - delete q; - q=new RDSqlQuery("alter table MATRICES add column IP_ADDRESS char(16) after PORT",false); - delete q; - q=new RDSqlQuery("alter table MATRICES add column IP_PORT int after IP_ADDRESS",false); - delete q; + sql=QString("alter table `MATRICES` add column `PORT_TYPE` int default 0 after `TYPE`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `MATRICES` add column `IP_ADDRESS` char(16) after `PORT`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } + + sql=QString("alter table `MATRICES` add column `IP_PORT` int after `IP_ADDRESS`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<70)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("select NAME from LOGS",false); + sql=QString("select `NAME` from `LOGS`"); + q=new RDSqlQuery(sql,false); while(q->next()) { sql=QString("alter table `")+q->value(0).toString()+"_REC`"+ - "add column PLAY_SOURCE int default 0 after EVENT_TYPE"; + "add column `PLAY_SOURCE` int default 0 after `EVENT_TYPE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+q->value(0).toString()+"_REC` "+ - "add column CUT_NUMBER int default 0 after CART_NUMBER"; + "add column `CUT_NUMBER` int default 0 after `CART_NUMBER`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -1242,43 +1535,43 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<71)&&(set_schema>cur_schema)) { - sql=QString("alter table RECORDINGS add column END_LINE int default -1 after START_TIME"); + sql=QString("alter table `RECORDINGS` add column `END_LINE` int default -1 after `START_TIME`"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RECORDINGS add column END_MATRIX int default -1 after START_TIME"); + sql=QString("alter table `RECORDINGS` add column `END_MATRIX` int default -1 after `START_TIME`"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RECORDINGS add column END_LENGTH int default 0 after START_TIME"); + sql=QString("alter table `RECORDINGS` add column `END_LENGTH` int default 0 after `START_TIME`"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RECORDINGS add column END_TIME time after START_TIME"); + sql=QString("alter table `RECORDINGS` add column `END_TIME` time after `START_TIME`"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RECORDINGS add column END_TYPE int unsigned default 2 after START_TIME"); + sql=QString("alter table `RECORDINGS` add column `END_TYPE` int unsigned default 2 after `START_TIME`"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RECORDINGS add column START_OFFSET int default 0 after START_TIME"); + sql=QString("alter table `RECORDINGS` add column `START_OFFSET` int default 0 after `START_TIME`"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RECORDINGS add column START_LINE int default -1 after START_TIME"); + sql=QString("alter table `RECORDINGS` add column `START_LINE` int default -1 after `START_TIME`"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RECORDINGS add column START_MATRIX int default -1 after START_TIME"); + sql=QString("alter table `RECORDINGS` add column `START_MATRIX` int default -1 after `START_TIME`"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RECORDINGS add column START_LENGTH int default 0 after START_TIME"); + sql=QString("alter table `RECORDINGS` add column `START_LENGTH` int default 0 after `START_TIME`"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RECORDINGS add column START_TYPE int default 0 after DESCRIPTION"); + sql=QString("alter table `RECORDINGS` add column `START_TYPE` int default 0 after `DESCRIPTION`"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -1287,7 +1580,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<72)&&(set_schema>cur_schema)) { - sql=QString("alter table GROUPS add column DEFAULT_CART_TYPE int unsigned default 1 after DESCRIPTION"); + sql=QString("alter table `GROUPS` add column `DEFAULT_CART_TYPE` int unsigned default 1 after `DESCRIPTION`"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -1296,7 +1589,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<73)&&(set_schema>cur_schema)) { - sql=QString("alter table RDAIRPLAY add column DEFAULT_TRANS_TYPE int unsigned default 0 after CLEAR_FILTER"); + sql=QString("alter table `RDAIRPLAY` add column `DEFAULT_TRANS_TYPE` int unsigned default 0 after `CLEAR_FILTER`"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -1308,26 +1601,26 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // // Create CLOCK_PERMS Table // - sql=QString("create table if not exists CLOCK_PERMS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "CLOCK_NAME char(64),"+ - "SERVICE_NAME char(10),"+ + sql=QString("create table if not exists `CLOCK_PERMS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`CLOCK_NAME` char(64),"+ + "`SERVICE_NAME` char(10),"+ "index CLOCK_IDX (CLOCK_NAME),"+ - "index SERVICE_IDX (SERVICE_NAME))"+ + "index `SERVICE_IDX` (`SERVICE_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select NAME from CLOCKS"; + sql=QString("select `NAME` from `CLOCKS`"); q=new RDSqlQuery(sql,false); while(q->next()) { - sql="select NAME from SERVICES"; + sql=QString("select `NAME` from `SERVICES`"); q1=new RDSqlQuery(sql,false); while(q1->next()) { - sql=QString("insert into CLOCK_PERMS set ")+ - "CLOCK_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - "SERVICE_NAME=\""+RDEscapeString(q1->value(0).toString())+"\""; + sql=QString("insert into `CLOCK_PERMS` set ")+ + "`CLOCK_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + "`SERVICE_NAME`='"+RDEscapeString(q1->value(0).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -1339,26 +1632,26 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // // Create EVENT_PERMS Table // - sql=QString("create table if not exists EVENT_PERMS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "EVENT_NAME char(64),"+ - "SERVICE_NAME char(10),"+ - "index EVENT_IDX (EVENT_NAME),"+ - "index SERVICE_IDX (SERVICE_NAME))"+ + sql=QString("create table if not exists `EVENT_PERMS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`EVENT_NAME` char(64),"+ + "`SERVICE_NAME` char(10),"+ + "index `EVENT_IDX` (`EVENT_NAME`),"+ + "index `SERVICE_IDX` (`SERVICE_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select NAME from EVENTS"; + sql=QString("select `NAME` from `EVENTS`"); q=new RDSqlQuery(sql,false); while(q->next()) { - sql="select NAME from SERVICES"; + sql=QString("select `NAME` from `SERVICES`"); q1=new RDSqlQuery(sql,false); while(q1->next()) { - sql=QString("insert into EVENT_PERMS set ")+ - "EVENT_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - "SERVICE_NAME=\""+RDEscapeString(q1->value(0).toString())+"\""; + sql=QString("insert into `EVENT_PERMS` set ")+ + "`EVENT_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + "`SERVICE_NAME`='"+RDEscapeString(q1->value(0).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -1371,15 +1664,19 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<75)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table MATRICES add column CARD int default -1 after PORT_TYPE",false); - delete q; + sql=QString("alter table `MATRICES` add column `CARD` int default -1 after `PORT_TYPE`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } if((cur_schema<76)&&(set_schema>cur_schema)) { - q=new RDSqlQuery("alter table DECKS add column MON_PORT_NUMBER int default -1 after PORT_NUMBER",false); - delete q; + sql=QString("alter table `DECKS` add column `MON_PORT_NUMBER` int default -1 after `PORT_NUMBER`"); + if(!RDSqlQuery::apply(sql,err_msg)) { + return false; + } WriteSchemaVersion(++cur_schema); } @@ -1388,12 +1685,12 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // // Create USER_PERMS table // - sql=QString("create table if not exists USER_PERMS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "USER_NAME char(8),"+ - "GROUP_NAME char(10),"+ - "index USER_IDX (USER_NAME),"+ - "index GROUP_IDX (GROUP_NAME))"+ + sql=QString("create table if not exists `USER_PERMS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`USER_NAME` char(8),"+ + "`GROUP_NAME` char(10),"+ + "index `USER_IDX` (`USER_NAME`),"+ + "index `GROUP_IDX` (`GROUP_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1406,9 +1703,9 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) while(q->next()) { q1->seek(-1); while(q1->next()) { - sql=QString("insert into USER_PERMS set ")+ - "USER_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - "GROUP_NAME=\""+RDEscapeString(q1->value(0).toString())+"\""; + sql=QString("insert into `USER_PERMS` set ")+ + "`USER_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + "`GROUP_NAME`='"+RDEscapeString(q1->value(0).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -1421,11 +1718,11 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<78)&&(set_schema>cur_schema)) { - sql="alter table USERS add column MODIFY_TEMPLATE_PRIV enum('N','Y') not null default 'N' after ARRANGE_LOG_PRIV"; + sql="alter table `USERS` add column `MODIFY_TEMPLATE_PRIV` enum('N','Y') not null default 'N' after `ARRANGE_LOG_PRIV`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="update USERS set MODIFY_TEMPLATE_PRIV=\"Y\" where CREATE_LOG_PRIV=\"Y\""; + sql="update `USERS` set `MODIFY_TEMPLATE_PRIV`='Y' where `CREATE_LOG_PRIV`='Y'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -1434,7 +1731,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<79)&&(set_schema>cur_schema)) { - sql="alter table GROUPS add column ENFORCE_CART_RANGE enum('N','Y') default 'N' after DEFAULT_HIGH_CART"; + sql="alter table `GROUPS` add column `ENFORCE_CART_RANGE` enum('N','Y') default 'N' after `DEFAULT_HIGH_CART`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -1443,37 +1740,37 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<80)&&(set_schema>cur_schema)) { - sql="alter table SERVICES add column TFC_ANNC_TYPE_OFFSET int after TFC_EVENT_ID_LENGTH"; + sql="alter table `SERVICES` add column `TFC_ANNC_TYPE_OFFSET` int after `TFC_EVENT_ID_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column TFC_ANNC_TYPE_LENGTH int after TFC_ANNC_TYPE_OFFSET"; + sql="alter table `SERVICES` add column `TFC_ANNC_TYPE_LENGTH` int after `TFC_ANNC_TYPE_OFFSET`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column MUS_ANNC_TYPE_OFFSET int after MUS_EVENT_ID_LENGTH"; + sql="alter table `SERVICES` add column `MUS_ANNC_TYPE_OFFSET` int after `MUS_EVENT_ID_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column MUS_ANNC_TYPE_LENGTH int after MUS_ANNC_TYPE_OFFSET"; + sql="alter table `SERVICES` add column `MUS_ANNC_TYPE_LENGTH` int after `MUS_ANNC_TYPE_OFFSET`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table REPORTS add column FORCE_TFC enum('N','Y') default 'N' after EXPORT_TFC"; + sql="alter table `REPORTS` add column `FORCE_TFC` enum('N','Y') default 'N' after `EXPORT_TFC`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table REPORTS add column FORCE_MUS enum('N','Y') default 'N' after EXPORT_MUS"; + sql="alter table `REPORTS` add column `FORCE_MUS` enum('N','Y') default 'N' after `EXPORT_MUS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table GROUPS alter column REPORT_TFC set default 'Y'"; + sql="alter table `GROUPS` alter column `REPORT_TFC` set default 'Y'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table GROUPS alter column REPORT_MUS set default 'Y'"; + sql="alter table `GROUPS` alter column `REPORT_MUS` set default 'Y'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -1482,61 +1779,61 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<81)&&(set_schema>cur_schema)) { - sql="select NAME from LOGS"; + sql="select `NAME` from `LOGS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table `")+tablename+"_LOG` "+ - "add column EXT_ANNC_TYPE char(8) after EXT_EVENT_ID"; + "add column `EXT_ANNC_TYPE` char(8) after `EXT_EVENT_ID`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_REC` "+ - "add column EVENT_SOURCE int default 0 after EVENT_TYPE"; + "add column `EVENT_SOURCE` int default 0 after `EVENT_TYPE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_REC` "+ - "add column EXT_ANNC_TYPE char(8) after EXT_EVENT_ID"; + "add column `EXT_ANNC_TYPE` char(8) after `EXT_EVENT_ID`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } delete q; - sql="select NAME from EVENTS"; + sql="select `NAME` from `EVENTS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table `")+tablename+"_PRE` "+ - "add column EXT_ANNC_TYPE char(8) after EXT_EVENT_ID"; + "add column `EXT_ANNC_TYPE` char(8) after `EXT_EVENT_ID`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_PRE` "+ - "add column EVENT_SOURCE int default 0 after EVENT_TYPE"; + "add column `EVENT_SOURCE` int default 0 after `EVENT_TYPE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_PRE` "+ - "add column EXT_ANNC_TYPE char(8) after EXT_EVENT_ID"; + "add column `EXT_ANNC_TYPE` char(8) after `EXT_EVENT_ID`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+q->value(0).toString()+"_POST` "+ - "add column EXT_ANNC_TYPE char(8) after EXT_EVENT_ID"; + "add column `EXT_ANNC_TYPE` char(8) after `EXT_EVENT_ID`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+q->value(0).toString()+"_POST` "+ - "add column EVENT_SOURCE int default 0 after EVENT_TYPE"; + "add column `EVENT_SOURCE` int default 0 after `EVENT_TYPE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+q->value(0).toString()+"_POST` "+ - "add column EXT_ANNC_TYPE char(8) after EXT_EVENT_ID"; + "add column `EXT_ANNC_TYPE` char(8) after `EXT_EVENT_ID`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -1547,56 +1844,56 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<82)&&(set_schema>cur_schema)) { - sql="alter table INPUTS add column ENGINE_NUM int default -1 after CHANNEL_MODE"; + sql="alter table `INPUTS` add column `ENGINE_NUM` int default -1 after `CHANNEL_MODE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table INPUTS add column DEVICE_NUM int default -1 after ENGINE_NUM"; + sql="alter table `INPUTS` add column `DEVICE_NUM` int default -1 after `ENGINE_NUM`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table OUTPUTS add column ENGINE_NUM int default -1 after NAME"; + sql="alter table `OUTPUTS` add column `ENGINE_NUM` int default -1 after `NAME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table OUTPUTS add column DEVICE_NUM int default -1 after ENGINE_NUM"; + sql="alter table `OUTPUTS` add column `DEVICE_NUM` int default -1 after `ENGINE_NUM`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table MATRICES add column USERNAME char(32) after IP_PORT"; + sql="alter table `MATRICES` add column `USERNAME` char(32) after `IP_PORT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table MATRICES add column PASSWORD char(32) after USERNAME"; + sql="alter table `MATRICES` add column `PASSWORD` char(32) after `USERNAME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("create table if not exists VGUEST_RESOURCES (")+ - "ID int unsigned auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "MATRIX_NUM int not null,"+ - "VGUEST_TYPE int not null,"+ - "NUMBER int not null,"+ - "ENGINE_NUM int default -1,"+ - "DEVICE_NUM int default -1,"+ - "SURFACE_NUM int default -1,"+ - "RELAY_NUM int default -1,"+ - "BUSS_NUM int default -1,"+ - "index STATION_MATRIX_IDX (STATION_NAME,MATRIX_NUM,VGUEST_TYPE))"+ + sql=QString("create table if not exists `VGUEST_RESOURCES` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`MATRIX_NUM` int not null,"+ + "`VGUEST_TYPE` int not null,"+ + "`NUMBER` int not null,"+ + "`ENGINE_NUM` int default -1,"+ + "`DEVICE_NUM` int default -1,"+ + "`SURFACE_NUM` int default -1,"+ + "`RELAY_NUM` int default -1,"+ + "`BUSS_NUM` int default -1,"+ + "index `STATION_MATRIX_IDX` (`STATION_NAME`,`MATRIX_NUM`,`VGUEST_TYPE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table MATRICES add column FADERS int default 0 after GPOS"; + sql="alter table `MATRICES` add column `FADERS` int default 0 after `GPOS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table MATRICES add column DISPLAYS int default 0 after FADERS"; + sql="alter table `MATRICES` add column `DISPLAYS` int default 0 after `FADERS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -1605,15 +1902,15 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<83)&&(set_schema>cur_schema)) { - sql="alter table RECORDINGS add column URL char(255) after ONE_SHOT"; + sql="alter table `RECORDINGS` add column `URL` char(255) after `ONE_SHOT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RECORDINGS add column URL_USERNAME char(64) after URL"; + sql="alter table `RECORDINGS` add column `URL_USERNAME` char(64) after `URL`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RECORDINGS add column URL_PASSWORD char(64) after URL_USERNAME"; + sql="alter table `RECORDINGS` add column `URL_PASSWORD` char(64) after `URL_USERNAME"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -1623,182 +1920,182 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) if((cur_schema<84)&&(set_schema>cur_schema)) { sql= - "alter table STATIONS add column STATION_SCANNED enum('N','Y') default 'N'"; + "alter table `STATIONS` add column `STATION_SCANNED` enum('N','Y') default 'N'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column HPI_VERSION char(16)"; + sql="alter table `STATIONS` add column `HPI_VERSION` char(16)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column JACK_VERSION char(16)"; + sql="alter table `STATIONS` add column `JACK_VERSION` char(16)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column ALSA_VERSION char(16)"; + sql="alter table `STATIONS` add column `ALSA_VERSION` char(16)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql= - "alter table STATIONS add column HAVE_OGGENC enum('N','Y') default 'N'"; + "alter table `STATIONS` add column `HAVE_OGGENC` enum('N','Y') default 'N'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql= - "alter table STATIONS add column HAVE_OGG123 enum('N','Y') default 'N'"; + "alter table `STATIONS` add column `HAVE_OGG123` enum('N','Y') default 'N'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql= - "alter table STATIONS add column HAVE_FLAC enum('N','Y') default 'N'"; + "alter table `STATIONS` add column `HAVE_FLAC` enum('N','Y') default 'N'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql= - "alter table STATIONS add column HAVE_LAME enum('N','Y') default 'N'"; + "alter table `STATIONS` add column `HAVE_LAME` enum('N','Y') default 'N'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql= - "alter table STATIONS add column HAVE_MPG321 enum('N','Y') default 'N'"; + "alter table `STATIONS` add column `HAVE_MPG321` enum('N','Y') default 'N'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD0_DRIVER int default 0"; + sql="alter table `STATIONS` add column `CARD0_DRIVER` int default 0"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD0_NAME char(64)"; + sql="alter table `STATIONS` add column `CARD0_NAME` char(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD0_INPUTS int default -1"; + sql="alter table `STATIONS` add column `CARD0_INPUTS` int default -1"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD0_OUTPUTS int default -1"; + sql="alter table `STATIONS` add column `CARD0_OUTPUTS` int default -1"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD1_DRIVER int default 0"; + sql="alter table `STATIONS` add column `CARD1_DRIVER` int default 0"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD1_NAME char(64)"; + sql="alter table `STATIONS` add column `CARD1_NAME` char(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD1_INPUTS int default -1"; + sql="alter table `STATIONS` add column `CARD1_INPUTS` int default -1"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD1_OUTPUTS int default -1"; + sql="alter table `STATIONS` add column `CARD1_OUTPUTS` int default -1"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD2_DRIVER int default 0"; + sql="alter table `STATIONS` add column `CARD2_DRIVER` int default 0"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD2_NAME char(64)"; + sql="alter table `STATIONS` add column `CARD2_NAME` char(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD2_INPUTS int default -1"; + sql="alter table `STATIONS` add column `CARD2_INPUTS` int default -1"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD2_OUTPUTS int default -1"; + sql="alter table `STATIONS` add column `CARD2_OUTPUTS` int default -1"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD3_DRIVER int default 0"; + sql="alter table `STATIONS` add column `CARD3_DRIVER` int default 0"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD3_NAME char(64)"; + sql="alter table `STATIONS` add column `CARD3_NAME` char(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD3_INPUTS int default -1"; + sql="alter table `STATIONS` add column `CARD3_INPUTS` int default -1"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD3_OUTPUTS int default -1"; + sql="alter table `STATIONS` add column `CARD3_OUTPUTS` int default -1"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD4_DRIVER int default 0"; + sql="alter table `STATIONS` add column `CARD4_DRIVER` int default 0"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD4_NAME char(64)"; + sql="alter table `STATIONS` add column `CARD4_NAME` char(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD4_INPUTS int default -1"; + sql="alter table `STATIONS` add column `CARD4_INPUTS` int default -1"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD4_OUTPUTS int default -1"; + sql="alter table `STATIONS` add column `CARD4_OUTPUTS` int default -1"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD5_DRIVER int default 0"; + sql="alter table `STATIONS` add column `CARD5_DRIVER` int default 0"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD5_NAME char(64)"; + sql="alter table `STATIONS` add column `CARD5_NAME` char(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD5_INPUTS int default -1"; + sql="alter table `STATIONS` add column `CARD5_INPUTS` int default -1"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD5_OUTPUTS int default -1"; + sql="alter table `STATIONS` add column `CARD5_OUTPUTS` int default -1"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD6_DRIVER int default 0"; + sql="alter table `STATIONS` add column `CARD6_DRIVER` int default 0"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD6_NAME char(64)"; + sql="alter table `STATIONS` add column `CARD6_NAME` char(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD6_INPUTS int default -1"; + sql="alter table `STATIONS` add column `CARD6_INPUTS` int default -1"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD6_OUTPUTS int default -1"; + sql="alter table `STATIONS` add column `CARD6_OUTPUTS` int default -1"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD7_DRIVER int default 0"; + sql="alter table `STATIONS` add column `CARD7_DRIVER` int default 0"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD7_NAME char(64)"; + sql="alter table `STATIONS` add column `CARD7_NAME` char(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD7_INPUTS int default -1"; + sql="alter table `STATIONS` add column `CARD7_INPUTS` int default -1"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CARD7_OUTPUTS int default -1"; + sql="alter table `STATIONS` add column `CARD7_OUTPUTS` int default -1"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -1807,12 +2104,12 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<85)&&(set_schema>cur_schema)) { - sql="alter table RECORDINGS add column NORMALIZE_LEVEL int default -1300 after TRIM_THRESHOLD"; + sql="alter table `RECORDINGS` add column `NORMALIZE_LEVEL` int default -1300 after `TRIM_THRESHOLD`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RECORDINGS add column QUALITY int default 0 after BITRATE"; + sql="alter table `RECORDINGS` add column `QUALITY` int default 0 after `BITRATE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -1821,7 +2118,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<86)&&(set_schema>cur_schema)) { - sql="alter table RECORDINGS alter column END_TYPE set default 0"; + sql="alter table `RECORDINGS` alter column `END_TYPE` set default 0"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -1830,36 +2127,36 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<87)&&(set_schema>cur_schema)) { - sql="select NAME from LOGS"; + sql="select `NAME` from `LOGS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table `")+tablename+"_LOG` "+ - "add column EXT_CART_NAME char(32) after EXT_LENGTH"; + "add column `EXT_CART_NAME` char(32) after `EXT_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_REC` "+ - "add column EXT_CART_NAME char(32) after EXT_LENGTH"; + "add column `EXT_CART_NAME` char(32) after `EXT_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } delete q; - sql="select NAME from EVENTS"; + sql="select `NAME` from `EVENTS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table `")+tablename+"_PRE` "+ - "add column EXT_CART_NAME char(32) after EXT_LENGTH"; + "add column `EXT_CART_NAME` char(32) after `EXT_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+q->value(0).toString()+"_POST` "+ - "add column EXT_CART_NAME char(32) after EXT_LENGTH"; + "add column `EXT_CART_NAME` char(32) after `EXT_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -1870,27 +2167,27 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<88)&&(set_schema>cur_schema)) { - sql="alter table RECORDINGS add column ALLOW_MULT_RECS enum('N','Y') default 'N' after END_GPI"; + sql="alter table `RECORDINGS` add column `ALLOW_MULT_RECS` enum('N','Y') default 'N' after `END_GPI`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RECORDINGS add column MAX_GPI_REC_LENGTH int unsigned default 3600000 after ALLOW_MULT_RECS"; + sql="alter table `RECORDINGS` add column `MAX_GPI_REC_LENGTH` int unsigned default 3600000 after `ALLOW_MULT_RECS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("select ")+ - "ID,"+ - "START_TIME,"+ - "END_TIME,"+ - "END_LENGTH "+ - "from RECORDINGS where "+ - "END_TYPE=1"; + "`ID`,"+ // 00 + "`START_TIME`,"+ // 01 + "`END_TIME`,"+ // 02 + "`END_LENGTH` "+ // 03 + "from `RECORDINGS` where "+ + "`END_TYPE`=1"; q=new RDSqlQuery(sql,false); while(q->next()) { sql=QString(). - sprintf("update RECORDINGS set MAX_GPI_REC_LENGTH=%u where ID=%u", + sprintf("update `RECORDINGS` set `MAX_GPI_REC_LENGTH`=%u where `ID`=%u", QTime().msecsTo(q->value(2).toTime())+q->value(3).toUInt()- QTime().msecsTo(q->value(1).toTime()),q->value(0).toUInt()); if(!RDSqlQuery::apply(sql,err_msg)) { @@ -1903,39 +2200,27 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<89)&&(set_schema>cur_schema)) { - sql="alter table CART add column AVERAGE_LENGTH int unsigned after FORCED_LENGTH"; + sql="alter table `CART` add column `AVERAGE_LENGTH` int unsigned after `FORCED_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table CART add column ASYNCRONOUS enum('N','Y') default 'N' after PRESERVE_PITCH"; + sql="alter table `CART` add column `ASYNCRONOUS` enum('N','Y') default 'N' after `PRESERVE_PITCH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("select NUMBER from CART where TYPE=1"); + sql=QString("select `NUMBER` from `CART` where `TYPE`=1"); q=new RDSqlQuery(sql,false); while(q->next()) { AverageCuts89(q->value(0).toUInt()); } delete q; - // RDMacroEvent *macro_event; - sql=QString("select NUMBER from CART where TYPE=2"); + sql=QString("select `NUMBER` from `CART` where `TYPE`=2"); q=new RDSqlQuery(sql,false); while(q->next()) { TotalMacros89(q->value(0).toUInt()); - /* - macro_event=new RDMacroEvent(); - macro_event->load(q->value(0).toUInt()); - sql=QString("update CART set ")+ - QString().sprintf("AVERAGE_LENGTH=%u,",macro_event->length())+ - QString().sprintf("FORCED_LENGTH=%u ",macro_event->length())+ - QString().sprintf("where NUMBER=%u",q->value(0).toUInt()); - q1=new RDSqlQuery(sql,false); - delete q1; - delete macro_event; - */ } delete q; @@ -1943,12 +2228,12 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<90)&&(set_schema>cur_schema)) { - sql="alter table REPORTS add column CART_DIGITS int unsigned default 6 after STATION_ID"; + sql="alter table `REPORTS` add column `CART_DIGITS` int unsigned default 6 after `STATION_ID`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table REPORTS add column USE_LEADING_ZEROS enum('N','Y') default 'N' after CART_DIGITS"; + sql="alter table `REPORTS` add column `USE_LEADING_ZEROS` enum('N','Y') default 'N' after `CART_DIGITS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -1957,7 +2242,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<91)&&(set_schema>cur_schema)) { - sql="alter table DECKS add column DEFAULT_MONITOR_ON enum('N','Y') default 'N' after MON_PORT_NUMBER"; + sql="alter table `DECKS` add column `DEFAULT_MONITOR_ON` enum('N','Y') default 'N' after `MON_PORT_NUMBER`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -1966,7 +2251,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<92)&&(set_schema>cur_schema)) { - sql="alter table EVENTS add column AUTOFILL_SLOP int default -1 after USE_AUTOFILL"; + sql="alter table `EVENTS` add column `AUTOFILL_SLOP` int default -1 after `USE_AUTOFILL`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -1975,115 +2260,115 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<93)&&(set_schema>cur_schema)) { - sql="alter table LOGS add column IMPORT_DATE date after END_DATE"; + sql="alter table `LOGS` add column `IMPORT_DATE` date after `END_DATE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select NAME from LOGS"; + sql="select `NAME` from `LOGS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table `")+tablename+"_LOG` "+ - "add column FADEUP_POINT int default -1 after END_POINT"; + "add column `FADEUP_POINT` int default -1 after `END_POINT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_LOG` "+ - QString().sprintf("add column FADEUP_GAIN int default %d ", + QString().sprintf("add column `FADEUP_GAIN` int default %d ", RD_FADE_DEPTH)+ - "after FADEUP_POINT"; + "after `FADEUP_POINT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_LOG` "+ - "add column FADEDOWN_POINT int default -1 after FADEUP_GAIN"; + "add column `FADEDOWN_POINT` int default -1 after `FADEUP_GAIN`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_LOG` "+ - QString().sprintf("add column FADEDOWN_GAIN int default %d ", + QString().sprintf("add column `FADEDOWN_GAIN` int default %d ", RD_FADE_DEPTH)+ - "after FADEDOWN_POINT"; + "after `FADEDOWN_POINT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_LOG` "+ - QString().sprintf("add column SEGUE_GAIN int default %d ", + QString().sprintf("add column `SEGUE_GAIN` int default %d ", RD_FADE_DEPTH)+ - "after SEGUE_END_POINT"; + "after `SEGUE_END_POINT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } delete q; - sql="select NAME from EVENTS"; + sql="select `NAME` from `EVENTS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table `")+tablename+"_PRE` "+ - "add column FADEUP_POINT int default -1 after END_POINT"; + "add column `FADEUP_POINT` int default -1 after `END_POINT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_PRE` "+ - QString().sprintf("add column FADEUP_GAIN int default %d ", + QString().sprintf("add column `FADEUP_GAIN` int default %d ", RD_FADE_DEPTH)+ - "after FADEUP_POINT"; + "after `FADEUP_POINT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_PRE` "+ - "add column FADEDOWN_POINT int default -1 after FADEUP_GAIN"; + "add column `FADEDOWN_POINT` int default -1 after `FADEUP_GAIN`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table '")+tablename+"_PRE' "+ - QString().sprintf("add column FADEDOWN_GAIN int default %d ", + QString().sprintf("add column `FADEDOWN_GAIN` int default %d ", RD_FADE_DEPTH)+ - "after FADEDOWN_POINT"; + "after `FADEDOWN_POINT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_PRE` "+ - QString().sprintf("add column SEGUE_GAIN int default %d ", + QString().sprintf("add column `SEGUE_GAIN` int default %d ", RD_FADE_DEPTH)+ - "after SEGUE_END_POINT"; + "after `SEGUE_END_POINT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table '")+tablename+"_POST' "+ - "add column FADEUP_POINT int default -1 after END_POINT"; + "add column `FADEUP_POINT` int default -1 after `END_POINT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table '")+tablename+"_POST' "+ - QString().sprintf("add column FADEUP_GAIN int default %d ", + QString().sprintf("add column `FADEUP_GAIN` int default %d ", RD_FADE_DEPTH)+ - "after FADEUP_POINT"; + "after `FADEUP_POINT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_POST` "+ - "add column FADEDOWN_POINT int default -1 after FADEUP_GAIN"; + "add column `FADEDOWN_POINT` int default -1 after `FADEUP_GAIN`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_POST` "+ - QString().sprintf("add column FADEDOWN_GAIN int default %d ", + QString().sprintf("add column `FADEDOWN_GAIN` int default %d ", RD_FADE_DEPTH)+ - "after FADEDOWN_POINT"; + "after `FADEDOWN_POINT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_POST` "+ - QString().sprintf("add column SEGUE_GAIN int default %d ", + QString().sprintf("add column `SEGUE_GAIN` int default %d ", RD_FADE_DEPTH)+ - "after SEGUE_END_POINT"; + "after `SEGUE_END_POINT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2094,27 +2379,27 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<94)&&(set_schema>cur_schema)) { - sql="alter table CART add column OWNER char(64) after ASYNCRONOUS"; + sql="alter table `CART` add column `OWNER` char(64) after `ASYNCRONOUS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table CART add index OWNER_IDX (OWNER)"; + sql="alter table `CART` add index `OWNER_IDX` (`OWNER`)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column TRACK_GROUP char(10) after CHAIN_LOG"; + sql="alter table `SERVICES` add column `TRACK_GROUP` char(10) after `CHAIN_LOG`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table LOGS add column SCHEDULED_TRACKS int unsigned default 0 after IMPORT_DATE"; + sql="alter table `LOGS` add column `SCHEDULED_TRACKS` int unsigned default 0 after `IMPORT_DATE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table LOGS add column COMPLETED_TRACKS int unsigned default 0 after SCHEDULED_TRACKS"; + sql="alter table `LOGS` add column `COMPLETED_TRACKS` int unsigned default 0 after `SCHEDULED_TRACKS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2123,7 +2408,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<95)&&(set_schema>cur_schema)) { - sql="alter table USERS add column VOICETRACK_LOG_PRIV enum('N','Y') not null default 'N' after ADDTO_LOG_PRIV"; + sql="alter table `USERS` add column `VOICETRACK_LOG_PRIV` enum('N','Y') not null default 'N' after `ADDTO_LOG_PRIV`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2132,34 +2417,34 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<96)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists RDLOGEDIT (")+ - "ID int unsigned primary key auto_increment,"+ - "STATION char(64) not null,"+ - "INPUT_CARD int default -1,"+ - "INPUT_PORT int default 0,"+ - "OUTPUT_CARD int default -1,"+ - "OUTPUT_PORT int default 0,"+ - "FORMAT int unsigned default 0,"+ - "SAMPRATE int unsigned default 44100,"+ - "LAYER int unsigned default 0,"+ - "BITRATE int unsigned default 0,"+ - "DEFAULT_CHANNELS int unsigned default 2,"+ - "MAXLENGTH int default 0,"+ - "TAIL_PREROLL int unsigned default 2000,"+ - "START_CART int unsigned default 0,"+ - "END_CART int unsigned default 0,"+ - "index STATION_IDX (STATION))"+ + sql=QString("create table if not exists `RDLOGEDIT` (")+ + "`ID` int unsigned primary key auto_increment,"+ + "`STATION` char(64) not null,"+ + "`INPUT_CARD` int default -1,"+ + "`INPUT_PORT` int default 0,"+ + "`OUTPUT_CARD` int default -1,"+ + "`OUTPUT_PORT` int default 0,"+ + "`FORMAT` int unsigned default 0,"+ + "`SAMPRATE` int unsigned default 44100,"+ + "`LAYER` int unsigned default 0,"+ + "`BITRATE` int unsigned default 0,"+ + "`DEFAULT_CHANNELS` int unsigned default 2,"+ + "`MAXLENGTH` int default 0,"+ + "`TAIL_PREROLL` int unsigned default 2000,"+ + "`START_CART` int unsigned default 0,"+ + "`END_CART` int unsigned default 0,"+ + "index `STATION_IDX` (`STATION`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select NAME from STATIONS"; + sql="select `NAME` from `STATIONS`"; q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("insert into RDLOGEDIT set ")+ - "STATION=\""+RDEscapeString(q->value(0).toString())+"\""; + sql=QString("insert into `RDLOGEDIT` set ")+ + "`STATION`='"+RDEscapeString(q->value(0).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2170,20 +2455,20 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<97)&&(set_schema>cur_schema)) { - sql="alter table LOGS add column LOG_EXISTS enum('N','Y') default 'Y' after NAME"; + sql="alter table `LOGS` add column `LOG_EXISTS` enum('N','Y') default 'Y' after `NAME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table LOGS add index NAME_IDX (NAME,LOG_EXISTS)"; + sql="alter table `LOGS` add index `NAME_IDX` (`NAME,LOG_EXISTS`)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table USERS add column DELETE_REC_PRIV enum('N','Y') default 'N' after DELETE_LOG_PRIV"; + sql="alter table `USERS` add column `DELETE_REC_PRIV` enum('N','Y') default 'N' after `DELETE_LOG_PRIV`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="update USERS set DELETE_REC_PRIV=\"Y\" where DELETE_LOG_PRIV=\"Y\""; + sql="update `USERS` set `DELETE_REC_PRIV`='Y' where `DELETE_LOG_PRIV`='Y'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2193,88 +2478,88 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) if((cur_schema<98)&&(set_schema>cur_schema)) { QString tablename; - sql="select NAME from SERVICES"; + sql="select `NAME` from `SERVICES`"; q=new RDSqlQuery(sql,false); while(q->next()) { sql=QString("create table `")+q->value(0).toString()+"_SRT` ("+ - "ID int unsigned auto_increment primary key,"+ - "LENGTH int,"+ - "LOG_NAME char(64),"+ - "LOG_ID int,"+ - "CART_NUMBER int unsigned,"+ - "CUT_NUMBER int,"+ - "TITLE char(255),"+ - "ARTIST char(255),"+ - "STATION_NAME char(64),"+ - "EVENT_DATETIME datetime,"+ - "SCHEDULED_TIME time,"+ - "EVENT_TYPE int,"+ - "EVENT_SOURCE int,"+ - "PLAY_SOURCE int,"+ - "START_SOURCE int default 0,"+ - "EXT_START_TIME time,"+ - "EXT_LENGTH int,"+ - "EXT_CART_NAME char(32),"+ - "EXT_DATA char(32),"+ - "EXT_EVENT_ID char(8),"+ - "EXT_ANNC_TYPE char(8),"+ - "index EVENT_DATETIME_IDX(EVENT_DATETIME))"+ + "`ID` int unsigned auto_increment primary key,"+ + "`LENGTH` int,"+ + "`LOG_NAME` char(64),"+ + "`LOG_ID` int,"+ + "`CART_NUMBER` int unsigned,"+ + "`CUT_NUMBER` int,"+ + "`TITLE` char(255),"+ + "`ARTIST` char(255),"+ + "`STATION_NAME` char(64),"+ + "`EVENT_DATETIME` datetime,"+ + "`SCHEDULED_TIME` time,"+ + "`EVENT_TYPE` int,"+ + "`EVENT_SOURCE` int,"+ + "`PLAY_SOURCE` int,"+ + "`START_SOURCE` int default 0,"+ + "`EXT_START_TIME` time,"+ + "`EXT_LENGTH` int,"+ + "`EXT_CART_NAME` char(32),"+ + "`EXT_DATA` char(32),"+ + "`EXT_EVENT_ID` char(8),"+ + "`EXT_ANNC_TYPE` char(8),"+ + "index `EVENT_DATETIME_IDX` (`EVENT_DATETIME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("select NAME from LOGS where ")+ - "SERVICE=\""+RDEscapeString(q->value(0).toString())+"\""; + sql=QString("select `NAME` from `LOGS` where ")+ + "`SERVICE`='"+RDEscapeString(q->value(0).toString())+"'"; q1=new RDSqlQuery(sql,false); while(q1->next()) { tablename=q1->value(0).toString(); tablename.replace(" ","_"); sql=QString("select ")+ - "`"+tablename+"_REC`.LENGTH,"+ - "`"+tablename+"_REC`.LOG_ID,"+ - "`"+tablename+"_REC`.CART_NUMBER,"+ - "`"+tablename+"_REC`.CUT_NUMBER,"+ - "`"+tablename+"_REC`.STATION_NAME,"+ - "`"+tablename+"_REC`.EVENT_DATETIME,"+ - "`"+tablename+"_REC`.EVENT_TYPE,"+ - "`"+tablename+"_REC`.EVENT_SOURCE,"+ - "`"+tablename+"_REC`.PLAY_SOURCE,"+ - "`"+tablename+"_REC`.EXT_START_TIME,"+ - "`"+tablename+"_REC`.EXT_LENGTH,"+ - "`"+tablename+"_REC`.EXT_CART_NAME,"+ - "`"+tablename+"_REC`.EXT_DATA,"+ - "`"+tablename+"_REC`.EXT_EVENT_ID,"+ - "`"+tablename+"_REC`.EXT_ANNC_TYPE,"+ - "CART.TITLE,"+ - "CART.ARTIST "+ - "from CART right join `"+tablename+"_REC` on "+ - "CART.NUMBER=`"+tablename+"_REC`.CART_NUMBER"; + "`"+tablename+"_REC`.`LENGTH`,"+ + "`"+tablename+"_REC`.`LOG_ID`,"+ + "`"+tablename+"_REC`.`CART_NUMBER`,"+ + "`"+tablename+"_REC`.`CUT_NUMBER`,"+ + "`"+tablename+"_REC`.`STATION_NAME`,"+ + "`"+tablename+"_REC`.`EVENT_DATETIME`,"+ + "`"+tablename+"_REC`.`EVENT_TYPE`,"+ + "`"+tablename+"_REC`.`EVENT_SOURCE`,"+ + "`"+tablename+"_REC`.`PLAY_SOURCE`,"+ + "`"+tablename+"_REC`.`EXT_START_TIME`,"+ + "`"+tablename+"_REC`.`EXT_LENGTH`,"+ + "`"+tablename+"_REC`.`EXT_CART_NAME`,"+ + "`"+tablename+"_REC`.`EXT_DATA`,"+ + "`"+tablename+"_REC`.`EXT_EVENT_ID`,"+ + "`"+tablename+"_REC`.`EXT_ANNC_TYPE`,"+ + "`CART`.`TITLE`,"+ + "`CART`.`ARTIST` "+ + "from `CART` right join `"+tablename+"_REC` on "+ + "`CART`.`NUMBER`=`"+tablename+"_REC`.`CART_NUMBER`"; q2=new RDSqlQuery(sql,false); while(q2->next()) { sql=QString("insert into `")+q->value(0).toString()+"_SRT` set "+ - QString().sprintf("LENGTH=%d,",q2->value(0).toInt())+ - "LOG_NAME=\""+RDEscapeString(q1->value(0).toString())+"\","+ - QString().sprintf("LOG_ID=%d,",q2->value(1).toInt())+ - QString().sprintf("CART_NUMBER=%u,",q2->value(2).toUInt())+ - QString().sprintf("CUT_NUMBER=%d,",q2->value(3).toInt())+ - "TITLE=\""+RDEscapeString(q2->value(15).toString())+"\","+ - "ARTIST=\""+RDEscapeString(q2->value(16).toString())+"\","+ - "STATION_NAME=\""+RDEscapeString(q2->value(4).toString())+"\","+ - "EVENT_DATETIME=\""+RDEscapeString(q2->value(5).toDateTime(). - toString("yyyy-MM-dd hh:mm:ss"))+"\","+ - "SCHEDULED_TIME=\"00:00:00\","+ - QString().sprintf("EVENT_TYPE=%d,",q2->value(6).toInt())+ - QString().sprintf("EVENT_SOURCE=%d,",q2->value(7).toInt())+ - QString().sprintf("PLAY_SOURCE=%d,",q2->value(8).toInt())+ - "EXT_START_TIME=\""+RDEscapeString(q2->value(9).toTime(). - toString("hh:mm:ss"))+"\","+ - QString().sprintf("EXT_LENGTH=%d,",q2->value(10).toInt())+ - "EXT_CART_NAME=\""+RDEscapeString(q2->value(11).toString())+"\","+ - "EXT_DATA=\""+RDEscapeString(q2->value(12).toString())+"\","+ - "EXT_EVENT_ID=\""+RDEscapeString(q2->value(13).toString())+"\","+ - "EXT_ANNC_TYPE=\""+RDEscapeString(q2->value(14).toString())+"\""; + QString().sprintf("`LENGTH`=%d,",q2->value(0).toInt())+ + "`LOG_NAME`='"+RDEscapeString(q1->value(0).toString())+"',"+ + QString().sprintf("`LOG_ID`=%d,",q2->value(1).toInt())+ + QString().sprintf("`CART_NUMBER`=%u,",q2->value(2).toUInt())+ + QString().sprintf("`CUT_NUMBER`=%d,",q2->value(3).toInt())+ + "`TITLE`='"+RDEscapeString(q2->value(15).toString())+"',"+ + "`ARTIST`='"+RDEscapeString(q2->value(16).toString())+"',"+ + "`STATION_NAME`='"+RDEscapeString(q2->value(4).toString())+"',"+ + "`EVENT_DATETIME`='"+RDEscapeString(q2->value(5).toDateTime(). + toString("yyyy-MM-dd hh:mm:ss"))+"',"+ + "`SCHEDULED_TIME`='00:00:00',"+ + QString().sprintf("`EVENT_TYPE`=%d,",q2->value(6).toInt())+ + QString().sprintf("`EVENT_SOURCE`=%d,",q2->value(7).toInt())+ + QString().sprintf("`PLAY_SOURCE`=%d,",q2->value(8).toInt())+ + "`EXT_START_TIME`='"+RDEscapeString(q2->value(9).toTime(). + toString("hh:mm:ss"))+"',"+ + QString().sprintf("`EXT_LENGTH`=%d,",q2->value(10).toInt())+ + "`EXT_CART_NAME`='"+RDEscapeString(q2->value(11).toString())+"',"+ + "`EXT_DATA`='"+RDEscapeString(q2->value(12).toString())+"',"+ + "`EXT_EVENT_ID`='"+RDEscapeString(q2->value(13).toString())+"',"+ + "`EXT_ANNC_TYPE`='"+RDEscapeString(q2->value(14).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2285,7 +2570,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } delete q; - sql="alter table RDAIRPLAY add column DEFAULT_SERVICE char(10) after PAUSE_ENABLED"; + sql="alter table `RDAIRPLAY` add column `DEFAULT_SERVICE` char(10) after `PAUSE_ENABLED`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2294,11 +2579,11 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<99)&&(set_schema>cur_schema)) { - sql="alter table USERS add column CONFIG_PANELS_PRIV enum('N','Y') default 'N' after REMOVEFROM_LOG_PRIV"; + sql="alter table `USERS` add column `CONFIG_PANELS_PRIV` enum('N','Y') default 'N' after `REMOVEFROM_LOG_PRIV`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="update USERS set CONFIG_PANELS_PRIV=\"Y\""; + sql="update `USERS` set `CONFIG_PANELS_PRIV`='Y'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2307,16 +2592,16 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<100)&&(set_schema>cur_schema)) { - sql="alter table CUTS add column ISRC char(12) after OUTCUE"; + sql="alter table `CUTS` add column `ISRC` char(12) after `OUTCUE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select NUMBER,ISRC from CART"; + sql="select `NUMBER`,`ISRC` from `CART`"; q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("update CUTS set ")+ - "ISRC=\""+RDEscapeString(q->value(1).toString())+"\" where "+ - QString().sprintf("CART_NUMBER=%u",q->value(0).toUInt()); + sql=QString("update `CUTS` set ")+ + "`ISRC`='"+RDEscapeString(q->value(1).toString())+"' where "+ + QString().sprintf("`CART_NUMBER`=%u",q->value(0).toUInt()); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2328,9 +2613,9 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) if((cur_schema<101)&&(set_schema>cur_schema)) { for(int i=0;icur_schema)) { - sql="alter table CART add column PUBLISHER char(64) after AGENCY"; + sql="alter table `CART` add column `PUBLISHER` char(64) after `AGENCY`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table CART add index PUBLISHER_IDX (PUBLISHER)"; + sql="alter table `CART` add index `PUBLISHER_IDX` (`PUBLISHER`)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table CART add column COMPOSER char(64) after PUBLISHER"; + sql="alter table `CART` add column `COMPOSER` char(64) after `PUBLISHER`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table CART add index COMPOSER_IDX (COMPOSER)"; + sql="alter table `CART` add index `COMPOSER_IDX` (`COMPOSER`)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2367,52 +2652,52 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<104)&&(set_schema>cur_schema)) { - sql="alter table CART add column USAGE_CODE int default 0\ - after USER_DEFINED"; + sql="alter table `CART` add column `USAGE_CODE` int default 0\ + after `USER_DEFINED`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table REPORTS add column LINES_PER_PAGE int default 66\ - after USE_LEADING_ZEROS"; + sql="alter table `REPORTS` add column `LINES_PER_PAGE` int default 66\ + after `USE_LEADING_ZEROS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table REPORTS add column STATION_TYPE int default 0\ - after LINES_PER_PAGE"; + sql="alter table `REPORTS` add column `STATION_TYPE` int default 0\ + after `LINES_PER_PAGE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table REPORTS add column STATION_FORMAT char(64)\ - after STATION_TYPE"; + sql="alter table `REPORTS` add column `STATION_FORMAT` char(64)\ + after `STATION_TYPE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select NAME from SERVICES"; + sql="select `NAME` from `SERVICES`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table `")+tablename+"_SRT` "+ - "add column PUBLISHER char(64) after ARTIST"; + "add column `PUBLISHER` char(64) after `ARTIST`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_SRT` "+ - "add column COMPOSER char(64) after PUBLISHER"; + "add column `COMPOSER` char(64) after `PUBLISHER`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_SRT` "+ - "add column ISRC char(12) after PUBLISHER"; + "add column `ISRC` char(12) after `PUBLISHER`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_SRT` "+ - "add column USAGE_CODE int default 0 after ISRC"; + "add column `USAGE_CODE` int default 0 after `ISRC`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2424,10 +2709,10 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) if((cur_schema<105)&&(set_schema>cur_schema)) { for(int i=0;i<6;i++) { - sql=QString().sprintf("alter table RDAIRPLAY add column START_RML%d char(255) after PORT%d",i,i); + sql=QString().sprintf("alter table `RDAIRPLAY` add column `START_RML%d` char(255) after `PORT%d`",i,i); q=new RDSqlQuery(sql,false); delete q; - sql=QString().sprintf("alter table RDAIRPLAY add column STOP_RML%d char(255) after START_RML%d",i,i); + sql=QString().sprintf("alter table `RDAIRPLAY` add column `STOP_RML%d` char(255) after `START_RML%d`",i,i); q=new RDSqlQuery(sql,false); delete q; } @@ -2437,7 +2722,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) if((cur_schema<106)&&(set_schema>cur_schema)) { for(int i=0;i<3;i++) { - sql=QString().sprintf("alter table RDAIRPLAY add column LOG_RML%d char(255) after UDP_STRING%d",i,i); + sql=QString().sprintf("alter table `RDAIRPLAY` add column `LOG_RML%d` char(255) after `UDP_STRING%d`",i,i); q=new RDSqlQuery(sql,false); delete q; } @@ -2446,11 +2731,11 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<107)&&(set_schema>cur_schema)) { - sql="alter table RDLOGEDIT add column REC_START_CART int unsigned default 0 after END_CART"; + sql="alter table `RDLOGEDIT` add column `REC_START_CART` int unsigned default 0 after `END_CART`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDLOGEDIT add column REC_END_CART int unsigned default 0 after REC_START_CART"; + sql="alter table `RDLOGEDIT` add column `REC_END_CART` int unsigned default 0 after `REC_START_CART`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2459,11 +2744,11 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<108)&&(set_schema>cur_schema)) { - sql="alter table CART add column AVERAGE_SEGUE_LENGTH int unsigned after LENGTH_DEVIATION"; + sql="alter table `CART` add column `AVERAGE_SEGUE_LENGTH` int unsigned after `LENGTH_DEVIATION`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select NUMBER from CART"; + sql="select `NUMBER` from `CART`"; q=new RDSqlQuery(sql,false); while(q->next()) { cart=new RDCart(q->value(0).toUInt()); @@ -2476,7 +2761,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<109)&&(set_schema>cur_schema)) { - sql="alter table EVENTS add column NESTED_EVENT char(64) after COLOR"; + sql="alter table `EVENTS` add column `NESTED_EVENT` char(64) after `COLOR`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2486,48 +2771,48 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) if((cur_schema<110)&&(set_schema>cur_schema)) { for(unsigned i=6;i<10;i++) { - sql=QString().sprintf("alter table RDAIRPLAY add column CARD%d int default -1 after STOP_RML%d",i,i-1); + sql=QString().sprintf("alter table `RDAIRPLAY` add column `CARD%d` int default -1 after `STOP_RML%d`",i,i-1); q=new RDSqlQuery(sql,false); delete q; - sql=QString().sprintf("alter table RDAIRPLAY add column PORT%d int default -1 after CARD%d",i,i); + sql=QString().sprintf("alter table `RDAIRPLAY` add column `PORT%d` int default -1 after `CARD%d`",i,i); q=new RDSqlQuery(sql,false); delete q; - sql=QString().sprintf("alter table RDAIRPLAY add column START_RML%d char(255) after PORT%d",i,i); + sql=QString().sprintf("alter table `RDAIRPLAY` add column `START_RML%d` char(255) after `PORT%d`",i,i); q=new RDSqlQuery(sql,false); delete q; - sql=QString().sprintf("alter table RDAIRPLAY add column STOP_RML%d char(255) after START_RML%d",i,i); + sql=QString().sprintf("alter table `RDAIRPLAY` add column `STOP_RML%d` char(255) after `START_RML%d`",i,i); q=new RDSqlQuery(sql,false); delete q; } sql=QString("select ")+ - "ID,"+ // 00 - "CARD2,"+ // 01 - "PORT2,"+ // 02 - "START_RML2,"+ // 03 - "STOP_RML2 "+ // 04 - "from RDAIRPLAY"; + "`ID`,"+ // 00 + "`CARD2`,"+ // 01 + "`PORT2`,"+ // 02 + "`START_RML2`,"+ // 03 + "`STOP_RML2` "+ // 04 + "from `RDAIRPLAY`"; q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("update RDAIRPLAY set ")+ - QString().sprintf("CARD6=%d,",q->value(1).toInt())+ - QString().sprintf("PORT6=%d,",q->value(2).toInt())+ - "START_RML6=\""+RDEscapeString(q->value(3).toString())+"\","+ - "STOP_RML6=\""+RDEscapeString(q->value(4).toString())+"\","+ - QString().sprintf("CARD7=%d,",q->value(1).toInt())+ - QString().sprintf("PORT7=%d,",q->value(2).toInt())+ - "START_RML7=\""+RDEscapeString(q->value(3).toString())+"\","+ - "STOP_RML7=\""+RDEscapeString(q->value(4).toString())+"\","+ - QString().sprintf("CARD8=%d,",q->value(1).toInt())+ - QString().sprintf("PORT8=%d,",q->value(2).toInt())+ - "START_RML8=\""+RDEscapeString(q->value(3).toString())+"\","+ - "STOP_RML8=\""+RDEscapeString(q->value(4).toString())+"\","+ - QString().sprintf("CARD9=%d,",q->value(1).toInt())+ - QString().sprintf("PORT9=%d,",q->value(2).toInt())+ - "START_RML9=\""+RDEscapeString(q->value(3).toString())+"\","+ - "STOP_RML9=\""+RDEscapeString(q->value(4).toString())+"\""; + sql=QString("update `RDAIRPLAY` set ")+ + QString().sprintf("`CARD6`=%d,",q->value(1).toInt())+ + QString().sprintf("`PORT6`=%d,",q->value(2).toInt())+ + "`START_RML6`='"+RDEscapeString(q->value(3).toString())+"',"+ + "`STOP_RML6`='"+RDEscapeString(q->value(4).toString())+"',"+ + QString().sprintf("`CARD7`=%d,",q->value(1).toInt())+ + QString().sprintf("`PORT7`=%d,",q->value(2).toInt())+ + "`START_RML7`='"+RDEscapeString(q->value(3).toString())+"',"+ + "`STOP_RML7`='"+RDEscapeString(q->value(4).toString())+"',"+ + QString().sprintf("`CARD8`=%d,",q->value(1).toInt())+ + QString().sprintf("`PORT8`=%d,",q->value(2).toInt())+ + "`START_RML8`='"+RDEscapeString(q->value(3).toString())+"',"+ + "`STOP_RML8`='"+RDEscapeString(q->value(4).toString())+"',"+ + QString().sprintf("`CARD9`=%d,",q->value(1).toInt())+ + QString().sprintf("`PORT9`=%d,",q->value(2).toInt())+ + "`START_RML9`='"+RDEscapeString(q->value(3).toString())+"',"+ + "`STOP_RML9`='"+RDEscapeString(q->value(4).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2538,15 +2823,15 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<111)&&(set_schema>cur_schema)) { - sql="alter table CART add column VALIDITY int unsigned default 2 after PLAY_ORDER"; + sql="alter table `CART` add column `VALIDITY` int unsigned default 2 after `PLAY_ORDER`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table CUTS add column VALIDITY int unsigned default 2 after LOCAL_COUNTER"; + sql="alter table `CUTS` add column `VALIDITY` int unsigned default 2 after `LOCAL_COUNTER`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select NUMBER from CART"; + sql="select `NUMBER` from `CART`"; q=new RDSqlQuery(sql,false); while(q->next()) { cart=new RDCart(q->value(0).toUInt()); @@ -2559,33 +2844,37 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<112)&&(set_schema>cur_schema)) { - sql="alter table RDLOGEDIT add column TRIM_THRESHOLD int default -3000 after REC_END_CART"; + sql="alter table `RDLOGEDIT` add column `TRIM_THRESHOLD` int default -3000 after `REC_END_CART`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDLOGEDIT add column RIPPER_LEVEL int default -1300 after TRIM_THRESHOLD"; + sql="alter table `RDLOGEDIT` add column `RIPPER_LEVEL` int default -1300 after `TRIM_THRESHOLD`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select STATION,TRIM_THRESHOLD,RIPPER_LEVEL from RDLIBRARY"; + sql=QString("select ")+ + "`STATION`,"+ // 00 + "`TRIM_THRESHOLD`,"+ // 01 + "`RIPPER_LEVEL` "+ // 02 + "from `RDLIBRARY`"; q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("update RDLOGEDIT set ")+ - QString().sprintf("TRIM_THRESHOLD=%d,",q->value(1).toInt())+ - QString().sprintf("RIPPER_LEVEL=%d where ",q->value(2).toInt())+ - "STATION=\""+RDEscapeString(q->value(0).toString())+"\""; + sql=QString("update `RDLOGEDIT` set ")+ + QString().sprintf("`TRIM_THRESHOLD`=%d,",q->value(1).toInt())+ + QString().sprintf("`RIPPER_LEVEL`=%d where ",q->value(2).toInt())+ + "STATION='"+RDEscapeString(q->value(0).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } delete q; - sql="alter table RDLIBRARY modify RIPPER_LEVEL int default -1300"; + sql="alter table `RDLIBRARY` modify `RIPPER_LEVEL` int default -1300"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDLOGEDIT modify DEFAULT_CHANNELS int unsigned default 1"; + sql="alter table `RDLOGEDIT` modify `DEFAULT_CHANNELS` int unsigned default 1"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2594,17 +2883,17 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<113)&&(set_schema>cur_schema)) { - sql="alter table VGUEST_RESOURCES modify SURFACE_NUM int default 0"; + sql="alter table `VGUEST_RESOURCES` modify `SURFACE_NUM` int default 0"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column MUS_BREAK_STRING char(64) after MUS_WIN_PATH"; + sql="alter table `SERVICES` add column `MUS_BREAK_STRING` char(64) after `MUS_WIN_PATH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column MUS_TRACK_STRING char(64) after MUS_BREAK_STRING"; + sql="alter table `SERVICES` add column `MUS_TRACK_STRING` char(64) after `MUS_BREAK_STRING`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2613,106 +2902,106 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<114)&&(set_schema>cur_schema)) { - sql="alter table LOGS add column MUSIC_LINKS int default 0 after COMPLETED_TRACKS"; + sql="alter table `LOGS` add column `MUSIC_LINKS` int default 0 after `COMPLETED_TRACKS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table LOGS add column MUSIC_LINKED enum('N','Y') default 'N' after MUSIC_LINKS"; + sql="alter table `LOGS` add column `MUSIC_LINKED` enum('N','Y') default 'N' after `MUSIC_LINKS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table LOGS add column TRAFFIC_LINKS int default 0 after MUSIC_LINKED"; + sql="alter table `LOGS` add column `TRAFFIC_LINKS` int default 0 after `MUSIC_LINKED`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table LOGS add column TRAFFIC_LINKED enum('N','Y') default 'N' after TRAFFIC_LINKS"; + sql="alter table `LOGS` add column `TRAFFIC_LINKED` enum('N','Y') default 'N' after `TRAFFIC_LINKS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select NAME from LOGS"; + sql="select NAME from `LOGS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table `")+tablename+"_LOG` "+ - "add column LINK_EVENT_NAME char(64) after POST_TIME"; + "add column `LINK_EVENT_NAME` char(64) after `POST_TIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_LOG` "+ - "add column LINK_START_TIME time after LINK_EVENT_NAME"; + "add column `LINK_START_TIME` time after `LINK_EVENT_NAME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString().sprintf("alter table `")+tablename+"_LOG` "+ - "add column LINK_LENGTH int default 0 after LINK_START_TIME"; + "add column `LINK_LENGTH` int default 0 after `LINK_START_TIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_LOG` "+ - "add column LINK_ID int default -1 after LINK_LENGTH"; + "add column `LINK_ID` int default -1 after `LINK_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } delete q; - sql="select NAME from EVENTS"; + sql="select `NAME` from `EVENTS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table `")+tablename+"_PRE` "+ - "add column LINK_EVENT_NAME char(64) after POST_TIME"; + "add column `LINK_EVENT_NAME` char(64) after `POST_TIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_PRE` "+ - "add column LINK_START_TIME time after LINK_EVENT_NAME"; + "add column `LINK_START_TIME` time after `LINK_EVENT_NAME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_PRE` "+ - "add column LINK_LENGTH int default 0 after LINK_START_TIME"; + "add column `LINK_LENGTH` int default 0 after `LINK_START_TIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_PRE` "+ - "add column LINK_ID int default -1 after LINK_LENGTH"; + "add column `LINK_ID` int default -1 after `LINK_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_POST` "+ - "add column LINK_EVENT_NAME char(64) after POST_TIME"; + "add column `LINK_EVENT_NAME` char(64) after `POST_TIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_POST` "+ - "add column LINK_START_TIME time after LINK_EVENT_NAME"; + "add column `LINK_START_TIME` time after `LINK_EVENT_NAME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_POST` "+ - "add column LINK_LENGTH int default 0 after LINK_START_TIME"; + "add column `LINK_LENGTH` int default 0 after `LINK_START_TIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_POST` "+ - "add column LINK_ID int default -1 after LINK_LENGTH"; + "add column `LINK_ID` int default -1 after `LINK_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2723,39 +3012,39 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<115)&&(set_schema>cur_schema)) { - sql="select NAME from LOGS"; + sql="select `NAME` from `LOGS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table `")+tablename+"_LOG` "+ - "modify column LABEL char(64)"; + "modify column `LABEL` char(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } delete q; - sql="select NAME from EVENTS"; + sql="select `NAME` from `EVENTS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table `")+tablename+"_PRE` "+ - "modify column LABEL char(64)"; + "modify column `LABEL` char(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_POST` "+ - "modify column LABEL char(64)"; + "modify column `LABEL` char(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } delete q; - sql="alter table SERVICES add column TRACK_GROUP char(10) after CHAIN_LOG"; + sql="alter table `SERVICES` add column `TRACK_GROUP` char(10) after `CHAIN_LOG`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2764,32 +3053,32 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<116)&&(set_schema>cur_schema)) { - sql="select NAME from LOGS"; + sql="select `NAME` from `LOGS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table `")+tablename+"_LOG` "+ - "add column LINK_EMBEDDED enum('N','Y') default 'N' after LINK_ID"; + "add column `LINK_EMBEDDED` enum('N','Y') default 'N' after `LINK_ID`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } delete q; - sql="select NAME from EVENTS"; + sql="select `NAME` from `EVENTS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table `")+tablename+"_PRE` "+ - "add column LINK_EMBEDDED enum('N','Y') default 'N' after LINK_ID"; + "add column `LINK_EMBEDDED` enum('N','Y') default 'N' after `LINK_ID`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_POST` "+ - "add column LINK_EMBEDDED enum('N','Y') default 'N' after LINK_ID"; + "add column `LINK_EMBEDDED` enum('N','Y') default 'N' after `LINK_ID`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2800,18 +3089,18 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<117)&&(set_schema>cur_schema)) { - sql="select NAME from LOGS"; + sql="select `NAME` from `LOGS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table `")+tablename+"_LOG` "+ - "add column ORIGIN_USER char(8) after POST_TIME"; + "add column `ORIGIN_USER` char(8) after `POST_TIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_LOG` "+ - "add column ORIGIN_DATETIME datetime after ORIGIN_USER"; + "add column `ORIGIN_DATETIME` datetime after `ORIGIN_USER`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2819,29 +3108,29 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } delete q; - sql="select NAME from EVENTS"; + sql="select `NAME` from `EVENTS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table `")+tablename+"_PRE` "+ - "add column ORIGIN_USER char(8) after POST_TIME"; + "add column `ORIGIN_USER` char(8) after `POST_TIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_PRE` "+ - "add column ORIGIN_DATETIME datetime after ORIGIN_USER"; + "add column `ORIGIN_DATETIME` datetime after `ORIGIN_USER`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_POST` "+ - "add column ORIGIN_USER char(8) after POST_TIME"; + "add column `ORIGIN_USER` char(8) after `POST_TIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_POST` "+ - "add column ORIGIN_DATETIME datetime after ORIGIN_USER"; + "add column `ORIGIN_DATETIME` datetime after `ORIGIN_USER`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2855,35 +3144,35 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<118)&&(set_schema>cur_schema)) { - sql="alter table SERVICES add column TFC_LABEL_CART char(32) after TFC_WIN_PATH"; + sql="alter table `SERVICES` add column `TFC_LABEL_CART` char(32) after `TFC_WIN_PATH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column TFC_TRACK_CART char(32) after TFC_LABEL_CART"; + sql="alter table `SERVICES` add column `TFC_TRACK_CART` char(32) after `TFC_LABEL_CART`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column MUS_LABEL_CART char(32) after MUS_WIN_PATH"; + sql="alter table `SERVICES` add column `MUS_LABEL_CART` char(32) after `MUS_WIN_PATH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column MUS_TRACK_CART char(32) after MUS_LABEL_CART"; + sql="alter table `SERVICES` add column `MUS_TRACK_CART` char(32) after `MUS_LABEL_CART`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column TFC_TITLE_OFFSET int after TFC_CART_LENGTH"; + sql="alter table `SERVICES` add column `TFC_TITLE_OFFSET` int after `TFC_CART_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column TFC_TITLE_LENGTH int after TFC_TITLE_OFFSET"; + sql="alter table `SERVICES` add column `TFC_TITLE_LENGTH` int after `TFC_TITLE_OFFSET`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column MUS_TITLE_OFFSET int after MUS_CART_LENGTH"; + sql="alter table `SERVICES` add column `MUS_TITLE_OFFSET` int after `MUS_CART_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column MUS_TITLE_LENGTH int after MUS_TITLE_OFFSET"; + sql="alter table `SERVICES` add column `MUS_TITLE_LENGTH` int after `MUS_TITLE_OFFSET`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2892,88 +3181,88 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<119)&&(set_schema>cur_schema)) { - sql="alter table SERVICES add column TFC_HOURS_OFFSET int after TFC_START_LENGTH"; + sql="alter table `SERVICES` add column `TFC_HOURS_OFFSET` int after `TFC_START_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column TFC_HOURS_LENGTH int after TFC_HOURS_OFFSET"; + sql="alter table `SERVICES` add column `TFC_HOURS_LENGTH` int after `TFC_HOURS_OFFSET`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column TFC_MINUTES_OFFSET int after TFC_HOURS_LENGTH"; + sql="alter table `SERVICES` add column `TFC_MINUTES_OFFSET` int after `TFC_HOURS_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column TFC_MINUTES_LENGTH int after TFC_MINUTES_OFFSET"; + sql="alter table `SERVICES` add column `TFC_MINUTES_LENGTH` int after `TFC_MINUTES_OFFSET`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column TFC_SECONDS_OFFSET int after TFC_MINUTES_LENGTH"; + sql="alter table `SERVICES` add column `TFC_SECONDS_OFFSET` int after `TFC_MINUTES_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column TFC_SECONDS_LENGTH int after TFC_SECONDS_OFFSET"; + sql="alter table `SERVICES` add column `TFC_SECONDS_LENGTH` int after `TFC_SECONDS_OFFSET`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select NAME,TFC_START_OFFSET from SERVICES where TFC_START_LENGTH=8"; + sql="select `NAME`,`TFC_START_OFFSET` from `SERVICES` where `TFC_START_LENGTH`=8"; q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("update SERVICES set ")+ - QString().sprintf("TFC_HOURS_OFFSET=%d,",q->value(1).toInt())+ - "TFC_HOURS_LENGTH=2,"+ - QString().sprintf("TFC_MINUTES_OFFSET=%d,",q->value(1).toInt()+3)+ - "TFC_MINUTES_LENGTH=2,"+ - QString().sprintf("TFC_SECONDS_OFFSET=%d,",q->value(1).toInt()+6)+ - "TFC_SECONDS_LENGTH=2 where "+ - "NAME=\""+RDEscapeString(q->value(0).toString())+"\""; + sql=QString("update `SERVICES` set ")+ + QString().sprintf("`TFC_HOURS_OFFSET`=%d,",q->value(1).toInt())+ + "`TFC_HOURS_LENGTH`=2,"+ + QString().sprintf("`TFC_MINUTES_OFFSET`=%d,",q->value(1).toInt()+3)+ + "`TFC_MINUTES_LENGTH`=2,"+ + QString().sprintf("`TFC_SECONDS_OFFSET`=%d,",q->value(1).toInt()+6)+ + "`TFC_SECONDS_LENGTH`=2 where "+ + "`NAME`='"+RDEscapeString(q->value(0).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } delete q; - sql="alter table SERVICES add column MUS_HOURS_OFFSET int after MUS_START_LENGTH"; + sql="alter table `SERVICES` add column `MUS_HOURS_OFFSET` int after `MUS_START_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column MUS_HOURS_LENGTH int after MUS_HOURS_OFFSET"; + sql="alter table `SERVICES` add column `MUS_HOURS_LENGTH` int after `MUS_HOURS_OFFSET`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column MUS_MINUTES_OFFSET int after MUS_HOURS_LENGTH"; + sql="alter table `SERVICES` add column `MUS_MINUTES_OFFSET` int after `MUS_HOURS_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column MUS_MINUTES_LENGTH int after MUS_MINUTES_OFFSET"; + sql="alter table `SERVICES` add column `MUS_MINUTES_LENGTH` int after `MUS_MINUTES_OFFSET`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column MUS_SECONDS_OFFSET int after MUS_MINUTES_LENGTH"; + sql="alter table `SERVICES` add column `MUS_SECONDS_OFFSET` int after `MUS_MINUTES_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column MUS_SECONDS_LENGTH int after MUS_SECONDS_OFFSET"; + sql="alter table `SERVICES` add column `MUS_SECONDS_LENGTH` int after `MUS_SECONDS_OFFSET`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select NAME,MUS_START_OFFSET from SERVICES where MUS_START_LENGTH=8"; + sql="select `NAME`,`MUS_START_OFFSET` from `SERVICES` where `MUS_START_LENGTH`=8"; q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("update SERVICES set ")+ - QString().sprintf("MUS_HOURS_OFFSET=%d,",q->value(1).toInt())+ - "MUS_HOURS_LENGTH=2,"+ - QString().sprintf("MUS_MINUTES_OFFSET=%d,",q->value(1).toInt()+3)+ - "MUS_MINUTES_LENGTH=2,"+ - QString().sprintf("MUS_SECONDS_OFFSET=%d,",q->value(1).toInt()+6)+ - "MUS_SECONDS_LENGTH=2 where "+ - "NAME=\""+RDEscapeString(q->value(0).toString())+"\""; + sql=QString("update `SERVICES` set ")+ + QString().sprintf("`MUS_HOURS_OFFSET`=%d,",q->value(1).toInt())+ + "`MUS_HOURS_LENGTH`=2,"+ + QString().sprintf("`MUS_MINUTES_OFFSET`=%d,",q->value(1).toInt()+3)+ + "`MUS_MINUTES_LENGTH`=2,"+ + QString().sprintf("`MUS_SECONDS_OFFSET`=%d,",q->value(1).toInt()+6)+ + "`MUS_SECONDS_LENGTH`=2 where "+ + "`NAME`='"+RDEscapeString(q->value(0).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2984,12 +3273,12 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<120)&&(set_schema>cur_schema)) { - sql="alter table GROUPS add column COLOR char(7) default \"#000000\" after ENABLE_NOW_NEXT"; + sql="alter table `GROUPS` add column `COLOR` char(7) default '#000000' after `ENABLE_NOW_NEXT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDLOGEDIT add column DEFAULT_TRANS_TYPE int default 0 after RIPPER_LEVEL"; + sql="alter table `RDLOGEDIT` add column `DEFAULT_TRANS_TYPE` int default 0 after `RIPPER_LEVEL`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -2998,34 +3287,34 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<121)&&(set_schema>cur_schema)) { - sql="alter table LOGS add column LINK_DATETIME datetime not null after ORIGIN_DATETIME"; + sql="alter table `LOGS` add column `LINK_DATETIME` datetime not null after `ORIGIN_DATETIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table LOGS add column NEXT_ID int default 0 after TRAFFIC_LINKED"; + sql="alter table `LOGS` add column `NEXT_ID` int default 0 after `TRAFFIC_LINKED`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select NAME,ORIGIN_DATETIME from LOGS"; + sql="select `NAME`,`ORIGIN_DATETIME` from `LOGS`"; q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("update LOGS set ")+ - "LINK_DATETIME=\""+q->value(1).toDateTime(). - toString("yyyy-MM-dd hh:mm:ss")+"\" where "+ - "NAME=\""+RDEscapeString(q->value(0).toString())+"\""; + sql=QString("update `LOGS` set ")+ + "`LINK_DATETIME`='"+q->value(1).toDateTime(). + toString("yyyy-MM-dd hh:mm:ss")+"' where "+ + "`NAME`='"+RDEscapeString(q->value(0).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("select ID from `")+q->value(0).toString()+"_LOG` "+ - "order by ID"; + "order by `ID`"; q1=new RDSqlQuery(sql,false); if(q1->last()) { - sql=QString("update LOGS set ")+ - QString().sprintf("NEXT_ID=%d where ",q1->value(0).toInt()+1)+ - "NAME=\""+RDEscapeString(q->value(0).toString())+"\""; + sql=QString("update `LOGS` set ")+ + QString().sprintf("`NEXT_ID`=%d where ",q1->value(0).toInt()+1)+ + "`NAME`='"+RDEscapeString(q->value(0).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3038,29 +3327,29 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<122)&&(set_schema>cur_schema)) { - sql="alter table LOGS add column MODIFIED_DATETIME datetime not null after LINK_DATETIME"; + sql="alter table `LOGS` add column `MODIFIED_DATETIME` datetime not null after `LINK_DATETIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table LOGS add column AUTO_REFRESH enum('N','Y') default 'N' after MODIFIED_DATETIME"; + sql="alter table `LOGS` add column `AUTO_REFRESH` enum('N','Y') default 'N' after `MODIFIED_DATETIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select NAME,LINK_DATETIME from LOGS"; + sql="select `NAME`,`LINK_DATETIME` from `LOGS`"; q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("update LOGS set ")+ - "MODIFIED_DATETIME=\""+RDEscapeString(q->value(1).toDateTime(). - toString("yyyy-MM-dd hh:mm:ss"))+"\" where "+ - "NAME=\""+RDEscapeString(q->value(0).toString())+"\""; + sql=QString("update `LOGS` set ")+ + "`MODIFIED_DATETIME`='"+RDEscapeString(q->value(1).toDateTime(). + toString("yyyy-MM-dd hh:mm:ss"))+"' where "+ + "`NAME`='"+RDEscapeString(q->value(0).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } - sql="alter table SERVICES add column AUTO_REFRESH enum('N','Y') default 'N' after TRACK_GROUP"; + sql="alter table `SERVICES` add column `AUTO_REFRESH` enum('N','Y') default 'N' after `TRACK_GROUP`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3069,16 +3358,16 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<123)&&(set_schema>cur_schema)) { - sql="alter table REPORTS add column FILTER_ONAIR_FLAG enum('N','Y') default 'N' after STATION_FORMAT"; + sql="alter table `REPORTS` add column `FILTER_ONAIR_FLAG` enum('N','Y') default 'N' after `STATION_FORMAT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select NAME from SERVICES"; + sql="select `NAME` from `SERVICES`"; q=new RDSqlQuery(sql,false); while(q->next()) { sql=QString("alter table `")+q->value(0).toString()+"_SRT` "+ - "add column ONAIR_FLAG enum('N','Y') default 'N' after START_SOURCE"; + "add column `ONAIR_FLAG` enum('N','Y') default 'N' after `START_SOURCE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3089,50 +3378,54 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<124)&&(set_schema>cur_schema)) { - sql="alter table SERVICES add column TFC_LEN_HOURS_OFFSET int after TFC_SECONDS_LENGTH"; + sql="alter table `SERVICES` add column `TFC_LEN_HOURS_OFFSET` int after `TFC_SECONDS_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column TFC_LEN_HOURS_LENGTH int after TFC_LEN_HOURS_OFFSET"; + sql="alter table `SERVICES` add column `TFC_LEN_HOURS_LENGTH` int after `TFC_LEN_HOURS_OFFSET`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column TFC_LEN_MINUTES_OFFSET int after TFC_LEN_HOURS_LENGTH"; + sql="alter table `SERVICES` add column `TFC_LEN_MINUTES_OFFSET` int after `TFC_LEN_HOURS_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column TFC_LEN_MINUTES_LENGTH int after TFC_LEN_MINUTES_OFFSET"; + sql="alter table `SERVICES` add column `TFC_LEN_MINUTES_LENGTH` int after `TFC_LEN_MINUTES_OFFSET`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column TFC_LEN_SECONDS_OFFSET int after TFC_LEN_MINUTES_LENGTH"; + sql="alter table `SERVICES` add column `TFC_LEN_SECONDS_OFFSET` int after `TFC_LEN_MINUTES_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column TFC_LEN_SECONDS_LENGTH int after TFC_LEN_SECONDS_OFFSET"; + sql="alter table `SERVICES` add column `TFC_LEN_SECONDS_LENGTH` int after `TFC_LEN_SECONDS_OFFSET`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select NAME,TFC_LENGTH_OFFSET,TFC_LENGTH_LENGTH from SERVICES"; + sql=QString("select ")+ + "`NAME`,"+ // 00 + "`TFC_LENGTH_OFFSET`,"+ // 01 + "`TFC_LENGTH_LENGTH` "+ // 02 + "from `SERVICES`"; q=new RDSqlQuery(sql,false); while(q->next()) { if(q->value(2).toInt()==5) { - sql=QString("update SERVICES set ")+ - QString().sprintf("TFC_LEN_MINUTES_OFFSET=%d,",q->value(1).toInt())+ - "TFC_LEN_MINUTES_LENGTH=2,"+ - QString().sprintf("TFC_LEN_SECONDS_OFFSET=%d,",q->value(1).toInt()+3)+ - "TFC_LEN_SECONDS_LENGTH=2 where "+ - "NAME=\""+RDEscapeString(q->value(0).toString())+"\""; + sql=QString("update `SERVICES` set ")+ + QString().sprintf("`TFC_LEN_MINUTES_OFFSET`=%d,",q->value(1).toInt())+ + "`TFC_LEN_MINUTES_LENGTH`=2,"+ + QString().sprintf("`TFC_LEN_SECONDS_OFFSET`=%d,",q->value(1).toInt()+3)+ + "`TFC_LEN_SECONDS_LENGTH`=2 where "+ + "NAME='"+RDEscapeString(q->value(0).toString())+"'"; } else { - sql=QString("update SERVICES set ")+ - QString().sprintf("TFC_LEN_SECONDS_OFFSET=%d,",q->value(1).toInt())+ - QString().sprintf("TFC_LEN_SECONDS_LENGTH=%d where ", + sql=QString("update `SERVICES` set ")+ + QString().sprintf("`TFC_LEN_SECONDS_OFFSET`=%d,",q->value(1).toInt())+ + QString().sprintf("`TFC_LEN_SECONDS_LENGTH`=%d where ", q->value(2).toInt())+ - "NAME=\""+RDEscapeString(q->value(0).toString())+"\""; + "NAME='"+RDEscapeString(q->value(0).toString())+"'"; } if(!RDSqlQuery::apply(sql,err_msg)) { return false; @@ -3140,50 +3433,54 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } delete q; - sql="alter table SERVICES add column MUS_LEN_HOURS_OFFSET int after MUS_SECONDS_LENGTH"; + sql="alter table `SERVICES` add column `MUS_LEN_HOURS_OFFSET` int after `MUS_SECONDS_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column MUS_LEN_HOURS_LENGTH int after MUS_LEN_HOURS_OFFSET"; + sql="alter table `SERVICES` add column `MUS_LEN_HOURS_LENGTH` int after `MUS_LEN_HOURS_OFFSET`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column MUS_LEN_MINUTES_OFFSET int after MUS_LEN_HOURS_LENGTH"; + sql="alter table `SERVICES` add column `MUS_LEN_MINUTES_OFFSET` int after `MUS_LEN_HOURS_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column MUS_LEN_MINUTES_LENGTH int after MUS_LEN_MINUTES_OFFSET"; + sql="alter table `SERVICES` add column `MUS_LEN_MINUTES_LENGTH` int after `MUS_LEN_MINUTES_OFFSET`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column MUS_LEN_SECONDS_OFFSET int after MUS_LEN_MINUTES_LENGTH"; + sql="alter table `SERVICES` add column `MUS_LEN_SECONDS_OFFSET` int after `MUS_LEN_MINUTES_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column MUS_LEN_SECONDS_LENGTH int after MUS_LEN_SECONDS_OFFSET"; + sql="alter table `SERVICES` add column `MUS_LEN_SECONDS_LENGTH` int after `MUS_LEN_SECONDS_OFFSET`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select NAME,MUS_LENGTH_OFFSET,MUS_LENGTH_LENGTH from SERVICES"; + sql=QString("select ")+ + "`NAME`,"+ // 00 + "`MUS_LENGTH_OFFSET`,"+ // 01 + "`MUS_LENGTH_LENGTH` "+ // 02 + "from `SERVICES`"; q=new RDSqlQuery(sql,false); while(q->next()) { if(q->value(2).toInt()==5) { - sql=QString("update SERVICES set ")+ - QString().sprintf("MUS_LEN_MINUTES_OFFSET=%d,",q->value(1).toInt())+ - "MUS_LEN_MINUTES_LENGTH=2,"+ - QString().sprintf("MUS_LEN_SECONDS_OFFSET=%d,",q->value(1).toInt()+3)+ - "MUS_LEN_SECONDS_LENGTH=2 where "+ - "NAME=\""+RDEscapeString(q->value(0).toString())+"\""; + sql=QString("update `SERVICES` set ")+ + QString().sprintf("`MUS_LEN_MINUTES_OFFSET`=%d,",q->value(1).toInt())+ + "`MUS_LEN_MINUTES_LENGTH`=2,"+ + QString().sprintf("`MUS_LEN_SECONDS_OFFSET`=%d,",q->value(1).toInt()+3)+ + "`MUS_LEN_SECONDS_LENGTH`=2 where "+ + "`NAME`='"+RDEscapeString(q->value(0).toString())+"'"; } else { - sql=QString("update SERVICES set ")+ - QString().sprintf("MUS_LEN_SECONDS_OFFSET=%d,",q->value(1).toInt())+ - QString().sprintf("MUS_LEN_SECONDS_LENGTH=%d where ", + sql=QString("update `SERVICES` set ")+ + QString().sprintf("`MUS_LEN_SECONDS_OFFSET`=%d,",q->value(1).toInt())+ + QString().sprintf("`MUS_LEN_SECONDS_LENGTH`=%d where ", q->value(2).toInt())+ - "NAME=\""+RDEscapeString(q->value(0).toString())+"\""; + "NAME='"+RDEscapeString(q->value(0).toString())+"'"; } if(!RDSqlQuery::apply(sql,err_msg)) { return false; @@ -3195,22 +3492,22 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<125)&&(set_schema>cur_schema)) { - sql="alter table REPORTS add column SERVICE_NAME char(64) after LINES_PER_PAGE"; + sql="alter table `REPORTS` add column `SERVICE_NAME` char(64) after `LINES_PER_PAGE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select NAME from SERVICES"; + sql="select `NAME` from `SERVICES`"; q=new RDSqlQuery(sql,false); while(q->next()) { sql=QString("alter table `")+q->value(0).toString()+"_SRT` "+ - "add column ALBUM char(255) after COMPOSER"; + "add column `ALBUM` char(255) after `COMPOSER`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+q->value(0).toString()+"_SRT` "+ - "add column LABEL char(64) after ALBUM"; + "add column `LABEL` char(64) after `ALBUM`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3221,17 +3518,17 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<126)&&(set_schema>cur_schema)) { - sql="select NAME from LOGS"; + sql="select `NAME` from `LOGS`"; q=new RDSqlQuery(sql,false); while(q->next()) { sql=QString("alter table `")+q->value(0).toString()+"_LOG` "+ - "add column LINK_START_SLOP int default 0 after LINK_LENGTH"; + "add column `LINK_START_SLOP` int default 0 after `LINK_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+q->value(0).toString()+"_LOG` "+ - "add column LINK_END_SLOP int default 0 after LINK_START_SLOP"; + "add column `LINK_END_SLOP` int default 0 after `LINK_START_SLOP`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3242,7 +3539,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<127)&&(set_schema>cur_schema)) { - sql="alter table RDAIRPLAY add column PANEL_PAUSE_ENABLED enum('N','Y') default 'N' after FLASH_PANEL"; + sql="alter table `RDAIRPLAY` add column `PANEL_PAUSE_ENABLED` enum('N','Y') default 'N' after `FLASH_PANEL`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3251,31 +3548,31 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<128)&&(set_schema>cur_schema)) { - sql="select NAME from EVENTS"; + sql="select `NAME` from `EVENTS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table `")+tablename+"_PRE` "+ - "add column LINK_START_SLOP int default 0 after LINK_LENGTH"; + "add column `LINK_START_SLOP` int default 0 after `LINK_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_PRE` "+ - "add column LINK_END_SLOP int default 0 after LINK_START_SLOP"; + "add column `LINK_END_SLOP` int default 0 after `LINK_START_SLOP`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_POST` "+ - "add column LINK_START_SLOP int default 0 after LINK_LENGTH"; + "add column `LINK_START_SLOP` int default 0 after `LINK_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_POST` "+ - "add column LINK_END_SLOP int default 0 after LINK_START_SLOP"; + "add column `LINK_END_SLOP` int default 0 after `LINK_START_SLOP`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3286,118 +3583,118 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<129)&&(set_schema>cur_schema)) { - sql="alter table RDAIRPLAY add column EXIT_CODE int default 0 after LOG_RML2"; + sql="alter table `RDAIRPLAY` add column `EXIT_CODE` int default 0 after `LOG_RML2`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column EXIT_PASSWORD char(41) default \"\" after EXIT_CODE"; + sql="alter table `RDAIRPLAY` add column `EXIT_PASSWORD` char(41) default '' after `EXIT_CODE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG0_START_MODE int default 0 after EXIT_PASSWORD"; + sql="alter table `RDAIRPLAY` add column `LOG0_START_MODE` int default 0 after `EXIT_PASSWORD`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG0_AUTO_RESTART enum('N','Y') default 'N' after LOG0_START_MODE"; + sql="alter table `RDAIRPLAY` add column `LOG0_AUTO_RESTART` enum('N','Y') default 'N' after `LOG0_START_MODE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG0_LOG_NAME char(64) after LOG0_AUTO_RESTART"; + sql="alter table `RDAIRPLAY` add column `LOG0_LOG_NAME` char(64) after `LOG0_AUTO_RESTART`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG0_CURRENT_LOG char(64) after LOG0_LOG_NAME"; + sql="alter table `RDAIRPLAY` add column `LOG0_CURRENT_LOG` char(64) after `LOG0_LOG_NAME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG0_RUNNING enum('N','Y') default 'N' after LOG0_CURRENT_LOG"; + sql="alter table `RDAIRPLAY` add column `LOG0_RUNNING` enum('N','Y') default 'N' after `LOG0_CURRENT_LOG`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG0_LOG_ID int default -1 after LOG0_RUNNING"; + sql="alter table `RDAIRPLAY` add column `LOG0_LOG_ID` int default -1 after `LOG0_RUNNING`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG0_LOG_LINE int default -1 after LOG0_LOG_ID"; + sql="alter table `RDAIRPLAY` add column `LOG0_LOG_LINE` int default -1 after `LOG0_LOG_ID`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG1_START_MODE int default 0 after LOG0_LOG_LINE"; + sql="alter table `RDAIRPLAY` add column `LOG1_START_MODE` int default 0 after `LOG0_LOG_LINE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG1_AUTO_RESTART enum('N','Y') default 'N' after LOG1_START_MODE"; + sql="alter table `RDAIRPLAY` add column `LOG1_AUTO_RESTART` enum('N','Y') default 'N' after `LOG1_START_MODE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG1_LOG_NAME char(64) after LOG1_AUTO_RESTART"; + sql="alter table `RDAIRPLAY` add column `LOG1_LOG_NAME` char(64) after `LOG1_AUTO_RESTART`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG1_CURRENT_LOG char(64) after LOG1_LOG_NAME"; + sql="alter table `RDAIRPLAY` add column `LOG1_CURRENT_LOG` char(64) after `LOG1_LOG_NAME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG1_RUNNING enum('N','Y') default 'N' after LOG1_CURRENT_LOG"; + sql="alter table `RDAIRPLAY` add column `LOG1_RUNNING` enum('N','Y') default 'N' after `LOG1_CURRENT_LOG`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG1_LOG_ID int default -1 after LOG1_RUNNING"; + sql="alter table `RDAIRPLAY` add column `LOG1_LOG_ID` int default -1 after `LOG1_RUNNING`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG1_LOG_LINE int default -1 after LOG1_LOG_ID"; + sql="alter table `RDAIRPLAY` add column `LOG1_LOG_LINE` int default -1 after `LOG1_LOG_ID`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG2_START_MODE int default 0 after LOG1_LOG_LINE"; + sql="alter table `RDAIRPLAY` add column `LOG2_START_MODE` int default 0 after `LOG1_LOG_LINE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG2_AUTO_RESTART enum('N','Y') default 'N' after LOG2_START_MODE"; + sql="alter table `RDAIRPLAY` add column `LOG2_AUTO_RESTART` enum('N','Y') default 'N' after `LOG2_START_MODE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG2_LOG_NAME char(64) after LOG2_AUTO_RESTART"; + sql="alter table `RDAIRPLAY` add column `LOG2_LOG_NAME` char(64) after `LOG2_AUTO_RESTART`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG2_CURRENT_LOG char(64) after LOG2_LOG_NAME"; + sql="alter table `RDAIRPLAY` add column `LOG2_CURRENT_LOG` char(64) after `LOG2_LOG_NAME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG2_RUNNING enum('N','Y') default 'N' after LOG2_CURRENT_LOG"; + sql="alter table `RDAIRPLAY` add column `LOG2_RUNNING` enum('N','Y') default 'N' after `LOG2_CURRENT_LOG`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG2_LOG_ID int default -1 after LOG2_RUNNING"; + sql="alter table `RDAIRPLAY` add column `LOG2_LOG_ID` int default -1 after `LOG2_RUNNING`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG2_LOG_LINE int default -1 after LOG2_LOG_ID"; + sql="alter table `RDAIRPLAY` add column `LOG2_LOG_LINE` int default -1 after `LOG2_LOG_ID`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3406,11 +3703,11 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<130)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists RDCATCH (")+ - "ID int unsigned primary key auto_increment,"+ - "STATION char(64) not null,"+ - "ERROR_RML char(255),"+ - "index STATION_IDX (STATION))"+ + sql=QString("create table if not exists `RDCATCH` (")+ + "`ID` int unsigned primary key auto_increment,"+ + "`STATION` char(64) not null,"+ + "`ERROR_RML` char(255),"+ + "index `STATION_IDX` (`STATION`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -3449,9 +3746,9 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("create table if not exists SCHED_CODES (")+ - "CODE varchar(10) not null primary key,"+ - "DESCRIPTION varchar(255))"+ + sql=QString("create table if not exists `SCHED_CODES` (")+ + "`CODE` varchar(10) not null primary key,"+ + "`DESCRIPTION` varchar(255))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -3460,7 +3757,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) if(!DropTable("SCHED_STACK",err_msg)) { return false; } - sql="select NAME from SERVICES"; + sql="select `NAME` from `SERVICES`"; q=new RDSqlQuery(sql,false); while(q->next()) { QString svc=q->value(0).toString(); @@ -3469,41 +3766,41 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } } delete q; - sql="select NAME from LOGS"; + sql="select `NAME` from `LOGS`"; q=new RDSqlQuery(sql,false); while(q->next()) { sql=QString("alter table `")+q->value(0).toString()+"_LOG` "+ - "add column DUCK_UP_GAIN int default 0 after SEGUE_GAIN"; + "add column `DUCK_UP_GAIN` int default 0 after `SEGUE_GAIN`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+q->value(0).toString()+"_LOG` "+ - "add column DUCK_DOWN_GAIN int default 0 after DUCK_UP_GAIN"; + "add column `DUCK_DOWN_GAIN` int default 0 after `DUCK_UP_GAIN`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } delete q; - sql="select NAME from EVENTS"; + sql="select `NAME` from `EVENTS`"; q=new RDSqlQuery(sql,false); while(q->next()) { sql=QString("alter table `")+q->value(0).toString()+"_PRE` "+ - "add column DUCK_UP_GAIN int default 0 after SEGUE_GAIN"; + "add column `DUCK_UP_GAIN` int default 0 after `SEGUE_GAIN`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+q->value(0).toString()+"_PRE` "+ - "add column DUCK_DOWN_GAIN int default 0 after DUCK_UP_GAIN"; + "add column `DUCK_DOWN_GAIN` int default 0 after `DUCK_UP_GAIN`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+q->value(0).toString()+"_POST` "+ - "add column DUCK_UP_GAIN int default 0 after SEGUE_GAIN"; + "add column `DUCK_UP_GAIN` int default 0 after `SEGUE_GAIN`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+q->value(0).toString()+"_POST` "+ - "add column DUCK_DOWN_GAIN int default 0 after DUCK_UP_GAIN"; + "add column `DUCK_DOWN_GAIN` int default 0 after `DUCK_UP_GAIN`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3514,21 +3811,21 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<132)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists DROPBOXES (")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64),"+ - "GROUP_NAME char(10),"+ - "PATH char(255),"+ - "NORMALIZATION_LEVEL int default 1,"+ - "AUTOTRIM_LEVEL int default 1,"+ - "SINGLE_CART enum('N','Y') default 'N',"+ - "TO_CART int unsigned default 0,"+ - "USE_CARTCHUNK_ID enum('N','Y') default 'N',"+ - "DELETE_CUTS enum('N','Y') default 'N',"+ - "METADATA_PATTERN char(64),"+ - "FIX_BROKEN_FORMATS enum('N','Y') default 'N',"+ - "LOG_PATH char(255),"+ - "index STATION_NAME_IDX (STATION_NAME))"+ + sql=QString("create table if not exists `DROPBOXES` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64),"+ + "`GROUP_NAME` char(10),"+ + "`PATH` char(255),"+ + "`NORMALIZATION_LEVEL` int default 1,"+ + "`AUTOTRIM_LEVEL` int default 1,"+ + "`SINGLE_CART` enum('N','Y') default 'N',"+ + "`TO_CART` int unsigned default 0,"+ + "`USE_CARTCHUNK_ID` enum('N','Y') default 'N',"+ + "`DELETE_CUTS` enum('N','Y') default 'N',"+ + "`METADATA_PATTERN` char(64),"+ + "`FIX_BROKEN_FORMATS` enum('N','Y') default 'N',"+ + "`LOG_PATH` char(255),"+ + "index `STATION_NAME_IDX` (`STATION_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -3539,45 +3836,45 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<133)&&(set_schema>cur_schema)) { - sql="select NAME from LOGS"; + sql="select `NAME` from `LOGS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table `")+tablename+"_LOG` "+ - "add column DUCK_UP_GAIN int default 0 after SEGUE_GAIN"; + "add column `DUCK_UP_GAIN` int default 0 after `SEGUE_GAIN`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_LOG` "+ - "add column DUCK_DOWN_GAIN int default 0 after DUCK_UP_GAIN"; + "add column `DUCK_DOWN_GAIN` int default 0 after `DUCK_UP_GAIN`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } delete q; - sql="select NAME from EVENTS"; + sql="select `NAME` from `EVENTS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table `")+tablename+"_PRE` "+ - "add column DUCK_UP_GAIN int default 0 after SEGUE_GAIN"; + "add column `DUCK_UP_GAIN` int default 0 after `SEGUE_GAIN`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_PRE` "+ - "add column DUCK_DOWN_GAIN int default 0 after DUCK_UP_GAIN"; + "add column `DUCK_DOWN_GAIN` int default 0 after `DUCK_UP_GAIN`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_POST` "+ - "add column DUCK_UP_GAIN int default 0 after SEGUE_GAIN"; + "add column `DUCK_UP_GAIN` int default 0 after `SEGUE_GAIN`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_POST` "+ - "add column DUCK_DOWN_GAIN int default 0 after DUCK_UP_GAIN"; + "add column `DUCK_DOWN_GAIN` int default 0 after `DUCK_UP_GAIN`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3588,36 +3885,36 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<134)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists RDPANEL (")+ - "ID int not null primary key auto_increment,"+ - "STATION char(40) not null,"+ - "CARD2 int default -1,"+ - "PORT2 int default -1,"+ - "START_RML2 char(255),"+ - "STOP_RML2 char(255),"+ - "CARD6 int default -1,"+ - "PORT6 int default -1,"+ - "START_RML6 char(255),"+ - "STOP_RML6 char(255),"+ - "CARD7 int default -1,"+ - "PORT7 int default -1,"+ - "START_RML7 char(255),"+ - "STOP_RML7 char(255),"+ - "CARD8 int default -1,"+ - "PORT8 int default -1,"+ - "START_RML8 char(255),"+ - "STOP_RML8 char(255),"+ - "CARD9 int default -1,"+ - "PORT9 int default -1,"+ - "START_RML9 char(255),"+ - "STOP_RML9 char(255),"+ - "STATION_PANELS int default 3,"+ - "USER_PANELS int default 3,"+ - "CLEAR_FILTER enum('N','Y') default 'N',"+ - "FLASH_PANEL enum('N','Y') default 'N',"+ - "PANEL_PAUSE_ENABLED enum('N','Y') default 'N',"+ - "DEFAULT_SERVICE char(10),"+ - "index STATION_IDX (STATION))"+ + sql=QString("create table if not exists `RDPANEL` (")+ + "`ID` int not null primary key auto_increment,"+ + "`STATION` char(40) not null,"+ + "`CARD2` int default -1,"+ + "`PORT2` int default -1,"+ + "`START_RML2` char(255),"+ + "`STOP_RML2` char(255),"+ + "`CARD6` int default -1,"+ + "`PORT6` int default -1,"+ + "`START_RML6` char(255),"+ + "`STOP_RML6` char(255),"+ + "`CARD7` int default -1,"+ + "`PORT7` int default -1,"+ + "`START_RML7` char(255),"+ + "`STOP_RML7` char(255),"+ + "`CARD8` int default -1,"+ + "`PORT8` int default -1,"+ + "`START_RML8` char(255),"+ + "`STOP_RML8` char(255),"+ + "`CARD9` int default -1,"+ + "`PORT9` int default -1,"+ + "`START_RML9` char(255),"+ + "`STOP_RML9` char(255),"+ + "`STATION_PANELS` int default 3,"+ + "`USER_PANELS` int default 3,"+ + "`CLEAR_FILTER` enum('N','Y') default 'N',"+ + "`FLASH_PANEL` enum('N','Y') default 'N',"+ + "`PANEL_PAUSE_ENABLED` enum('N','Y') default 'N',"+ + "`DEFAULT_SERVICE` char(10),"+ + "index `STATION_IDX` (`STATION`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -3627,18 +3924,18 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // // Create EXTENDED_PANELS Table // - sql=QString("create table if not exists EXTENDED_PANELS (")+ - "ID int auto_increment not null primary key,"+ - "TYPE int not null,"+ - "OWNER char(64) not null,"+ - "PANEL_NO int not null,"+ - "ROW_NO int not null,"+ - "COLUMN_NO int not null,"+ - "LABEL char(64),"+ - "CART int,"+ - "DEFAULT_COLOR char(7),"+ - "index LOAD_IDX (TYPE,OWNER,PANEL_NO),"+ - "index SAVE_IDX (TYPE,OWNER,PANEL_NO,ROW_NO,COLUMN_NO))"+ + sql=QString("create table if not exists `EXTENDED_PANELS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`TYPE` int not null,"+ + "`OWNER` char(64) not null,"+ + "`PANEL_NO` int not null,"+ + "`ROW_NO` int not null,"+ + "`COLUMN_NO` int not null,"+ + "`LABEL` char(64),"+ + "`CART` int,"+ + "`DEFAULT_COLOR` char(7),"+ + "index `LOAD_IDX` (`TYPE`,`OWNER`,`PANEL_NO`),"+ + "index `SAVE_IDX` (`TYPE`,`OWNER`,`PANEL_NO`,`ROW_NO`,`COLUMN_NO`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -3649,7 +3946,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<135)&&(set_schema>cur_schema)) { - sql="alter table STATIONS add column STARTUP_CART int unsigned default 0 after HEARTBEAT_INTERVAL"; + sql="alter table `STATIONS` add column `STARTUP_CART` int unsigned default 0 after `HEARTBEAT_INTERVAL`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3661,13 +3958,13 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // // Create PANEL_NAMES Table // - sql=QString("create table if not exists PANEL_NAMES (")+ - "ID int auto_increment not null primary key,"+ - "TYPE int not null,"+ - "OWNER char(64) not null,"+ - "PANEL_NO int not null,"+ - "NAME char(64),"+ - "index LOAD_IDX (TYPE,OWNER,PANEL_NO))"+ + sql=QString("create table if not exists `PANEL_NAMES` (")+ + "`ID` int auto_increment not null primary key,"+ + "`TYPE` int not null,"+ + "`OWNER` char(64) not null,"+ + "`PANEL_NO` int not null,"+ + "`NAME` char(64),"+ + "index `LOAD_IDX` (`TYPE`,`OWNER`,`PANEL_NO`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -3677,13 +3974,13 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // // Create EXTENDED_PANEL_NAMES Table // - sql=QString("create table if not exists EXTENDED_PANEL_NAMES (")+ - "ID int auto_increment not null primary key,"+ - "TYPE int not null,"+ - "OWNER char(64) not null,"+ - "PANEL_NO int not null,"+ - "NAME char(64),"+ - "index LOAD_IDX (TYPE,OWNER,PANEL_NO))"+ + sql=QString("create table if not exists `EXTENDED_PANEL_NAMES` (")+ + "`ID` int auto_increment not null primary key,"+ + "`TYPE` int not null,"+ + "`OWNER` char(64) not null,"+ + "`PANEL_NO` int not null,"+ + "`NAME` char(64),"+ + "index `LOAD_IDX` (`TYPE`,`OWNER`,`PANEL_NO`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -3694,12 +3991,12 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<137)&&(set_schema>cur_schema)) { - sql="alter table CART add column AVERAGE_HOOK_LENGTH int unsigned default 0 after AVERAGE_SEGUE_LENGTH"; + sql="alter table `CART` add column `AVERAGE_HOOK_LENGTH` int unsigned default 0 after `AVERAGE_SEGUE_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select NUMBER from CART"; + sql="select `NUMBER` from `CART`"; q=new RDSqlQuery(sql,false); while(q->next()) { cart=new RDCart(q->value(0).toUInt()); @@ -3712,14 +4009,14 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<138)&&(set_schema>cur_schema)) { - sql=QString("alter table RDAIRPLAY ")+ - "add column BUTTON_LABEL_TEMPLATE char(32) "+ - "default \"%t\" after PANEL_PAUSE_ENABLED"; + sql=QString("alter table `RDAIRPLAY` ")+ + "add column `BUTTON_LABEL_TEMPLATE` char(32) "+ + "default '%t' after `PANEL_PAUSE_ENABLED`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDPANEL add column BUTTON_LABEL_TEMPLATE char(32) default \"%t\" after PANEL_PAUSE_ENABLED"; + sql="alter table `RDPANEL` add column `BUTTON_LABEL_TEMPLATE` char(32) default '%t' after `PANEL_PAUSE_ENABLED`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3728,7 +4025,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<139)&&(set_schema>cur_schema)) { - sql="alter table RDAIRPLAY modify EXIT_PASSWORD char(41) default \"\""; + sql="alter table `RDAIRPLAY` modify `EXIT_PASSWORD` char(41) default ''"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3737,12 +4034,12 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<140)&&(set_schema>cur_schema)) { - sql="alter table SERVICES add column TFC_BREAK_STRING char(64) after TFC_TRACK_CART"; + sql="alter table `SERVICES` add column `TFC_BREAK_STRING` char(64) after `TFC_TRACK_CART`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column TFC_TRACK_STRING char(64) after TFC_TRACK_CART"; + sql="alter table `SERVICES` add column `TFC_TRACK_STRING` char(64) after `TFC_TRACK_CART`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3751,7 +4048,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<141)&&(set_schema>cur_schema)) { - sql="alter table DROPBOXES add column TITLE_FROM_CARTCHUNK_ID enum('N','Y') default 'N' after USE_CARTCHUNK_ID"; + sql="alter table `DROPBOXES` add column `TITLE_FROM_CARTCHUNK_ID` enum('N','Y') default 'N' after `USE_CARTCHUNK_ID`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3760,59 +4057,59 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<142)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists FEEDS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "KEY_NAME char(8) unique not null,"+ - "CHANNEL_TITLE char(255),"+ - "CHANNEL_DESCRIPTION text,"+ - "CHANNEL_CATEGORY char(64),"+ - "CHANNEL_LINK char(255),"+ - "CHANNEL_COPYRIGHT char(64),"+ - "CHANNEL_WEBMASTER char(64),"+ - "CHANNEL_LANGUAGE char(5) default \"en-us\","+ - "BASE_URL char(255),"+ - "PURGE_URL char(255),"+ - "PURGE_USERNAME char(64),"+ - "PURGE_PASSWORD char(64),"+ - "HEADER_XML text,"+ - "CHANNEL_XML text,"+ - "ITEM_XML text,"+ - "MAX_SHELF_LIFE int,"+ - "LAST_BUILD_DATETIME datetime,"+ - "ORIGIN_DATETIME datetime,"+ - "ENABLE_AUTOPOST enum('N','Y') default 'N',"+ - "index KEY_NAME_IDX(KEY_NAME))"+ + sql=QString("create table if not exists `FEEDS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`KEY_NAME` char(8) unique not null,"+ + "`CHANNEL_TITLE` char(255),"+ + "`CHANNEL_DESCRIPTION` text,"+ + "`CHANNEL_CATEGORY` char(64),"+ + "`CHANNEL_LINK` char(255),"+ + "`CHANNEL_COPYRIGHT` char(64),"+ + "`CHANNEL_WEBMASTER` char(64),"+ + "`CHANNEL_LANGUAGE` char(5) default 'en-us',"+ + "`BASE_URL` char(255),"+ + "`PURGE_URL` char(255),"+ + "`PURGE_USERNAME` char(64),"+ + "`PURGE_PASSWORD` char(64),"+ + "`HEADER_XML` text,"+ + "`CHANNEL_XML` text,"+ + "`ITEM_XML` text,"+ + "`MAX_SHELF_LIFE` int,"+ + "`LAST_BUILD_DATETIME` datetime,"+ + "`ORIGIN_DATETIME` datetime,"+ + "`ENABLE_AUTOPOST` enum('N','Y') default 'N',"+ + "index `KEY_NAME_IDX` (`KEY_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("create table if not exists PODCASTS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "FEED_ID int unsigned not null,"+ - "STATUS int unsigned default 0,"+ - "ITEM_TITLE char(255),"+ - "ITEM_DESCRIPTION text,"+ - "ITEM_CATEGORY char(64),"+ - "ITEM_LINK char(255),"+ - "AUDIO_FILENAME char(255),"+ - "AUDIO_LENGTH int unsigned,"+ - "SHELF_LIFE int,"+ - "ORIGIN_DATETIME datetime,"+ - "index FEED_ID_IDX(FEED_ID,ORIGIN_DATETIME))"+ + sql=QString("create table if not exists `PODCASTS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`FEED_ID` int unsigned not null,"+ + "`STATUS` int unsigned default 0,"+ + "`ITEM_TITLE` char(255),"+ + "`ITEM_DESCRIPTION` text,"+ + "`ITEM_CATEGORY` char(64),"+ + "`ITEM_LINK` char(255),"+ + "`AUDIO_FILENAME` char(255),"+ + "`AUDIO_LENGTH` int unsigned,"+ + "`SHELF_LIFE` int,"+ + "`ORIGIN_DATETIME` datetime,"+ + "index `FEED_ID_IDX` (`FEED_ID`,`ORIGIN_DATETIME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RECORDINGS add column FEED_ID int default -1 after URL_PASSWORD"; + sql="alter table `RECORDINGS` add column `FEED_ID` int default -1 after `URL_PASSWORD`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table VERSION add column LAST_MAINT_DATETIME datetime default \"1970-01-01 00:00:00\" after DB"; + sql="alter table `VERSION` add column `LAST_MAINT_DATETIME` datetime default '1970-01-01 00:00:00' after `DB`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3821,23 +4118,22 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<143)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists AUX_METADATA (")+ - "ID int unsigned auto_increment not null primary key,"+ - "FEED_ID int unsigned,"+ - "VAR_NAME char(16),"+ - "CAPTION char(64),"+ - "index FEED_ID_IDX(FEED_ID))"+ + sql=QString("create table if not exists `AUX_METADATA` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`FEED_ID` int unsigned,"+ + "`VAR_NAME` char(16),"+ + "`CAPTION` char(64),"+ + "index `FEED_ID_IDX` (`FEED_ID`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select KEY_NAME from FEEDS"; + sql="select `KEY_NAME` from `FEEDS`"; q=new RDSqlQuery(sql,false); while(q->next()) { CreateAuxFieldsTable143(q->value(0).toString()); - // RDCreateAuxFieldsTable(q->value(0).toString(),config); } delete q; @@ -3845,48 +4141,48 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<144)&&(set_schema>cur_schema)) { - sql="alter table FEEDS add column UPLOAD_FORMAT int default 2 after ENABLE_AUTOPOST"; + sql="alter table `FEEDS` add column `UPLOAD_FORMAT` int default 2 after `ENABLE_AUTOPOST`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table FEEDS add column UPLOAD_CHANNELS int default 2 after UPLOAD_FORMAT"; + sql="alter table `FEEDS` add column `UPLOAD_CHANNELS` int default 2 after `UPLOAD_FORMAT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table FEEDS add column UPLOAD_SAMPRATE int default 44100 after UPLOAD_CHANNELS"; + sql="alter table `FEEDS` add column `UPLOAD_SAMPRATE` int default 44100 after `UPLOAD_CHANNELS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table FEEDS add column UPLOAD_BITRATE int default 32000 after UPLOAD_CHANNELS"; + sql="alter table `FEEDS` add column `UPLOAD_BITRATE` int default 32000 after `UPLOAD_CHANNELS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table FEEDS add column UPLOAD_QUALITY int default 0 after UPLOAD_BITRATE"; + sql="alter table `FEEDS` add column `UPLOAD_QUALITY` int default 0 after `UPLOAD_BITRATE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table FEEDS add column NORMALIZE_LEVEL int default -100 after UPLOAD_QUALITY"; + sql="alter table `FEEDS` add column `NORMALIZE_LEVEL` int default -100 after `UPLOAD_QUALITY`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table PODCASTS add column ITEM_COMMENTS char(255) after ITEM_LINK"; + sql="alter table `PODCASTS` add column `ITEM_COMMENTS` char(255) after `ITEM_LINK`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table PODCASTS add column ITEM_AUTHOR char(255) after ITEM_COMMENTS"; + sql="alter table `PODCASTS` add column `ITEM_AUTHOR` char(255) after `ITEM_COMMENTS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table PODCASTS add column ITEM_SOURCE_TEXT char(64) after ITEM_AUTHOR"; + sql="alter table `PODCASTS` add column `ITEM_SOURCE_TEXT` char(64) after `ITEM_AUTHOR`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table PODCASTS add column ITEM_SOURCE_URL char(255) after ITEM_SOURCE_TEXT"; + sql="alter table `PODCASTS` add column `ITEM_SOURCE_URL` char(255) after `ITEM_SOURCE_TEXT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3895,28 +4191,28 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<145)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists FEED_PERMS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "USER_NAME char(8),"+ - "KEY_NAME char(8),"+ - "index USER_IDX (USER_NAME),"+ - "index KEYNAME_IDX (KEY_NAME))"+ + sql=QString("create table if not exists `FEED_PERMS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`USER_NAME` char(8),"+ + "`KEY_NAME` char(8),"+ + "index `USER_IDX` (`USER_NAME`),"+ + "index `KEYNAME_IDX` (`KEY_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("select LOGIN_NAME from USERS where ")+ - "(ADMIN_USERS_PRIV='N')&&(ADMIN_CONFIG_PRIV='N')"; + sql=QString("select `LOGIN_NAME` from `USERS` where ")+ + "(`ADMIN_USERS_PRIV`='N')&&(`ADMIN_CONFIG_PRIV`='N')"; q=new RDSqlQuery(sql,false); - sql="select KEY_NAME from FEEDS"; + sql="select `KEY_NAME` from `FEEDS`"; q1=new RDSqlQuery(sql,false); while(q->next()) { while(q1->next()) { - sql=QString("insert into FEED_PERMS set ")+ - "USER_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - "KEY_NAME=\""+RDEscapeString(q1->value(0).toString())+"\""; + sql=QString("insert into `FEED_PERMS` set ")+ + "`USER_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + "`KEY_NAME`='"+RDEscapeString(q1->value(0).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3926,52 +4222,58 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) delete q1; delete q; - - sql="alter table USERS add column ADD_PODCAST_PRIV enum('N','Y') not null default 'N' after EDIT_CATCHES_PRIV"; + sql="alter table `USERS` add column `ADD_PODCAST_PRIV` enum('N','Y') not null default 'N' after `EDIT_CATCHES_PRIV`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table USERS add column EDIT_PODCAST_PRIV enum('N','Y') not null default 'N' after ADD_PODCAST_PRIV"; + sql="alter table `USERS` add column `EDIT_PODCAST_PRIV` enum('N','Y') not null default 'N' after `ADD_PODCAST_PRIV`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table USERS add column DELETE_PODCAST_PRIV enum('N','Y') not null default 'N' after EDIT_PODCAST_PRIV"; + sql="alter table `USERS` add column `DELETE_PODCAST_PRIV` enum('N','Y') not null default 'N' after `EDIT_PODCAST_PRIV`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="update USERS set ADD_PODCAST_PRIV='Y',EDIT_PODCAST_PRIV='Y', DELETE_PODCAST_PRIV='Y' where (ADMIN_CONFIG_PRIV='N')&&(ADMIN_USERS_PRIV='N')"; + sql=QString("update `USERS` set ")+ + "`ADD_PODCAST_PRIV`='Y',"+ + "`EDIT_PODCAST_PRIV`='Y',"+ + "`DELETE_PODCAST_PRIV`='Y' "+ + "where "+ + "(`ADMIN_CONFIG_PRIV`='N')&&"+ + "(`ADMIN_USERS_PRIV`='N')"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } WriteSchemaVersion(++cur_schema); } + if((cur_schema<146)&&(set_schema>cur_schema)) { - sql="select NAME from EVENTS"; + sql="select `NAME` from `EVENTS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table `")+tablename+"_POST` "+ - "add column EXT_CART_NAME char(32) after EXT_LENGTH"; + "add column `EXT_CART_NAME` char(32) after `EXT_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_POST` "+ - "add column EXT_ANNC_TYPE char(8) after EXT_EVENT_ID"; + "add column `EXT_ANNC_TYPE` char(8) after `EXT_EVENT_ID`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_POST` "+ - "add column EVENT_SOURCE int default 0 after EVENT_TYPE"; + "add column `EVENT_SOURCE` int default 0 after `EVENT_TYPE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_POST` "+ - "add column EXT_ANNC_TYPE char(8) after EXT_EVENT_ID"; + "add column `EXT_ANNC_TYPE` char(8) after `EXT_EVENT_ID`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -3982,16 +4284,16 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<147)&&(set_schema>cur_schema)) { - sql="alter table USERS add column ENABLE_WEB enum('N','Y') default 'N' after PASSWORD"; + sql="alter table `USERS` add column `ENABLE_WEB` enum('N','Y') default 'N' after `PASSWORD`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("create table if not exists WEB_CONNECTIONS (")+ - "SESSION_ID int unsigned not null primary key,"+ - "LOGIN_NAME char(8),"+ - "IP_ADDRESS char(16),"+ - "TIME_STAMP datetime)"+ + sql=QString("create table if not exists `WEB_CONNECTIONS` (")+ + "`SESSION_ID` int unsigned not null primary key,"+ + "`LOGIN_NAME` char(8),"+ + "`IP_ADDRESS` char(16),"+ + "`TIME_STAMP` datetime)"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -4002,14 +4304,14 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<148)&&(set_schema>cur_schema)) { - sql=QString("alter table CUTS add column ")+ - QString().sprintf("SEGUE_GAIN int default %d after SEGUE_END_POINT", + sql=QString("alter table `CUTS` add column ")+ + QString().sprintf("`SEGUE_GAIN` int default %d after `SEGUE_END_POINT`", RD_FADE_DEPTH); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table PODCASTS add column AUDIO_TIME int unsigned after AUDIO_LENGTH"; + sql="alter table `PODCASTS` add column `AUDIO_TIME` int unsigned after `AUDIO_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4019,58 +4321,58 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) if((cur_schema<149)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists SWITCHER_NODES (")+ - "ID int not null auto_increment primary key,"+ - "STATION_NAME char(64),"+ - "MATRIX int,"+ - "BASE_OUTPUT int default 0,"+ - "HOSTNAME char(64),"+ - "PASSWORD char(64),"+ - "TCP_PORT int,"+ - "DESCRIPTION char(255),"+ - "index STATION_IDX (STATION_NAME,MATRIX))"+ + sql=QString("create table if not exists `SWITCHER_NODES` (")+ + "`ID` int not null auto_increment primary key,"+ + "`STATION_NAME` char(64),"+ + "`MATRIX` int,"+ + "`BASE_OUTPUT` int default 0,"+ + "`HOSTNAME` char(64),"+ + "`PASSWORD` char(64),"+ + "`TCP_PORT` int,"+ + "`DESCRIPTION` char(255),"+ + "index `STATION_IDX` (`STATION_NAME`,`MATRIX`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table INPUTS add column NODE_HOSTNAME char(255) after DEVICE_NUM"; + sql="alter table `INPUTS` add column `NODE_HOSTNAME` char(255) after `DEVICE_NUM`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table INPUTS add column NODE_TCP_PORT int after NODE_HOSTNAME"; + sql="alter table `INPUTS` add column `NODE_TCP_PORT` int after `NODE_HOSTNAME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table INPUTS add column NODE_SLOT int after NODE_TCP_PORT"; + sql="alter table `INPUTS` add column `NODE_SLOT` int after `NODE_TCP_PORT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table add index NODE_IDX(STATION_NAME,MATRIX,NUMBER,NODE_HOSTNAME,NODE_TCP_PORT)"; + sql="alter table add index `NODE_IDX` (`STATION_NAME`,`MATRIX`,`NUMBER`,`NODE_HOSTNAME`,`NODE_TCP_PORT`)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table OUTPUTS add column NODE_HOSTNAME char(255) after DEVICE_NUM"; + sql="alter table `OUTPUTS` add column `NODE_HOSTNAME` char(255) after `DEVICE_NUM`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table OUTPUTS add column NODE_TCP_PORT int after NODE_HOSTNAME"; + sql="alter table `OUTPUTS` add column `NODE_TCP_PORT` int after `NODE_HOSTNAME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table OUTPUTS add column NODE_SLOT int after NODE_TCP_PORT"; + sql="alter table `OUTPUTS` add column `NODE_SLOT` int after `NODE_TCP_PORT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table add index NODE_IDX(STATION_NAME,MATRIX,NUMBER,NODE_HOSTNAME,NODE_TCP_PORT)"; + sql="alter table add index `NODE_IDX` (`STATION_NAME`,`MATRIX`,`NUMBER`,`NODE_HOSTNAME`,`NODE_TCP_PORT`)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4079,32 +4381,32 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<150)&&(set_schema>cur_schema)) { - sql="alter table MATRICES add column PORT_2 int not null after PORT"; + sql="alter table `MATRICES` add column `PORT_2` int not null after `PORT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table MATRICES add column PORT_TYPE_2 int default 0 after PORT_TYPE"; + sql="alter table `MATRICES` add column `PORT_TYPE_2` int default 0 after `PORT_TYPE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table MATRICES add column IP_ADDRESS_2 char(16) after IP_ADDRESS"; + sql="alter table `MATRICES` add column `IP_ADDRESS_2` char(16) after `IP_ADDRESS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table MATRICES add column IP_PORT_2 int after IP_PORT"; + sql="alter table `MATRICES` add column `IP_PORT_2` int after `IP_PORT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table MATRICES add column USERNAME_2 char(32) after USERNAME"; + sql="alter table `MATRICES` add column `USERNAME_2` char(32) after `USERNAME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table MATRICES add column PASSWORD_2 char(32) after PASSWORD"; + sql="alter table `MATRICES` add column `PASSWORD_2` char(32) after `PASSWORD`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4113,12 +4415,12 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<151)&&(set_schema>cur_schema)) { - sql="alter table FEEDS add column KEEP_METADATA enum('N','Y') default 'Y' after ENABLE_AUTOPOST"; + sql="alter table `FEEDS` add column `KEEP_METADATA` enum('N','Y') default 'Y' after `ENABLE_AUTOPOST`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select KEY_NAME from FEEDS"; + sql="select `KEY_NAME` from `FEEDS`"; q=new RDSqlQuery(sql,false); while(q->next()) { CreateFeedLog151(q->value(0).toString()); @@ -4129,28 +4431,28 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<152)&&(set_schema>cur_schema)) { - sql="alter table STATIONS add column EDITOR_PATH char(255) default \"\"\ - after STARTUP_CART"; + sql="alter table `STATIONS` add column `EDITOR_PATH` char(255) default ''\ + after `STARTUP_CART`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDPANEL add column CARD3 int default -1 after STOP_RML2"; + sql="alter table `RDPANEL` add column `CARD3` int default -1 after `STOP_RML2`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDPANEL add column PORT3 int default -1 after CARD3"; + sql="alter table `RDPANEL` add column `PORT3` int default -1 after `CARD3`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDPANEL add column START_RML3 char(255) after PORT3"; + sql="alter table `RDPANEL` add column `START_RML3` char(255) after `PORT3`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDPANEL add column STOP_RML3 char(255) after START_RML3"; + sql="alter table `RDPANEL` add column `STOP_RML3` char(255) after `START_RML3`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4159,7 +4461,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<153)&&(set_schema>cur_schema)) { - sql="alter table STATIONS add column FILTER_MODE int default 0 after EDITOR_PATH"; + sql="alter table `STATIONS` add column `FILTER_MODE` int default 0 after `EDITOR_PATH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4168,7 +4470,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<154)&&(set_schema>cur_schema)) { - sql=QString().sprintf("alter table CUTS add column SEGUE_GAIN int default %d after SEGUE_END_POINT",RD_FADE_DEPTH); + sql=QString().sprintf("alter table `CUTS` add column `SEGUE_GAIN` int default %d after `SEGUE_END_POINT`",RD_FADE_DEPTH); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4177,7 +4479,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<155)&&(set_schema>cur_schema)) { - sql="alter table RDLIBRARY add column ENABLE_EDITOR enum('N','Y') default 'N' after CDDB_SERVER"; + sql="alter table `RDLIBRARY` add column `ENABLE_EDITOR` enum('N','Y') default 'N' after `CDDB_SERVER`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4186,7 +4488,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<156)&&(set_schema>cur_schema)) { - sql="alter table MATRICES add column LAYER int default 86 after TYPE"; + sql="alter table `MATRICES` add column `LAYER` int default 86 after `TYPE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4195,7 +4497,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<157)&&(set_schema>cur_schema)) { - sql="alter table STATIONS add column BROADCAST_SECURITY int unsigned default 0 after BACKUP_LIFE"; + sql="alter table `STATIONS` add column `BROADCAST_SECURITY` int unsigned default 0 after `BACKUP_LIFE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4204,12 +4506,12 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<158)&&(set_schema>cur_schema)) { - sql="select NAME from LOGS;"; + sql="select `NAME` from `LOGS`;"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); - sql=QString("update `")+tablename+"_LOG` set TRANS_TYPE=1,SEGUE_GAIN=0 where TRANS_TYPE=3"; + sql=QString("update `")+tablename+"_LOG` set `TRANS_TYPE`=1,`SEGUE_GAIN`=0 where `TRANS_TYPE`=3"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4220,16 +4522,16 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<159)&&(set_schema>cur_schema)) { - sql="alter table RDAIRPLAY add column SKIN_PATH char(255) default \""; + sql="alter table `RDAIRPLAY` add column `SKIN_PATH` char(255) default '"; sql+=RD_DEFAULT_RDAIRPLAY_SKIN; - sql+="\" after EXIT_PASSWORD"; + sql+="' after `EXIT_PASSWORD`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDPANEL add column SKIN_PATH char(255) default \""; + sql="alter table `RDPANEL` add column `SKIN_PATH` char(255) default '"; sql+=RD_DEFAULT_RDPANEL_SKIN; - sql+="\" after DEFAULT_SERVICE"; + sql+="' after `DEFAULT_SERVICE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4241,25 +4543,25 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // // Create ENCODERS Table // - sql=QString("create table if not exists ENCODERS (")+ - "ID int not null auto_increment primary key,"+ - "NAME char(32) not null,"+ - "STATION_NAME char(64),"+ - "COMMAND_LINE char(255),"+ - "DEFAULT_EXTENSION char(16),"+ - "index NAME_IDX(NAME,STATION_NAME))"+ + sql=QString("create table if not exists `ENCODERS` (")+ + "`ID` int not null auto_increment primary key,"+ + "`NAME` char(32) not null,"+ + "`STATION_NAME` char(64),"+ + "`COMMAND_LINE` char(255),"+ + "`DEFAULT_EXTENSION` char(16),"+ + "index `NAME_IDX` (`NAME`,`STATION_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } // Ensure that dynamic format IDs start after 100 - sql="insert into ENCODERS set ID=100,NAME=\"dummy\""; + sql="insert into `ENCODERS` set `ID`=100,`NAME`='dummy'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="delete from ENCODERS where ID=100"; + sql="delete from `ENCODERS` where `ID`=100"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4267,11 +4569,11 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // // Create ENCODER_BITRATES Table // - sql=QString("create table if not exists ENCODER_BITRATES (")+ - "ID int not null auto_increment primary key,"+ - "ENCODER_ID int not null,"+ - "BITRATES int not null,"+ - "index ENCODER_ID_IDX(ENCODER_ID))"+ + sql=QString("create table if not exists `ENCODER_BITRATES` (")+ + "`ID` int not null auto_increment primary key,"+ + "`ENCODER_ID` int not null,"+ + "`BITRATES` int not null,"+ + "index `ENCODER_ID_IDX` (`ENCODER_ID`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -4281,11 +4583,11 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // // Create ENCODER_CHANNELS Table // - sql=QString("create table if not exists ENCODER_CHANNELS (")+ - "ID int not null auto_increment primary key,"+ - "ENCODER_ID int not null,"+ - "CHANNELS int not null,"+ - "index ENCODER_ID_IDX(ENCODER_ID))"+ + sql=QString("create table if not exists `ENCODER_CHANNELS` (")+ + "`ID` int not null auto_increment primary key,"+ + "`ENCODER_ID` int not null,"+ + "`CHANNELS` int not null,"+ + "index `ENCODER_ID_IDX` (`ENCODER_ID`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -4295,11 +4597,11 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // // Create ENCODER_SAMPLERATES Table // - sql=QString("create table if not exists ENCODER_SAMPLERATES (")+ - "ID int not null auto_increment primary key,"+ - "ENCODER_ID int not null,"+ - "SAMPLERATES int not null,"+ - "index ENCODER_ID_IDX(ENCODER_ID))"+ + sql=QString("create table if not exists `ENCODER_SAMPLERATES` (")+ + "`ID` int not null auto_increment primary key,"+ + "`ENCODER_ID` int not null,"+ + "`SAMPLERATES` int not null,"+ + "index `ENCODER_ID_IDX` (`ENCODER_ID`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -4310,7 +4612,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<161)&&(set_schema>cur_schema)) { - sql="alter table FEEDS add column UPLOAD_EXTENSION char(16) default \"mp3\" after UPLOAD_QUALITY"; + sql="alter table `FEEDS` add column `UPLOAD_EXTENSION` char(16) default 'mp3' after `UPLOAD_QUALITY`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4319,33 +4621,37 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<162)&&(set_schema>cur_schema)) { - sql="alter table GPIS alter column MACRO_CART set default 0"; + sql="alter table `GPIS` alter column `MACRO_CART` set default 0"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("create table if not exists GPOS (")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "MATRIX int not null,"+ - "NUMBER int not null,"+ - "MACRO_CART int default 0,"+ - "index MATRIX_IDX (STATION_NAME,MATRIX,NUMBER))"+ + sql=QString("create table if not exists `GPOS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`MATRIX` int not null,"+ + "`NUMBER` int not null,"+ + "`MACRO_CART` int default 0,"+ + "index `MATRIX_IDX` (`STATION_NAME`,`MATRIX,NUMBER`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select STATION_NAME,MATRIX,GPOS from MATRICES"; + sql=QString("select ")+ + "`STATION_NAME`,"+ // 00 + "`MATRIX`,"+ // 01 + "`GPOS` "+ // 02 + "from `MATRICES`"; q=new RDSqlQuery(sql,false); while(q->next()) { for(int i=0;ivalue(2).toInt();i++) { - sql=QString("insert into GPOS set ")+ - "STATION_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - QString().sprintf("MATRIX=%d,",q->value(1).toInt())+ - QString().sprintf("NUMBER=%d,",i+1)+ - "MACRO_CART=0"; + sql=QString("insert into `GPOS` set ")+ + "`STATION_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + QString().sprintf("`MATRIX`=%d,",q->value(1).toInt())+ + QString().sprintf("`NUMBER`=%d,",i+1)+ + "`MACRO_CART`=0"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4357,7 +4663,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<163)&&(set_schema>cur_schema)) { - sql="alter table RECORDINGS add column EVENTDATE_OFFSET int default 0 after ENDDATE_OFFSET"; + sql="alter table `RECORDINGS` add column `EVENTDATE_OFFSET` int default 0 after `ENDDATE_OFFSET`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4366,13 +4672,13 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<164)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists NOWNEXT_PLUGINS (")+ - "ID int auto_increment not null primary key, "+ - "STATION_NAME char(64) not null, "+ - "LOG_MACHINE int unsigned not null default 0, "+ - "PLUGIN_PATH char(255),"+ - "PLUGIN_ARG char(255),"+ - "index STATION_IDX (STATION_NAME,LOG_MACHINE))"+ + sql=QString("create table if not exists `NOWNEXT_PLUGINS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`LOG_MACHINE` int unsigned not null default 0,"+ + "`PLUGIN_PATH` char(255),"+ + "`PLUGIN_ARG` char(255),"+ + "index `STATION_IDX` (`STATION_NAME`,`LOG_MACHINE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -4383,29 +4689,29 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<165)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists DROPBOX_PATHS (")+ - "ID int auto_increment not null primary key,"+ - "DROPBOX_ID int not null,"+ - "FILE_PATH char(255) not null,"+ - "FILE_DATETIME datetime,"+ - "index FILE_PATH_IDX (DROPBOX_ID,FILE_PATH))"+ + sql=QString("create table if not exists `DROPBOX_PATHS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`DROPBOX_ID` int not null,"+ + "`FILE_PATH` char(255) not null,"+ + "`FILE_DATETIME` datetime,"+ + "index `FILE_PATH_IDX` (`DROPBOX_ID`,`FILE_PATH`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table DROPBOXES add DELETE_SOURCE enum('N','Y') default 'Y' after DELETE_CUTS"; + sql="alter table `DROPBOXES` add `DELETE_SOURCE` enum('N','Y') default 'Y' after `DELETE_CUTS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table DROPBOXES add column STARTDATE_OFFSET int default 0 after METADATA_PATTERN"; + sql="alter table `DROPBOXES` add column `STARTDATE_OFFSET` int default 0 after `METADATA_PATTERN`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table DROPBOXES add column ENDDATE_OFFSET int default 0 after STARTDATE_OFFSET"; + sql="alter table `DROPBOXES` add column `ENDDATE_OFFSET` int default 0 after `STARTDATE_OFFSET`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4414,32 +4720,32 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<166)&&(set_schema>cur_schema)) { - sql="alter table GROUPS add column CUT_SHELFLIFE int default -1 after DEFAULT_HIGH_CART"; + sql="alter table `GROUPS` add column `CUT_SHELFLIFE` int default -1 after `DEFAULT_HIGH_CART`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table GROUPS add column DEFAULT_TITLE char(255) default \"Imported from %f.%e\" after CUT_SHELFLIFE"; + sql="alter table `GROUPS` add column `DEFAULT_TITLE` char(255) default 'Imported from %f.%e' after `CUT_SHELFLIFE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column SYSTEM_MAINT enum('N','Y') default 'Y' after FILTER_MODE"; + sql="alter table `STATIONS` add column `SYSTEM_MAINT` enum('N','Y') default 'Y' after `FILTER_MODE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column ELR_SHELFLIFE int default -1 after AUTO_REFRESH"; + sql="alter table `SERVICES` add column `ELR_SHELFLIFE` int default -1 after `AUTO_REFRESH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table EVENTS add column REMARKS char(255) after NESTED_EVENT"; + sql="alter table `EVENTS` add column `REMARKS` char(255) after `NESTED_EVENT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table CLOCKS add column REMARKS char(255) after COLOR"; + sql="alter table `CLOCKS` add column `REMARKS` char(255) after `COLOR`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4448,32 +4754,32 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<167)&&(set_schema>cur_schema)) { - sql="alter table RDAIRPLAY add column LOG0_NOW_CART int unsigned default 0 after LOG0_LOG_LINE"; + sql="alter table `RDAIRPLAY` add column `LOG0_NOW_CART` int unsigned default 0 after `LOG0_LOG_LINE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG0_NEXT_CART int unsigned default 0 after LOG0_NOW_CART"; + sql="alter table `RDAIRPLAY` add column `LOG0_NEXT_CART` int unsigned default 0 after `LOG0_NOW_CART`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG1_NOW_CART int unsigned default 0 after LOG1_LOG_LINE"; + sql="alter table `RDAIRPLAY` add column `LOG1_NOW_CART` int unsigned default 0 after `LOG1_LOG_LINE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG1_NEXT_CART int unsigned default 0 after LOG1_NOW_CART"; + sql="alter table `RDAIRPLAY` add column `LOG1_NEXT_CART` int unsigned default 0 after `LOG1_NOW_CART`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG2_NOW_CART int unsigned default 0 after LOG2_LOG_LINE"; + sql="alter table `RDAIRPLAY` add column `LOG2_NOW_CART` int unsigned default 0 after `LOG2_LOG_LINE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column LOG2_NEXT_CART int unsigned default 0 after LOG2_NOW_CART"; + sql="alter table `RDAIRPLAY` add column `LOG2_NEXT_CART` int unsigned default 0 after `LOG2_NOW_CART`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4482,12 +4788,12 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<168)&&(set_schema>cur_schema)) { - sql="alter table GPIS add column OFF_MACRO_CART int default 0 after MACRO_CART"; + sql="alter table `GPIS` add column `OFF_MACRO_CART` int default 0 after `MACRO_CART`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table GPOS add column OFF_MACRO_CART int default 0 after MACRO_CART"; + sql="alter table `GPOS` add column `OFF_MACRO_CART` int default 0 after `MACRO_CART`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4496,12 +4802,12 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<169)&&(set_schema>cur_schema)) { - sql="alter table SERVICES add column DEFAULT_LOG_SHELFLIFE int default -1 after AUTO_REFRESH"; + sql="alter table `SERVICES` add column `DEFAULT_LOG_SHELFLIFE` int default -1 after `AUTO_REFRESH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table LOGS add column PURGE_DATE date after END_DATE"; + sql="alter table `LOGS` add column `PURGE_DATE` date after `END_DATE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4510,33 +4816,33 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<170)&&(set_schema>cur_schema)) { - sql="alter table USERS modify column LOGIN_NAME char(255) not null"; + sql="alter table `USERS` modify column `LOGIN_NAME` char(255) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table USERS modify column FULL_NAME char(255)"; + sql="alter table `USERS` modify column `FULL_NAME` char(255)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table FEED_PERMS modify column USER_NAME char(255)"; + sql="alter table `FEED_PERMS` modify column `USER_NAME` char(255)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table LOGS modify column ORIGIN_USER char(255) not null"; + sql="alter table `LOGS` modify column `ORIGIN_USER` char(255) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select NAME from LOGS"; + sql="select `NAME` from `LOGS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString(). - sprintf("alter table %s_LOG modify column ORIGIN_USER char(255)", + sprintf("alter table `%s_LOG` modify column `ORIGIN_USER` char(255)", tablename.toUtf8().constData()); if(!RDSqlQuery::apply(sql,err_msg)) { return false; @@ -4544,19 +4850,19 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } delete q; - sql="select NAME from EVENTS"; + sql="select `NAME` from `EVENTS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString(). - sprintf("alter table %s_PRE modify column ORIGIN_USER char(255)", + sprintf("alter table `%s_PRE` modify column `ORIGIN_USER` char(255)", tablename.toUtf8().constData()); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString(). - sprintf("alter table %s_POST modify column ORIGIN_USER char(255)", + sprintf("alter table `%s_POST` modify column `ORIGIN_USER` char(255)", tablename.toUtf8().constData()); if(!RDSqlQuery::apply(sql,err_msg)) { return false; @@ -4564,22 +4870,22 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } delete q; - sql="alter table STATIONS modify column USER_NAME char(255)"; + sql="alter table `STATIONS` modify column `USER_NAME` char(255)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS modify column DEFAULT_NAME char(255)"; + sql="alter table `STATIONS` modify column `DEFAULT_NAME` char(255)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table USER_PERMS modify column USER_NAME char(255)"; + sql="alter table `USER_PERMS` modify column `USER_NAME` char(255)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table WEB_CONNECTIONS modify column LOGIN_NAME char(255)"; + sql="alter table `WEB_CONNECTIONS` modify column `LOGIN_NAME` char(255)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4588,23 +4894,23 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<171)&&(set_schema>cur_schema)) { - sql="alter table FEEDS add column CAST_ORDER enum('N','Y') default 'N' after ITEM_XML"; + sql="alter table `FEEDS` add column `CAST_ORDER` enum('N','Y') default 'N' after `ITEM_XML`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table PODCASTS add column EFFECTIVE_DATETIME datetime after ORIGIN_DATETIME"; + sql="alter table `PODCASTS` add column `EFFECTIVE_DATETIME` datetime after `ORIGIN_DATETIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select ID,ORIGIN_DATETIME from PODCASTS"; + sql="select `ID`,`ORIGIN_DATETIME` from `PODCASTS`"; q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("update PODCASTS set ")+ - "EFFECTIVE_DATETIME=\""+q->value(1).toDateTime(). - toString("yyyy-MM-dd hh:mm:ss")+"\" where "+ - QString().sprintf("ID=%u",q->value(0).toUInt()); + sql=QString("update `PODCASTS` set ")+ + "`EFFECTIVE_DATETIME`='"+q->value(1).toDateTime(). + toString("yyyy-MM-dd hh:mm:ss")+"' where "+ + QString().sprintf("`ID`=%u",q->value(0).toUInt()); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4615,7 +4921,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<172)&&(set_schema>cur_schema)) { - sql="alter table FEEDS add column REDIRECT_PATH char(255) after NORMALIZE_LEVEL"; + sql="alter table `FEEDS` add column `REDIRECT_PATH` char(255) after `NORMALIZE_LEVEL`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4624,7 +4930,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<173)&&(set_schema>cur_schema)) { - sql="alter table FEEDS add column BASE_PREAMBLE char(255) after BASE_URL"; + sql="alter table `FEEDS` add column `BASE_PREAMBLE` char(255) after `BASE_URL`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4633,22 +4939,22 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<174)&&(set_schema>cur_schema)) { - sql="alter table MATRICES add column START_CART int unsigned after PASSWORD_2"; + sql="alter table `MATRICES` add column `START_CART` int unsigned after `PASSWORD_2`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table MATRICES add column STOP_CART int unsigned after START_CART"; + sql="alter table `MATRICES` add column `STOP_CART` int unsigned after `START_CART`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table MATRICES add column START_CART_2 int unsigned after STOP_CART"; + sql="alter table `MATRICES` add column `START_CART_2` int unsigned after `STOP_CART`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table MATRICES add column STOP_CART_2 int unsigned after START_CART_2"; + sql="alter table `MATRICES` add column `STOP_CART_2` int unsigned after `START_CART_2`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4657,15 +4963,15 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<175)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists SYSTEM (")+ - "ID int auto_increment not null primary key,"+ - "DUP_CART_TITLES enum('N','Y') not null default 'Y')"+ + sql=QString("create table if not exists `SYSTEM` (")+ + "`ID` int auto_increment not null primary key,"+ + "`DUP_CART_TITLES` enum('N','Y') not null default 'Y')"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="insert into SYSTEM set DUP_CART_TITLES=\"Y\""; + sql="insert into `SYSTEM` set `DUP_CART_TITLES`='Y'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4674,12 +4980,12 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<176)&&(set_schema>cur_schema)) { - sql="alter table RDAIRPLAY add column SHOW_COUNTERS enum('N','Y') default 'N' after SKIN_PATH"; + sql="alter table `RDAIRPLAY` add column `SHOW_COUNTERS` enum('N','Y') default 'N' after `SKIN_PATH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table RDAIRPLAY add column AUDITION_PREROLL int default 10000 after SHOW_COUNTERS"; + sql="alter table `RDAIRPLAY` add column `AUDITION_PREROLL` int default 10000 after `SHOW_COUNTERS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4688,9 +4994,9 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<177)&&(set_schema>cur_schema)) { - sql=QString("alter table RDPANEL ")+ - "add column SKIN_PATH char(255) default \""+RD_DEFAULT_RDPANEL_SKIN+"\" "+ - "after DEFAULT_SERVICE"; + sql=QString("alter table `RDPANEL` ")+ + "add column `SKIN_PATH` char(255) default '"+RD_DEFAULT_RDPANEL_SKIN+"' "+ + "after `DEFAULT_SERVICE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4701,14 +5007,14 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<178)&&(set_schema>cur_schema)) { - sql="alter table PODCASTS modify column STATUS int unsigned default 1"; + sql="alter table `PODCASTS` modify column `STATUS` int unsigned default 1"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SYSTEM ")+ - "add column MAX_POST_LENGTH "+ - QString().sprintf("int unsigned default %u after DUP_CART_TITLES", + sql=QString("alter table `SYSTEM` ")+ + "add column `MAX_POST_LENGTH` "+ + QString().sprintf("int unsigned default %u after `DUP_CART_TITLES`", RD_DEFAULT_MAX_POST_LENGTH); if(!RDSqlQuery::apply(sql,err_msg)) { return false; @@ -4718,7 +5024,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<179)&&(set_schema>cur_schema)) { - sql="alter table FEEDS add column MEDIA_LINK_MODE int default 0 after REDIRECT_PATH"; + sql="alter table `FEEDS` add column `MEDIA_LINK_MODE` int default 0 after `REDIRECT_PATH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4727,7 +5033,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<180)&&(set_schema>cur_schema)) { - sql="alter table RDLIBRARY add column SRC_CONVERTER int default 1 after ENABLE_EDITOR"; + sql="alter table `RDLIBRARY` add column `SRC_CONVERTER` int default 1 after `ENABLE_EDITOR`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4742,7 +5048,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<182)&&(set_schema>cur_schema)) { - sql="alter table CART add column NOTES text after MACROS"; + sql="alter table `CART` add column `NOTES` text after `MACROS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4751,32 +5057,32 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<183)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists IMPORT_TEMPLATES (")+ - "NAME char(64) not null primary key,"+ - "CART_OFFSET int,"+ - "CART_LENGTH int,"+ - "TITLE_OFFSET int,"+ - "TITLE_LENGTH int,"+ - "HOURS_OFFSET int,"+ - "HOURS_LENGTH int,"+ - "MINUTES_OFFSET int,"+ - "MINUTES_LENGTH int,"+ - "SECONDS_OFFSET int,"+ - "SECONDS_LENGTH int,"+ - "LEN_HOURS_OFFSET int,"+ - "LEN_HOURS_LENGTH int,"+ - "LEN_MINUTES_OFFSET int,"+ - "LEN_MINUTES_LENGTH int,"+ - "LEN_SECONDS_OFFSET int,"+ - "LEN_SECONDS_LENGTH int,"+ - "LENGTH_OFFSET int,"+ - "LENGTH_LENGTH int,"+ - "DATA_OFFSET int,"+ - "DATA_LENGTH int,"+ - "EVENT_ID_OFFSET int,"+ - "EVENT_ID_LENGTH int,"+ - "ANNC_TYPE_OFFSET int,"+ - "ANNC_TYPE_LENGTH int)"+ + sql=QString("create table if not exists `IMPORT_TEMPLATES` (")+ + "`NAME` char(64) not null primary key,"+ + "`CART_OFFSET` int,"+ + "`CART_LENGTH` int,"+ + "`TITLE_OFFSET` int,"+ + "`TITLE_LENGTH` int,"+ + "`HOURS_OFFSET` int,"+ + "`HOURS_LENGTH` int,"+ + "`MINUTES_OFFSET` int,"+ + "`MINUTES_LENGTH` int,"+ + "`SECONDS_OFFSET` int,"+ + "`SECONDS_LENGTH` int,"+ + "`LEN_HOURS_OFFSET` int,"+ + "`LEN_HOURS_LENGTH` int,"+ + "`LEN_MINUTES_OFFSET` int,"+ + "`LEN_MINUTES_LENGTH` int,"+ + "`LEN_SECONDS_OFFSET` int,"+ + "`LEN_SECONDS_LENGTH` int,"+ + "`LENGTH_OFFSET` int,"+ + "`LENGTH_LENGTH` int,"+ + "`DATA_OFFSET` int,"+ + "`DATA_LENGTH` int,"+ + "`EVENT_ID_OFFSET` int,"+ + "`EVENT_ID_LENGTH` int,"+ + "`ANNC_TYPE_OFFSET` int,"+ + "`ANNC_TYPE_LENGTH` int)"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -4784,22 +5090,22 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } InsertImportFormats(err_msg); - sql="alter table SERVICES add column TFC_IMPORT_TEMPLATE char(64) default \"Rivendell Standard Import\" after TFC_WIN_PATH"; + sql="alter table `SERVICES` add column `TFC_IMPORT_TEMPLATE` char(64) default 'Rivendell Standard Import' after `TFC_WIN_PATH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column MUS_IMPORT_TEMPLATE char(64) default \"Rivendell Standard Import\" after MUS_WIN_PATH"; + sql="alter table `SERVICES` add column `MUS_IMPORT_TEMPLATE` char(64) default 'Rivendell Standard Import' after `MUS_WIN_PATH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="update SERVICES set TFC_IMPORT_TEMPLATE=\"\""; + sql="update `SERVICES` set `TFC_IMPORT_TEMPLATE`=''"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="update SERVICES set MUS_IMPORT_TEMPLATE=\"\""; + sql="update `SERVICES` set `MUS_IMPORT_TEMPLATE`=''"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4816,22 +5122,22 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<185)&&(set_schema>cur_schema)) { - sql="alter table SERVICES add column TFC_PREIMPORT_CMD text after TFC_PATH"; + sql="alter table `SERVICES` add column `TFC_PREIMPORT_CMD` text after `TFC_PATH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column TFC_WIN_PREIMPORT_CMD text after TFC_WIN_PATH"; + sql="alter table `SERVICES` add column `TFC_WIN_PREIMPORT_CMD` text after `TFC_WIN_PATH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column MUS_PREIMPORT_CMD text after MUS_PATH"; + sql="alter table `SERVICES` add column `MUS_PREIMPORT_CMD` text after `MUS_PATH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SERVICES add column MUS_WIN_PREIMPORT_CMD text after MUS_WIN_PATH"; + sql="alter table `SERVICES` add column `MUS_WIN_PREIMPORT_CMD` text after `MUS_WIN_PATH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4840,7 +5146,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<186)&&(set_schema>cur_schema)) { - sql="select NAME from LOGS"; + sql="select `NAME` from `LOGS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); @@ -4851,7 +5157,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } delete q; - sql="select NAME from EVENTS"; + sql="select `NAME` from `EVENTS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); @@ -4866,7 +5172,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } } - sql="select NAME from CLOCKS"; + sql="select `NAME` from `CLOCKS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); @@ -4881,18 +5187,18 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<187)&&(set_schema>cur_schema)) { - sql="alter table CUTS add column ISCI char(32) after ISRC"; + sql="alter table `CUTS` add column `ISCI` char(32) after `ISRC`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select NAME from SERVICES"; + sql="select `NAME` from `SERVICES`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table `")+tablename+"_SRT` "+ - "add column ISCI char(32) after ISRC"; + "add column `ISCI` char(32) after `ISRC`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4909,7 +5215,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<189)&&(set_schema>cur_schema)) { - sql="alter table CUTS add column UPLOAD_DATETIME datetime after LAST_PLAY_DATETIME"; + sql="alter table `CUTS` add column `UPLOAD_DATETIME` datetime after `LAST_PLAY_DATETIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4918,7 +5224,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<190)&&(set_schema>cur_schema)) { - sql="alter table STATIONS add column HAVE_TWOLAME enum('N','Y') default 'N' after HAVE_FLAC"; + sql="alter table `STATIONS` add column `HAVE_TWOLAME` enum('N','Y') default 'N' after `HAVE_FLAC`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4927,7 +5233,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<191)&&(set_schema>cur_schema)) { - sql="alter table SERVICES add column PROGRAM_CODE char(255) after NAME_TEMPLATE"; + sql="alter table `SERVICES` add column `PROGRAM_CODE` char(255) after `NAME_TEMPLATE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4936,7 +5242,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<192)&&(set_schema>cur_schema)) { - sql="alter table RECORDINGS add column EXIT_TEXT text after EXIT_CODE"; + sql="alter table `RECORDINGS` add column `EXIT_TEXT` text after `EXIT_CODE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4945,7 +5251,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<193)&&(set_schema>cur_schema)) { - sql="alter table STATIONS alter column IPV4_ADDRESS set default \"127.0.0.2\""; + sql="alter table `STATIONS` alter column `IPV4_ADDRESS` set default '127.0.0.2'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4954,17 +5260,17 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<194)&&(set_schema>cur_schema)) { - sql=QString().sprintf("alter table SYSTEM ")+ - "add column SAMPLE_RATE "+ - QString().sprintf("int unsigned default %d after ID", + sql=QString().sprintf("alter table `SYSTEM` ")+ + "add column `SAMPLE_RATE` "+ + QString().sprintf("int unsigned default %d after `ID`", RD_DEFAULT_SAMPLE_RATE); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select DEFAULT_SAMPRATE from RDLIBRARY"; + sql="select `DEFAULT_SAMPRATE` from `RDLIBRARY`"; q=new RDSqlQuery(sql,false); if(q->first()) { - sql=QString().sprintf("update SYSTEM set SAMPLE_RATE=%u", + sql=QString().sprintf("update `SYSTEM` set `SAMPLE_RATE`=%u", q->value(0).toUInt()); if(!RDSqlQuery::apply(sql,err_msg)) { return false; @@ -4976,7 +5282,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<195)&&(set_schema>cur_schema)) { - sql="alter table RECORDINGS add column ENABLE_METADATA enum('N','Y') default 'N' after URL_PASSWORD"; + sql="alter table `RECORDINGS` add column `ENABLE_METADATA` enum('N','Y') default 'N' after `URL_PASSWORD`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -4985,15 +5291,15 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<196)&&(set_schema>cur_schema)) { - sql="alter table DROPBOXES add column IMPORT_CREATE_DATES enum('N','Y') default 'N' after LOG_PATH"; + sql="alter table `DROPBOXES` add column `IMPORT_CREATE_DATES` enum('N','Y') default 'N' after `LOG_PATH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table DROPBOXES add column CREATE_STARTDATE_OFFSET int default 0 after IMPORT_CREATE_DATES"; + sql="alter table `DROPBOXES` add column `CREATE_STARTDATE_OFFSET` int default 0 after `IMPORT_CREATE_DATES`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table DROPBOXES add column CREATE_ENDDATE_OFFSET int default 0 after CREATE_STARTDATE_OFFSET"; + sql="alter table `DROPBOXES` add column `CREATE_ENDDATE_OFFSET` int default 0 after `CREATE_STARTDATE_OFFSET`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5002,46 +5308,46 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<197)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists REPLICATORS (")+ - "NAME char(32) not null primary key,"+ - "DESCRIPTION char(64),"+ - "TYPE_ID int unsigned not null,"+ - "STATION_NAME char(64),"+ - "FORMAT int unsigned default 0,"+ - "CHANNELS int unsigned default 2,"+ - QString().sprintf("SAMPRATE int unsigned default %u,", + sql=QString("create table if not exists `REPLICATORS` (")+ + "`NAME` char(32) not null primary key,"+ + "`DESCRIPTION` char(64),"+ + "`TYPE_ID` int unsigned not null,"+ + "`STATION_NAME` char(64),"+ + "`FORMAT` int unsigned default 0,"+ + "`CHANNELS` int unsigned default 2,"+ + QString().sprintf("`SAMPRATE` int unsigned default %u,", RD_DEFAULT_SAMPLE_RATE)+ - "BITRATE int unsigned default 0,"+ - "QUALITY int unsigned default 0,"+ - "URL char(255),"+ - "URL_USERNAME char(64),"+ - "URL_PASSWORD char(64),"+ - "ENABLE_METADATA enum('N','Y') default 'N',"+ - "NORMALIZATION_LEVEL int unsigned default 0,"+ - "index TYPE_ID_IDX (TYPE_ID))"+ + "`BITRATE` int unsigned default 0,"+ + "`QUALITY` int unsigned default 0,"+ + "`URL` char(255),"+ + "`URL_USERNAME` char(64),"+ + "`URL_PASSWORD` char(64),"+ + "`ENABLE_METADATA` enum('N','Y') default 'N',"+ + "`NORMALIZATION_LEVEL` int unsigned default 0,"+ + "index `TYPE_ID_IDX` (`TYPE_ID`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("create table if not exists REPLICATOR_MAP (")+ - "ID int unsigned not null auto_increment primary key,"+ - "REPLICATOR_NAME char(32) not null,"+ - "GROUP_NAME char(10) not null,"+ - "index REPLICATOR_NAME_IDX(REPLICATOR_NAME),"+ - "index GROUP_NAME_IDX(GROUP_NAME))"+ + sql=QString("create table if not exists `REPLICATOR_MAP` (")+ + "`ID` int unsigned not null auto_increment primary key,"+ + "`REPLICATOR_NAME` char(32) not null,"+ + "`GROUP_NAME` char(10) not null,"+ + "index `REPLICATOR_NAME_IDX` (`REPLICATOR_NAME`),"+ + "index `GROUP_NAME_IDX` (`GROUP_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table CART add column METADATA_DATETIME datetime after NOTES"; + sql="alter table `CART` add column `METADATA_DATETIME` datetime after `NOTES`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="update CART set METADATA_DATETIME=now()"; + sql="update `CART` set `METADATA_DATETIME`=now()"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5049,12 +5355,12 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // // Create REPL_CART_STATE Table // - sql=QString("create table if not exists REPL_CART_STATE (")+ - "ID int unsigned not null auto_increment primary key,"+ - "REPLICATOR_NAME char(32) not null,"+ - "CART_NUMBER int unsigned not null,"+ - "ITEM_DATETIME datetime not null,"+ - "unique REPLICATOR_NAME_IDX(REPLICATOR_NAME,CART_NUMBER))"+ + sql=QString("create table if not exists `REPL_CART_STATE` (")+ + "`ID` int unsigned not null auto_increment primary key,"+ + "`REPLICATOR_NAME` char(32) not null,"+ + "`CART_NUMBER` int unsigned not null,"+ + "`ITEM_DATETIME` datetime not null,"+ + "unique `REPLICATOR_NAME_IDX` (`REPLICATOR_NAME`,`CART_NUMBER`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -5064,13 +5370,13 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // // Create REPL_CUT_STATE Table // - sql=QString("create table if not exists REPL_CUT_STATE (")+ - "ID int unsigned not null auto_increment primary key,"+ - "REPLICATOR_NAME char(32) not null,"+ - "CUT_NAME char(12) not null,"+ - "ITEM_DATETIME datetime not null,"+ - "index REPLICATOR_NAME_IDX(REPLICATOR_NAME),"+ - "index CUT_NAME_IDX(CUT_NAME))"+ + sql=QString("create table if not exists `REPL_CUT_STATE` (")+ + "`ID` int unsigned not null auto_increment primary key,"+ + "`REPLICATOR_NAME` char(32) not null,"+ + "`CUT_NAME` char(12) not null,"+ + "`ITEM_DATETIME` datetime not null,"+ + "index `REPLICATOR_NAME_IDX` (`REPLICATOR_NAME`),"+ + "index `CUT_NAME_IDX` (`CUT_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -5081,42 +5387,42 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<198)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists ISCI_XREFERENCE (")+ - "ID int unsigned not null auto_increment primary key,"+ - "CART_NUMBER int unsigned not null,"+ - "ISCI char(32) not null,"+ - "FILENAME char(64) not null,"+ - "LATEST_DATE date not null,"+ - "TYPE char(1) not null,"+ - "ADVERTISER_NAME char(30),"+ - "PRODUCT_NAME char(35),"+ - "CREATIVE_TITLE char(30),"+ - "REGION_NAME char(80),"+ - "index CART_NUMBER_IDX(CART_NUMBER))"+ + sql=QString("create table if not exists `ISCI_XREFERENCE` (")+ + "`ID` int unsigned not null auto_increment primary key,"+ + "`CART_NUMBER` int unsigned not null,"+ + "`ISCI` char(32) not null,"+ + "`FILENAME` char(64) not null,"+ + "`LATEST_DATE` date not null,"+ + "`TYPE` char(1) not null,"+ + "`ADVERTISER_NAME` char(30),"+ + "`PRODUCT_NAME` char(35),"+ + "`CREATIVE_TITLE` char(30),"+ + "`REGION_NAME` char(80),"+ + "index `CART_NUMBER_IDX` (`CART_NUMBER`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table VERSION add column LAST_ISCI_XREFERENCE datetime default \"1970-01-01 00:00:00\" after LAST_MAINT_DATETIME"; + sql="alter table `VERSION` add column `LAST_ISCI_XREFERENCE` datetime default '1970-01-01 00:00:00' after `LAST_MAINT_DATETIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table SYSTEM add column ISCI_XREFERENCE_PATH char(255) after MAX_POST_LENGTH"; + sql="alter table `SYSTEM` add column `ISCI_XREFERENCE_PATH` char(255) after `MAX_POST_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } if((cur_schema<199)&&(set_schema>cur_schema)) { - sql="create index TYPE_IDX on ISCI_XREFERENCE (TYPE,LATEST_DATE)"; + sql="create index `TYPE_IDX` on `ISCI_XREFERENCE` (`TYPE`,`LATEST_DATE`)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="create index LATEST_DATE_IDX on ISCI_XREFERENCE (LATEST_DATE)"; + sql="create index `LATEST_DATE_IDX` on `ISCI_XREFERENCE` (`LATEST_DATE`)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5131,13 +5437,13 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<201)&&(set_schema>cur_schema)) { - sql="alter table STATIONS add column HTTP_STATION char(64) default \"localhost\" after IPV4_ADDRESS"; + sql="alter table `STATIONS` add column `HTTP_STATION` char(64) default 'localhost' after `IPV4_ADDRESS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column CAE_STATION char(64) \ - default \"localhost\" after HTTP_STATION"; + sql=QString("alter table `STATIONS` add column `CAE_STATION` char(64) ")+ + "default 'localhost' after `HTTP_STATION`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5146,20 +5452,20 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<202)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists RDHOTKEYS (")+ - "ID int unsigned not null auto_increment primary key,"+ - "STATION_NAME char(64),"+ - "MODULE_NAME char(64),"+ - "KEY_ID int,"+ - "KEY_VALUE char(64),"+ - "KEY_LABEL char(64))"+ + sql=QString("create table if not exists `RDHOTKEYS` (")+ + "`ID` int unsigned not null auto_increment primary key,"+ + "`STATION_NAME` char(64),"+ + "`MODULE_NAME` char(64),"+ + "`KEY_ID` int,"+ + "`KEY_VALUE` char(64),"+ + "`KEY_LABEL` char(64))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="select NAME from STATIONS"; + sql="select `NAME` from `STATIONS`"; q=new RDSqlQuery(sql,false); while(q->next()) { if (!InsertRDAirplayHotkeys(q->value(0).toString().toUtf8().constData(), @@ -5175,32 +5481,32 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) if((cur_schema<203)&&(set_schema>cur_schema)) { DropColumn("REPLICATORS","NORMALIZATION_LEVEL"); sql= - "alter table REPLICATORS add column NORMALIZATION_LEVEL int default 0 after ENABLE_METADATA"; + "alter table `REPLICATORS` add column `NORMALIZATION_LEVEL` int default 0 after `ENABLE_METADATA`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table REPL_CART_STATE add column REPOST enum('N','Y') default 'N' after ITEM_DATETIME"; + sql="alter table `REPL_CART_STATE` add column `REPOST` enum('N','Y') default 'N' after `ITEM_DATETIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table REPL_CART_STATE add column POSTED_FILENAME char(255) after CART_NUMBER"; + sql="alter table `REPL_CART_STATE` add column `POSTED_FILENAME` char(255) after `CART_NUMBER`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="drop index REPLICATOR_NAME_IDX on REPL_CART_STATE"; + sql="drop index `REPLICATOR_NAME_IDX` on `REPL_CART_STATE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="create unique index REPLICATOR_NAME_IDX on REPL_CART_STATE (REPLICATOR_NAME,CART_NUMBER,POSTED_FILENAME)"; + sql="create unique index `REPLICATOR_NAME_IDX` on `REPL_CART_STATE` (`REPLICATOR_NAME`,`CART_NUMBER`,`POSTED_FILENAME`)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="delete from REPL_CART_STATE where POSTED_FILENAME is null"; + sql="delete from `REPL_CART_STATE` where `POSTED_FILENAME` is null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5209,26 +5515,26 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<204)&&(set_schema>cur_schema)) { - sql=QString("insert into IMPORT_TEMPLATES set ")+ - "NAME=\"The Traffic Light\","+ - "CART_OFFSET=10,"+ - "CART_LENGTH=6,"+ - "TITLE_OFFSET=25,"+ - "TITLE_LENGTH=34,"+ - "HOURS_OFFSET=0,"+ - "HOURS_LENGTH=2,"+ - "MINUTES_OFFSET=3,"+ - "MINUTES_LENGTH=2,"+ - "SECONDS_OFFSET=6,"+ - "SECONDS_LENGTH=2,"+ - "LEN_HOURS_OFFSET=60,"+ - "LEN_HOURS_LENGTH=2,"+ - "LEN_MINUTES_OFFSET=63,"+ - "LEN_MINUTES_LENGTH=2,"+ - "LEN_SECONDS_OFFSET=66,"+ - "LEN_SECONDS_LENGTH=2,"+ - "DATA_OFFSET=69,"+ - "DATA_LENGTH=32"; + sql=QString("insert into `IMPORT_TEMPLATES` set ")+ + "`NAME`='The Traffic Light',"+ + "`CART_OFFSET`=10,"+ + "`CART_LENGTH`=6,"+ + "`TITLE_OFFSET`=25,"+ + "`TITLE_LENGTH`=34,"+ + "`HOURS_OFFSET`=0,"+ + "`HOURS_LENGTH`=2,"+ + "`MINUTES_OFFSET`=3,"+ + "`MINUTES_LENGTH`=2,"+ + "`SECONDS_OFFSET`=6,"+ + "`SECONDS_LENGTH`=2,"+ + "`LEN_HOURS_OFFSET`=60,"+ + "`LEN_HOURS_LENGTH`=2,"+ + "`LEN_MINUTES_OFFSET`=63,"+ + "`LEN_MINUTES_LENGTH`=2,"+ + "`LEN_SECONDS_OFFSET`=66,"+ + "`LEN_SECONDS_LENGTH`=2,"+ + "`DATA_OFFSET`=69,"+ + "`DATA_LENGTH`=32"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5237,12 +5543,12 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<205)&&(set_schema>cur_schema)) { - sql="alter table STATIONS add column START_JACK enum('N','Y') default 'N' after FILTER_MODE"; + sql="alter table `STATIONS` add column `START_JACK` enum('N','Y') default 'N' after `FILTER_MODE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table STATIONS add column JACK_SERVER_NAME char(64) after START_JACK"; + sql="alter table `STATIONS` add column `JACK_SERVER_NAME` char(64) after `START_JACK`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5251,18 +5557,18 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<206)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists REPORT_GROUPS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "REPORT_NAME char(64) not null,"+ - "GROUP_NAME char(10),"+ - "index IDX_REPORT_NAME (REPORT_NAME))"+ + sql=QString("create table if not exists `REPORT_GROUPS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`REPORT_NAME` char(64) not null,"+ + "`GROUP_NAME` char(10),"+ + "index `IDX_REPORT_NAME` (`REPORT_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table REPORTS add column FILTER_GROUPS enum('N','Y') default 'N' after FILTER_ONAIR_FLAG"; + sql="alter table `REPORTS` add column `FILTER_GROUPS` enum('N','Y') default 'N' after `FILTER_ONAIR_FLAG`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5279,7 +5585,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<208)&&(set_schema>cur_schema)) { - sql="alter table RDAIRPLAY add column HOUR_SELECTOR_ENABLED enum('N','Y') default 'N' after DEFAULT_SERVICE"; + sql="alter table `RDAIRPLAY` add column `HOUR_SELECTOR_ENABLED` enum('N','Y') default 'N' after `DEFAULT_SERVICE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5288,17 +5594,17 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<209)&&(set_schema>cur_schema)) { - sql="alter table STATIONS add column JACK_COMMAND_LINE char(255) after JACK_SERVER_NAME"; + sql="alter table `STATIONS` add column `JACK_COMMAND_LINE` char(255) after `JACK_SERVER_NAME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("create table if not exists JACK_CLIENTS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "DESCRIPTION char(64),"+ - "COMMAND_LINE char(255) not null,"+ - "index IDX_STATION_NAME (STATION_NAME))"+ + sql=QString("create table if not exists `JACK_CLIENTS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`DESCRIPTION` char(64),"+ + "`COMMAND_LINE` char(255) not null,"+ + "index `IDX_STATION_NAME` (`STATION_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -5309,21 +5615,21 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<210)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists CARTSLOTS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "SLOT_NUMBER int unsigned not null,"+ - "MODE int not null default 0,"+ - "DEFAULT_MODE int not null default -1,"+ - "STOP_ACTION int not null default 0,"+ - "DEFAULT_STOP_ACTION int not null default -1,"+ - "CART_NUMBER int default 0,"+ - "DEFAULT_CART_NUMBER int not null default 0,"+ - "SERVICE_NAME char(10),"+ - "CARD int not null default 0,"+ - "INPUT_PORT int not null default 0,"+ - "OUTPUT_PORT int not null default 0,"+ - "index STATION_NAME_IDX(STATION_NAME,SLOT_NUMBER))"+ + sql=QString("create table if not exists `CARTSLOTS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`SLOT_NUMBER` int unsigned not null,"+ + "`MODE` int not null default 0,"+ + "`DEFAULT_MODE` int not null default -1,"+ + "`STOP_ACTION` int not null default 0,"+ + "`DEFAULT_STOP_ACTION` int not null default -1,"+ + "`CART_NUMBER` int default 0,"+ + "`DEFAULT_CART_NUMBER` int not null default 0,"+ + "`SERVICE_NAME` char(10),"+ + "`CARD` int not null default 0,"+ + "`INPUT_PORT` int not null default 0,"+ + "`OUTPUT_PORT` int not null default 0,"+ + "index `STATION_NAME_IDX` (`STATION_NAME`,`SLOT_NUMBER`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -5334,8 +5640,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<211)&&(set_schema>cur_schema)) { - sql=QString("alter table SYSTEM add column TEMP_CART_GROUP char(10) ")+ - "default \"TEMP\" after ISCI_XREFERENCE_PATH"; + sql=QString("alter table `SYSTEM` add column `TEMP_CART_GROUP` char(10) ")+ + "default 'TEMP' after `ISCI_XREFERENCE_PATH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5344,14 +5650,14 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<212)&&(set_schema>cur_schema)) { - sql=QString("alter table CARTSLOTS add column HOOK_MODE int default 0 ")+ - "after DEFAULT_CART_NUMBER"; + sql=QString("alter table `CARTSLOTS` add column `HOOK_MODE` int default 0 ")+ + "after `DEFAULT_CART_NUMBER`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CARTSLOTS add column DEFAULT_HOOK_MODE int ")+ - "default -1 after HOOK_MODE"; + sql=QString("alter table `CARTSLOTS` add column `DEFAULT_HOOK_MODE` int ")+ + "default -1 after `HOOK_MODE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5360,38 +5666,42 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<213)&&(set_schema>cur_schema)) { - sql=QString("alter table STATIONS add column CUE_CARD int default 0 ")+ - "after JACK_COMMAND_LINE"; + sql=QString("alter table `STATIONS` add column `CUE_CARD` int default 0 ")+ + "after `JACK_COMMAND_LINE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STATIONS add column CUE_PORT int default 0 ")+ - "after CUE_CARD"; + sql=QString("alter table `STATIONS` add column `CUE_PORT` int default 0 ")+ + "after `CUE_CARD`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STATIONS add column CARTSLOT_COLUMNS int ")+ - "default 1 after CUE_PORT"; + sql=QString("alter table `STATIONS` add column `CARTSLOT_COLUMNS` int ")+ + "default 1 after `CUE_PORT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STATIONS add column CARTSLOT_ROWS int ")+ - "default 8 after CARTSLOT_COLUMNS"; + sql=QString("alter table `STATIONS` add column `CARTSLOT_ROWS` int ")+ + "default 8 after `CARTSLOT_COLUMNS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("select STATION_NAME,CARD_NUMBER,PORT_NUMBER from DECKS ")+ - "where CHANNEL=0"; + sql=QString("select ")+ + "`STATION_NAME`,"+ // 00 + "`CARD_NUMBER`,"+ // 01 + "`PORT_NUMBER` "+ // 02 + "from `DECKS` where "+ + "`CHANNEL`=0"; q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("update STATIONS set ")+ - QString().sprintf("CUE_CARD=%d,",q->value(1).toInt())+ - QString().sprintf("CUE_PORT=%d ",q->value(2).toInt())+ - "where NAME=\""+RDEscapeString(q->value(0).toString())+"\""; + sql=QString("update `STATIONS` set ")+ + QString().sprintf("`CUE_CARD`=%d,",q->value(1).toInt())+ + QString().sprintf("`CUE_PORT`=%d ",q->value(2).toInt())+ + "where `NAME`='"+RDEscapeString(q->value(0).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5402,8 +5712,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<214)&&(set_schema>cur_schema)) { - sql=QString("alter table SERVICES add column AUTOSPOT_GROUP char(10) ")+ - "after TRACK_GROUP"; + sql=QString("alter table `SERVICES` add column `AUTOSPOT_GROUP` char(10) ")+ + "after `TRACK_GROUP`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5412,8 +5722,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<215)&&(set_schema>cur_schema)) { - sql=QString("alter table GROUPS add column DELETE_EMPTY_CARTS ")+ - "enum('N','Y') default 'N' after CUT_SHELFLIFE"; + sql=QString("alter table `GROUPS` add column `DELETE_EMPTY_CARTS` ")+ + "enum('N','Y') default 'N' after `CUT_SHELFLIFE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5422,12 +5732,12 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<216)&&(set_schema>cur_schema)) { - sql="alter table CUTS add index ISCI_IDX(ISCI)"; + sql="alter table `CUTS` add index `ISCI_IDX` (`ISCI`)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table CUTS add index ISRC_IDX(ISRC)"; + sql="alter table `CUTS` add index `ISRC_IDX` (`ISRC`)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5436,13 +5746,13 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<217)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists LIVEWIRE_GPIO_SLOTS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "MATRIX int not null,"+ - "SLOT int not null,"+ - "SOURCE_NUMBER int,"+ - "index STATION_NAME_IDX(STATION_NAME,MATRIX))"+ + sql=QString("create table if not exists `LIVEWIRE_GPIO_SLOTS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`MATRIX` int not null,"+ + "`SLOT` int not null,"+ + "`SOURCE_NUMBER` int,"+ + "index `STATION_NAME_IDX` (`STATION_NAME`,`MATRIX`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -5453,8 +5763,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<218)&&(set_schema>cur_schema)) { - sql=QString("alter table LIVEWIRE_GPIO_SLOTS ")+ - "add column IP_ADDRESS char(15) after SLOT"; + sql=QString("alter table `LIVEWIRE_GPIO_SLOTS` ")+ + "add column `IP_ADDRESS` char(15) after `SLOT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5466,23 +5776,23 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // // RDAirPlay Channels // - sql=QString("create table if not exists RDAIRPLAY_CHANNELS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "INSTANCE int unsigned not null,"+ - "CARD int not null default 0,"+ - "PORT int not null default 0,"+ - "START_RML char(255),"+ - "STOP_RML char(255),"+ - "START_GPI_MATRIX int not null default -1,"+ - "START_GPI_LINE int not null default -1,"+ - "START_GPO_MATRIX int not null default -1,"+ - "START_GPO_LINE int not null default -1,"+ - "STOP_GPI_MATRIX int not null default -1,"+ - "STOP_GPI_LINE int not null default -1,"+ - "STOP_GPO_MATRIX int not null default -1,"+ - "STOP_GPO_LINE int not null default -1,"+ - "index STATION_NAME_IDX(STATION_NAME,INSTANCE))"+ + sql=QString("create table if not exists `RDAIRPLAY_CHANNELS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`INSTANCE` int unsigned not null,"+ + "`CARD` int not null default 0,"+ + "`PORT` int not null default 0,"+ + "`START_RML` char(255),"+ + "`STOP_RML` char(255),"+ + "`START_GPI_MATRIX` int not null default -1,"+ + "`START_GPI_LINE` int not null default -1,"+ + "`START_GPO_MATRIX` int not null default -1,"+ + "`START_GPO_LINE` int not null default -1,"+ + "`STOP_GPI_MATRIX` int not null default -1,"+ + "`STOP_GPI_LINE` int not null default -1,"+ + "`STOP_GPO_MATRIX` int not null default -1,"+ + "`STOP_GPO_LINE` int not null default -1,"+ + "index `STATION_NAME_IDX` (`STATION_NAME`,`INSTANCE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -5491,18 +5801,18 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) for(unsigned i=0;i<10;i++) { sql=QString(). - sprintf("select STATION,CARD%u,PORT%u,START_RML%u,STOP_RML%u ", + sprintf("select `STATION`,`CARD%u`,`PORT%u`,`START_RML%u`,`STOP_RML%u` ", i,i,i,i)+ - "from RDAIRPLAY"; + "from `RDAIRPLAY`"; q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("insert into RDAIRPLAY_CHANNELS set ")+ - "STATION_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - QString().sprintf("INSTANCE=%u,",i)+ - QString().sprintf("CARD=%d,",q->value(1).toInt())+ - QString().sprintf("PORT=%d,",q->value(2).toInt())+ - "START_RML=\""+RDEscapeString(q->value(3).toString())+"\","+ - "STOP_RML=\""+RDEscapeString(q->value(4).toString())+"\""; + sql=QString("insert into `RDAIRPLAY_CHANNELS` set ")+ + "`STATION_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + QString().sprintf("`INSTANCE`=%u,",i)+ + QString().sprintf("`CARD`=%d,",q->value(1).toInt())+ + QString().sprintf("`PORT`=%d,",q->value(2).toInt())+ + "`START_RML`='"+RDEscapeString(q->value(3).toString())+"',"+ + "`STOP_RML`='"+RDEscapeString(q->value(4).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5513,23 +5823,23 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // // RDPanel Channels // - sql=QString("create table if not exists RDPANEL_CHANNELS (")+ - "ID int unsigned auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "INSTANCE int unsigned not null,"+ - "CARD int not null default 0,"+ - "PORT int not null default 0,"+ - "START_RML char(255),"+ - "STOP_RML char(255),"+ - "START_GPI_MATRIX int not null default -1,"+ - "START_GPI_LINE int not null default -1,"+ - "START_GPO_MATRIX int not null default -1,"+ - "START_GPO_LINE int not null default -1,"+ - "STOP_GPI_MATRIX int not null default -1,"+ - "STOP_GPI_LINE int not null default -1,"+ - "STOP_GPO_MATRIX int not null default -1,"+ - "STOP_GPO_LINE int not null default -1,"+ - "index STATION_NAME_IDX(STATION_NAME,INSTANCE))"+ + sql=QString("create table if not exists `RDPANEL_CHANNELS` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`INSTANCE` int unsigned not null,"+ + "`CARD` int not null default 0,"+ + "`PORT` int not null default 0,"+ + "`START_RML` char(255),"+ + "`STOP_RML` char(255),"+ + "`START_GPI_MATRIX` int not null default -1,"+ + "`START_GPI_LINE` int not null default -1,"+ + "`START_GPO_MATRIX` int not null default -1,"+ + "`START_GPO_LINE` int not null default -1,"+ + "`STOP_GPI_MATRIX` int not null default -1,"+ + "`STOP_GPI_LINE` int not null default -1,"+ + "`STOP_GPO_MATRIX` int not null default -1,"+ + "`STOP_GPO_LINE` int not null default -1,"+ + "index `STATION_NAME_IDX` (`STATION_NAME`,`INSTANCE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -5539,18 +5849,18 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) for(unsigned i=0;i<10;i++) { if((i==2)||(i==3)||(i==6)||(i==7)||(i==8)||(i==9)) { sql=QString(). - sprintf("select STATION,CARD%u,PORT%u,START_RML%u,STOP_RML%u ", + sprintf("select `STATION`,`CARD%u`,`PORT%u`,`START_RML%u`,`STOP_RML%u` ", i,i,i,i)+ - "from RDPANEL"; + "from `RDPANEL`"; q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("insert into RDPANEL_CHANNELS set ")+ - "STATION_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - QString().sprintf("INSTANCE=%u,",i)+ - QString().sprintf("CARD=%d,",q->value(1).toInt())+ - QString().sprintf("PORT=%d,",q->value(2).toInt())+ - "START_RML=\""+RDEscapeString(q->value(3).toString())+"\","+ - "STOP_RML=\""+RDEscapeString(q->value(4).toString())+"\""; + sql=QString("insert into `RDPANEL_CHANNELS` set ")+ + "`STATION_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + QString().sprintf("`INSTANCE`=%u,",i)+ + QString().sprintf("`CARD`=%d,",q->value(1).toInt())+ + QString().sprintf("`PORT`=%d,",q->value(2).toInt())+ + "`START_RML`='"+RDEscapeString(q->value(3).toString())+"',"+ + "`STOP_RML`='"+RDEscapeString(q->value(4).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5587,14 +5897,14 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<220)&&(set_schema>cur_schema)) { - sql=QString("alter table RDAIRPLAY_CHANNELS add column GPIO_TYPE ")+ - "int unsigned default 0 after STOP_RML"; + sql=QString("alter table `RDAIRPLAY_CHANNELS` add column `GPIO_TYPE` ")+ + "int unsigned default 0 after `STOP_RML`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDPANEL_CHANNELS add column GPIO_TYPE ")+ - "int unsigned default 0 after STOP_RML"; + sql=QString("alter table `RDPANEL_CHANNELS` add column `GPIO_TYPE` ")+ + "int unsigned default 0 after `STOP_RML`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5603,7 +5913,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<221)&&(set_schema>cur_schema)) { - sql="alter table RDLIBRARY modify column TRIM_THRESHOLD int default 0"; + sql="alter table `RDLIBRARY` modify column `TRIM_THRESHOLD` int default 0"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5620,27 +5930,27 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<223)&&(set_schema>cur_schema)) { - sql="alter table CART add column CONDUCTOR char(64) after LABEL"; + sql="alter table `CART` add column `CONDUCTOR` char(64) after `LABEL`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table CART add index CONDUCTOR_IDX(CONDUCTOR)"; + sql="alter table `CART` add index `CONDUCTOR_IDX` (`CONDUCTOR`)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table CART add column SONG_ID char(32) after USER_DEFINED"; + sql="alter table `CART` add column `SONG_ID` char(32) after `USER_DEFINED`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table CART add index SONG_ID_IDX(SONG_ID)"; + sql="alter table `CART` add index `SONG_ID_IDX` (`SONG_ID`)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table CART add column BPM int unsigned default 0 after SONG_ID"; + sql="alter table `CART` add column `BPM` int unsigned default 0 after `SONG_ID`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5649,8 +5959,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<224)&&(set_schema>cur_schema)) { - sql=QString("alter table DROPBOXES add column SET_USER_DEFINED char(255) ")+ - "after CREATE_ENDDATE_OFFSET"; + sql=QString("alter table `DROPBOXES` add column `SET_USER_DEFINED` char(255) ")+ + "after `CREATE_ENDDATE_OFFSET`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5659,26 +5969,26 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<225)&&(set_schema>cur_schema)) { - sql=QString("alter table RDAIRPLAY add column TITLE_TEMPLATE char(64) ")+ - "default '%t' after HOUR_SELECTOR_ENABLED"; + sql=QString("alter table `RDAIRPLAY` add column `TITLE_TEMPLATE` char(64) ")+ + "default '%t' after `HOUR_SELECTOR_ENABLED`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column ARTIST_TEMPLATE char(64) ")+ - "default '%a' after TITLE_TEMPLATE"; + sql=QString("alter table `RDAIRPLAY` add column `ARTIST_TEMPLATE` char(64) ")+ + "default '%a' after `TITLE_TEMPLATE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column OUTCUE_TEMPLATE char(64) ")+ - "default '%o' after ARTIST_TEMPLATE"; + sql=QString("alter table `RDAIRPLAY` add column `OUTCUE_TEMPLATE` char(64) ")+ + "default '%o' after `ARTIST_TEMPLATE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY add column DESCRIPTION_TEMPLATE char(64) ")+ - "default '%i' after HOUR_SELECTOR_ENABLED"; + sql=QString("alter table `RDAIRPLAY` add column `DESCRIPTION_TEMPLATE` char(64) ")+ + "default '%i' after `HOUR_SELECTOR_ENABLED`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5687,8 +5997,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<226)&&(set_schema>cur_schema)) { - sql=QString("alter table RDLOGEDIT add column ")+ - "ENABLE_SECOND_START enum('N','Y') default 'Y' after BITRATE"; + sql=QString("alter table `RDLOGEDIT` add column ")+ + "`ENABLE_SECOND_START` enum('N','Y') default 'Y' after `BITRATE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5697,7 +6007,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<227)&&(set_schema>cur_schema)) { - sql="alter table LOGS add index TYPE_IDX(TYPE,LOG_EXISTS)"; + sql="alter table `LOGS` add index `TYPE_IDX` (`TYPE`,`LOG_EXISTS`)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5706,14 +6016,14 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<228)&&(set_schema>cur_schema)) { - sql=QString("alter table RDLIBRARY add column ")+ - "LIMIT_SEARCH int default 1 after SRC_CONVERTER"; + sql=QString("alter table `RDLIBRARY` add column ")+ + "`LIMIT_SEARCH` int default 1 after `SRC_CONVERTER`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDLIBRARY add column ")+ - "SEARCH_LIMITED enum('N','Y') default 'Y' after LIMIT_SEARCH"; + sql=QString("alter table `RDLIBRARY` add column ")+ + "`SEARCH_LIMITED` enum('N','Y') default 'Y' after `LIMIT_SEARCH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5722,8 +6032,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<229)&&(set_schema>cur_schema)) { - sql=QString("alter table SERVICES add column ")+ - "DESCRIPTION_TEMPLATE char(255) after NAME_TEMPLATE"; + sql=QString("alter table `SERVICES` add column ")+ + "`DESCRIPTION_TEMPLATE` char(255) after `NAME_TEMPLATE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5731,9 +6041,9 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) sql=QString("select NAME from SERVICES"); q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("update SERVICES set DESCRIPTION_TEMPLATE=\"")+ - RDEscapeString(q->value(0).toString())+" log for %m/%d/%Y\" "+ - "where NAME=\""+RDEscapeString(q->value(0).toString())+"\""; + sql=QString("update `SERVICES` set `DESCRIPTION_TEMPLATE`='")+ + RDEscapeString(q->value(0).toString())+" log for %m/%d/%Y' "+ + "where `NAME`='"+RDEscapeString(q->value(0).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5744,32 +6054,32 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<230)&&(set_schema>cur_schema)) { - sql="select NAME from LOGS"; + sql="select `NAME` from `LOGS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql="alter table `"+tablename+"_LOG`"+ - " add column EVENT_LENGTH int default -1 after ORIGIN_DATETIME"; + " add column `EVENT_LENGTH` int default -1 after `ORIGIN_DATETIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } delete q; - sql="select NAME from EVENTS"; + sql="select `NAME` from `EVENTS`"; q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql="alter table `"+tablename+"_PRE`"+ - " add column EVENT_LENGTH int default -1 after ORIGIN_DATETIME"; + " add column `EVENT_LENGTH` int default -1 after `ORIGIN_DATETIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql="alter table `"+tablename+"_POST`"+ - " add column EVENT_LENGTH int default -1 after ORIGIN_DATETIME"; + " add column `EVENT_LENGTH` int default -1 after `ORIGIN_DATETIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5780,8 +6090,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<231)&&(set_schema>cur_schema)) { - sql=QString("alter table CART add column ")+ - "USE_EVENT_LENGTH enum('N','Y') default 'N' after METADATA_DATETIME"; + sql=QString("alter table `CART` add column ")+ + "`USE_EVENT_LENGTH` enum('N','Y') default 'N' after `METADATA_DATETIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5790,14 +6100,14 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<232)&&(set_schema>cur_schema)) { - sql=QString("alter table STATIONS add column ")+ - "ENABLE_DRAGDROP enum('N','Y') default 'Y' after CARTSLOT_ROWS"; + sql=QString("alter table `STATIONS` add column ")+ + "`ENABLE_DRAGDROP` enum('N','Y') default 'Y' after `CARTSLOT_ROWS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STATIONS add column ")+ - "ENFORCE_PANEL_SETUP enum('N','Y') default 'N' after ENABLE_DRAGDROP"; + sql=QString("alter table `STATIONS` add column ")+ + "`ENFORCE_PANEL_SETUP` enum('N','Y') default 'N' after `ENABLE_DRAGDROP`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5806,34 +6116,38 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<233)&&(set_schema>cur_schema)) { - sql=QString("alter table RDAIRPLAY add column ")+ - "LOG_MODE_STYLE int default 0 after START_MODE"; + sql=QString("alter table `RDAIRPLAY` add column ")+ + "`LOG_MODE_STYLE` int default 0 after `START_MODE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("create table if not exists LOG_MODES (")+ - "ID int unsigned auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "MACHINE int unsigned not null,"+ - "START_MODE int not null default 0,"+ - "OP_MODE int not null default 2,"+ - "index STATION_NAME_IDX(STATION_NAME,MACHINE))"+ + sql=QString("create table if not exists `LOG_MODES` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`MACHINE` int unsigned not null,"+ + "`START_MODE` int not null default 0,"+ + "`OP_MODE` int not null default 2,"+ + "index `STATION_NAME_IDX` (`STATION_NAME`,`MACHINE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("select STATION,START_MODE,OP_MODE from RDAIRPLAY"); + sql=QString("select ")+ + "`STATION`,"+ // 00 + "`START_MODE`,"+ // 01 + "`OP_MODE` "+ // 02 + "from `RDAIRPLAY`"; q=new RDSqlQuery(sql,false); while(q->next()) { for(unsigned i=0;i<3;i++) { - sql=QString("insert into LOG_MODES set ")+ - "STATION_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - QString().sprintf("MACHINE=%u,",i)+ - QString().sprintf("START_MODE=%d,",q->value(1).toInt())+ - QString().sprintf("OP_MODE=%d",q->value(2).toInt()); + sql=QString("insert into `LOG_MODES` set ")+ + "`STATION_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + QString().sprintf("`MACHINE`=%u,",i)+ + QString().sprintf("`START_MODE`=%d,",q->value(1).toInt())+ + QString().sprintf("`OP_MODE`=%d",q->value(2).toInt()); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5845,14 +6159,14 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<234)&&(set_schema>cur_schema)) { - sql=QString("alter table STATIONS add column ")+ - "CUE_START_CART int unsigned after CUE_PORT"; + sql=QString("alter table `STATIONS` add column ")+ + "`CUE_START_CART` int unsigned after `CUE_PORT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STATIONS add column ")+ - "CUE_STOP_CART int unsigned after CUE_START_CART"; + sql=QString("alter table `STATIONS` add column ")+ + "`CUE_STOP_CART` int unsigned after `CUE_START_CART`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5867,25 +6181,25 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<236)&&(set_schema>cur_schema)) { - sql=QString("select NAME from SERVICES"); + sql=QString("select `NAME` from `SERVICES`"); q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table `")+tablename+"_SRT`"+ - " add column CONDUCTOR char(64) after LABEL"; + " add column `CONDUCTOR` char(64) after `LABEL`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_SRT`"+ - " add column USER_DEFINED char(255) after COMPOSER"; + " add column `USER_DEFINED` char(255) after `COMPOSER`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_SRT`"+ - " add column SONG_ID char(32) after USER_DEFINED"; + " add column `SONG_ID` char(32) after `USER_DEFINED`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5896,14 +6210,14 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<237)&&(set_schema>cur_schema)) { - sql=QString("alter table REPORTS add column ")+ - "START_TIME time after FILTER_GROUPS"; + sql=QString("alter table `REPORTS` add column ")+ + "`START_TIME` time after `FILTER_GROUPS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPORTS add column ")+ - "END_TIME time after START_TIME"; + sql=QString("alter table `REPORTS` add column ")+ + "`END_TIME` time after `START_TIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5912,38 +6226,38 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<238)&&(set_schema>cur_schema)) { - sql=QString("alter table CART add column ")+ - "PENDING_STATION char(64) after USE_EVENT_LENGTH"; + sql=QString("alter table `CART` add column ")+ + "`PENDING_STATION` char(64) after `USE_EVENT_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CART add column ")+ - "PENDING_PID int after PENDING_STATION"; + sql=QString("alter table `CART` add column ")+ + "`PENDING_PID` int after `PENDING_STATION`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CART add column ")+ - "PENDING_DATETIME datetime after PENDING_PID"; + sql=QString("alter table `CART` add column ")+ + "`PENDING_DATETIME` datetime after `PENDING_PID`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CART add index ")+ - "PENDING_STATION_IDX(PENDING_STATION)"; + sql=QString("alter table `CART` add index ")+ + "`PENDING_STATION_IDX` (`PENDING_STATION`)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CART add index ")+ - "PENDING_PID_IDX(PENDING_STATION,PENDING_PID)"; + sql=QString("alter table `CART` add index ")+ + "`PENDING_PID_IDX` (`PENDING_STATION`,`PENDING_PID`)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CART add index ")+ - "PENDING_DATETIME_IDX(PENDING_DATETIME)"; + sql=QString("alter table `CART` add index ")+ + "`PENDING_DATETIME_IDX` (`PENDING_DATETIME`)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5952,12 +6266,12 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<239)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists DROPBOX_SCHED_CODES(")+ - "ID int auto_increment not null primary key,"+ - "DROPBOX_ID int not null,"+ - "SCHED_CODE char(11) not null," - "index DROPBOX_ID_IDX(DROPBOX_ID),"+ - "index SCHED_CODE_IDX(SCHED_CODE))"+ + sql=QString("create table if not exists `DROPBOX_SCHED_CODES` (")+ + "`ID` int auto_increment not null primary key,"+ + "`DROPBOX_ID` int not null,"+ + "`SCHED_CODE` char(11) not null," + "index `DROPBOX_ID_IDX` (`DROPBOX_ID`),"+ + "index `SCHED_CODE_IDX` (`SCHED_CODE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -5968,15 +6282,15 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<240)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists GPIO_EVENTS(")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "MATRIX int not null,"+ - "NUMBER int not null,"+ - "TYPE int not null,"+ - "EDGE int not null,"+ - "EVENT_DATETIME datetime not null,"+ - "index STATION_NAME_IDX(STATION_NAME,MATRIX,TYPE,EVENT_DATETIME,EDGE))"+ + sql=QString("create table if not exists `GPIO_EVENTS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`MATRIX` int not null,"+ + "`NUMBER` int not null,"+ + "`TYPE` int not null,"+ + "`EDGE` int not null,"+ + "`EVENT_DATETIME` datetime not null,"+ + "index `STATION_NAME_IDX` (`STATION_NAME`,`MATRIX`,`TYPE`,`EVENT_DATETIME`,`EDGE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -5987,8 +6301,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<241)&&(set_schema>cur_schema)) { - sql=QString("alter table EVENTS add column ")+ - "HAVE_CODE2 varchar(10) after HAVE_CODE"; + sql=QString("alter table `EVENTS` add column ")+ + "`HAVE_CODE2` varchar(10) after `HAVE_CODE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -5997,14 +6311,14 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<242)&&(set_schema>cur_schema)) { - sql=QString("alter table REPORTS add column ")+ - "POST_EXPORT_CMD text after EXPORT_PATH"; + sql=QString("alter table `REPORTS` add column ")+ + "`POST_EXPORT_CMD` text after `EXPORT_PATH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPORTS add column ")+ - "WIN_POST_EXPORT_CMD text after WIN_EXPORT_PATH"; + sql=QString("alter table `REPORTS` add column ")+ + "`WIN_POST_EXPORT_CMD` text after `WIN_EXPORT_PATH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6013,8 +6327,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<243)&&(set_schema>cur_schema)) { - sql=QString("alter table STATIONS add column ")+ - "HAVE_MP4_DECODE enum('N','Y') default 'N' after HAVE_MPG321"; + sql=QString("alter table `STATIONS` add column ")+ + "`HAVE_MP4_DECODE` enum('N','Y') default 'N' after `HAVE_MPG321`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6023,8 +6337,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<244)&&(set_schema>cur_schema)) { - sql=QString("alter table JACK_CLIENTS modify column ")+ - "COMMAND_LINE text not null"; + sql=QString("alter table `JACK_CLIENTS` modify column ")+ + "`COMMAND_LINE` text not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6033,8 +6347,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<245)&&(set_schema>cur_schema)) { - sql=QString("alter table RDLIBRARY add column ")+ - "READ_ISRC enum('N','Y') default 'Y' after CDDB_SERVER"; + sql=QString("alter table `RDLIBRARY` add column ")+ + "`READ_ISRC` enum('N','Y') default 'Y' after `CDDB_SERVER`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6049,23 +6363,23 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<254)&&(set_schema>cur_schema)) { - sql=QString("alter table CART add column ")+ - "USE_WEIGHTING enum('N','Y') default 'Y' after ENFORCE_LENGTH"; + sql=QString("alter table `CART` add column ")+ + "`USE_WEIGHTING` enum('N','Y') default 'Y' after `ENFORCE_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CUTS add column PLAY_ORDER int after WEIGHT"); + sql=QString("alter table `CUTS` add column `PLAY_ORDER` int after `WEIGHT`"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("select CUT_NAME from CUTS order by CUT_NAME"); + sql=QString("select `CUT_NAME` from `CUTS` order by `CUT_NAME`"); q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("update CUTS set ")+ - "PLAY_ORDER="+q->value(0).toString().right(3)+" "+ - "where CUT_NAME=\""+q->value(0).toString()+"\""; + sql=QString("update `CUTS` set ")+ + "`PLAY_ORDER`="+q->value(0).toString().right(3)+" "+ + "where `CUT_NAME`='"+q->value(0).toString()+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6076,19 +6390,19 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<255)&&(set_schema>cur_schema)) { - sql=QString("select NAME from SERVICES"); + sql=QString("select `NAME` from `SERVICES`"); q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table `")+tablename+"_SRT`"+ - " add column DESCRIPTION char(64) after USAGE_CODE"; + " add column `DESCRIPTION` char(64) after `USAGE_CODE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("alter table `")+tablename+"_SRT`"+ - " add column OUTCUE char(64) after DESCRIPTION"; + " add column `OUTCUE` char(64) after `DESCRIPTION`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6099,40 +6413,40 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<256)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists CUT_EVENTS(")+ - "ID int auto_increment not null primary key,"+ - "CUT_NAME char(12) not null,"+ - "NUMBER int not null,"+ - "POINT int not null,"+ - "index CUT_NAME_IDX(CUT_NAME))"+ + sql=QString("create table if not exists `CUT_EVENTS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`CUT_NAME` char(12) not null,"+ + "`NUMBER` int not null,"+ + "`POINT` int not null,"+ + "index `CUT_NAME_IDX` (`CUT_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("create table if not exists DECK_EVENTS(")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "CHANNEL int unsigned not null,"+ - "NUMBER int not null,"+ - "CART_NUMBER int unsigned not null default 0,"+ - "index STATION_NAME_IDX(STATION_NAME,CHANNEL))"+ + sql=QString("create table if not exists `DECK_EVENTS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`CHANNEL` int unsigned not null,"+ + "`NUMBER` int not null,"+ + "`CART_NUMBER` int unsigned not null default 0,"+ + "index `STATION_NAME_IDX` (`STATION_NAME`,`CHANNEL`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("select NAME from STATIONS"); + sql=QString("select `NAME` from `STATIONS`"); q=new RDSqlQuery(sql,false); while(q->next()) { for(unsigned i=0;ivalue(0).toString())+"\","+ - QString().sprintf("CHANNEL=%u,",j+129)+ - QString().sprintf("NUMBER=%u",i+1); + sql=QString("insert into `DECK_EVENTS` set ")+ + "`STATION_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + QString().sprintf("`CHANNEL`=%u,",j+129)+ + QString().sprintf("`NUMBER`=%u",i+1); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6145,17 +6459,17 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<257)&&(set_schema>cur_schema)) { - sql=QString("alter table LOGS modify column LINK_DATETIME datetime"); + sql=QString("alter table `LOGS` modify column `LINK_DATETIME` datetime"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOGS modify column START_DATE date"); + sql=QString("alter table `LOGS` modify column `START_DATE` date"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOGS modify column END_DATE date"); + sql=QString("alter table `LOGS` modify column `END_DATE` date"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6164,14 +6478,14 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<258)&&(set_schema>cur_schema)) { - sql=QString("select NAME from LOGS"); + sql=QString("select `NAME` from `LOGS`"); q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("alter table ")+ "`"+tablename+"_LOG` "+ - "modify column CART_NUMBER int unsigned not null default 0"; + "modify column `CART_NUMBER` int unsigned not null default 0"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6182,36 +6496,36 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<259)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists SERVICE_CLOCKS(")+ - "ID int auto_increment not null primary key,"+ - "SERVICE_NAME char(10) not null,"+ - "HOUR int not null,"+ - "CLOCK_NAME char(64) default null,"+ - "index SERVICE_NAME_IDX(SERVICE_NAME,HOUR),"+ - "index CLOCK_NAME_IDX(CLOCK_NAME))"+ + sql=QString("create table if not exists `SERVICE_CLOCKS`(")+ + "`ID` int auto_increment not null primary key,"+ + "`SERVICE_NAME` char(10) not null,"+ + "`HOUR` int not null,"+ + "`CLOCK_NAME` char(64) default null,"+ + "index `SERVICE_NAME_IDX` (`SERVICE_NAME`,`HOUR`),"+ + "index `CLOCK_NAME_IDX` (`CLOCK_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("select NAME,"); + sql=QString("select `NAME`,"); for(int i=0;i<168;i++) { - sql+=QString().sprintf("CLOCK%i,",i); + sql+=QString().sprintf("`CLOCK%i`,",i); } sql=sql.left(sql.length()-1); - sql+=" from SERVICES"; + sql+=" from `SERVICES`"; q=new RDSqlQuery(sql,false); while(q->next()) { for(int i=0;i<168;i++) { - sql=QString("insert into SERVICE_CLOCKS set ")+ - "SERVICE_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - QString().sprintf("HOUR=%d,",i); + sql=QString("insert into `SERVICE_CLOCKS` set ")+ + "`SERVICE_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + QString().sprintf("`HOUR`=%d,",i); if(q->value(i+1).isNull()) { - sql+="CLOCK_NAME=null"; + sql+="`CLOCK_NAME`=null"; } else { - sql+="CLOCK_NAME=\""+RDEscapeString(q->value(i+1).toString())+"\""; + sql+="`CLOCK_NAME`='"+RDEscapeString(q->value(i+1).toString())+"'"; } if(!RDSqlQuery::apply(sql,err_msg)) { return false; @@ -6228,20 +6542,20 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<260)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists WEBAPI_AUTHS(")+ - "TICKET char(41) not null primary key,"+ - "LOGIN_NAME char(255) not null,"+ - "IPV4_ADDRESS char(16) not null,"+ - "EXPIRATION_DATETIME datetime not null,"+ - "index TICKET_IDX(TICKET,IPV4_ADDRESS,EXPIRATION_DATETIME))"+ + sql=QString("create table if not exists `WEBAPI_AUTHS` (")+ + "`TICKET` char(41) not null primary key,"+ + "`LOGIN_NAME` char(255) not null,"+ + "`IPV4_ADDRESS` char(16) not null,"+ + "`EXPIRATION_DATETIME` datetime not null,"+ + "index `TICKET_IDX` (`TICKET`,`IPV4_ADDRESS`,`EXPIRATION_DATETIME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table USERS add column ")+ - "WEBAPI_AUTH_TIMEOUT int not null default 3600 after PASSWORD"; + sql=QString("alter table `USERS` add column ")+ + "`WEBAPI_AUTH_TIMEOUT` int not null default 3600 after `PASSWORD`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6250,13 +6564,13 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<261)&&(set_schema>cur_schema)) { - sql=QString("alter table CUTS add column ")+ - "SHA1_HASH char(40) after LENGTH"; + sql=QString("alter table `CUTS` add column ")+ + "`SHA1_HASH` char(40) after `LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="create index SHA1_HASH_IDX on CUTS(SHA1_HASH)"; + sql="create index `SHA1_HASH_IDX` on `CUTS` (`SHA1_HASH`)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6265,19 +6579,19 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<262)&&(set_schema>cur_schema)) { - sql=QString("alter table USERS add column ")+ - "LOCAL_AUTH enum('N','Y') default 'Y' after ENABLE_WEB"; + sql=QString("alter table `USERS` add column ")+ + "`LOCAL_AUTH` enum('N','Y') default 'Y' after `ENABLE_WEB`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table USERS add column ")+ - "PAM_SERVICE char(32) default \"rivendell\" after LOCAL_AUTH"; + sql=QString("alter table `USERS` add column ")+ + "`PAM_SERVICE` char(32) default 'rivendell' after `LOCAL_AUTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("create index IPV4_ADDRESS_IDX on STATIONS (IPV4_ADDRESS)"); + sql=QString("create index `IPV4_ADDRESS_IDX` on `STATIONS` (`IPV4_ADDRESS`)"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6287,18 +6601,18 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) if((cur_schema<263)&&(set_schema>cur_schema)) { // Add missing LOG_MODES records - sql=QString("select NAME from STATIONS"); + sql=QString("select `NAME` from `STATIONS`"); q=new RDSqlQuery(sql,false); while(q->next()) { for(int i=0;i<3;i++) { - sql=QString("select ID from LOG_MODES where ")+ - "(STATION_NAME=\""+RDEscapeString(q->value(0).toString())+"\")&&"+ - QString().sprintf("(MACHINE=%d)",i); + sql=QString("select `ID` from `LOG_MODES` where ")+ + "(`STATION_NAME`='"+RDEscapeString(q->value(0).toString())+"')&&"+ + QString().sprintf("(`MACHINE`=%d)",i); q1=new RDSqlQuery(sql,false); if(!q1->first()) { - sql=QString("insert into LOG_MODES set ")+ - "STATION_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - QString().sprintf("MACHINE=%d",i); + sql=QString("insert into `LOG_MODES` set ")+ + "`STATION_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + QString().sprintf("`MACHINE`=%d",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6312,9 +6626,9 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<264)&&(set_schema>cur_schema)) { - sql=QString("alter table SYSTEM add column ")+ - "FIX_DUP_CART_TITLES enum('N','Y') not null default 'Y' after "+ - "DUP_CART_TITLES"; + sql=QString("alter table `SYSTEM` add column ")+ + "`FIX_DUP_CART_TITLES` enum('N','Y') not null default 'Y' after "+ + "`DUP_CART_TITLES`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6323,9 +6637,9 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<265)&&(set_schema>cur_schema)) { - sql=QString("alter table SYSTEM add column ")+ - "SHOW_USER_LIST enum('N','Y') not null default 'Y' "+ - "after TEMP_CART_GROUP"; + sql=QString("alter table `SYSTEM` add column ")+ + "`SHOW_USER_LIST` enum('N','Y') not null default 'Y' "+ + "after `TEMP_CART_GROUP`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6334,30 +6648,30 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<266)&&(set_schema>cur_schema)) { - sql=QString("select NAME from LOGS"); + sql=QString("select `NAME` from `LOGS`"); q=new RDSqlQuery(sql,false); while(q->next()) { tablename=q->value(0).toString(); tablename.replace(" ","_"); sql=QString("select `")+tablename+"_LOG`"+ - ".ID from "+ - "`"+tablename+"_LOG` left join CART "+ + ".`ID` from "+ + "`"+tablename+"_LOG` left join `CART` "+ "on `"+tablename+"_LOG`"+ - ".CART_NUMBER=CART.NUMBER where "+ - "CART.OWNER is not null"; + ".`CART_NUMBER`=`CART`.`NUMBER` where "+ + "`CART`.`OWNER` is not null"; q1=new RDSqlQuery(sql,false); int completed=q1->size(); delete q1; - sql=QString("select ID from `")+tablename+"_LOG` where TYPE=6"; + sql=QString("select `ID` from `")+tablename+"_LOG` where `TYPE`=6"; q1=new RDSqlQuery(sql,false); int scheduled=q1->size()+completed; delete q1; - sql=QString("update LOGS set ")+ - QString().sprintf("SCHEDULED_TRACKS=%d,",scheduled)+ - QString().sprintf("COMPLETED_TRACKS=%u ",completed)+ - "where NAME=\""+RDEscapeString(q->value(0).toString())+"\""; + sql=QString("update `LOGS` set ")+ + QString().sprintf("`SCHEDULED_TRACKS`=%d,",scheduled)+ + QString().sprintf("`COMPLETED_TRACKS`=%u ",completed)+ + "where `NAME`='"+RDEscapeString(q->value(0).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6368,14 +6682,14 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<267)&&(set_schema>cur_schema)) { - sql=QString("alter table CUTS add column ORIGIN_LOGIN_NAME char(255) ")+ - "after ORIGIN_NAME"; + sql=QString("alter table `CUTS` add column `ORIGIN_LOGIN_NAME` char(255) ")+ + "after `ORIGIN_NAME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CUTS add column SOURCE_HOSTNAME char(255) ")+ - "after ORIGIN_LOGIN_NAME"; + sql=QString("alter table `CUTS` add column `SOURCE_HOSTNAME` char(255) ")+ + "after `ORIGIN_LOGIN_NAME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6384,8 +6698,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<268)&&(set_schema>cur_schema)) { - sql=QString("alter table DROPBOXES add column ")+ - "FORCE_TO_MONO enum('N','Y') default 'N' after TO_CART"; + sql=QString("alter table `DROPBOXES` add column ")+ + "`FORCE_TO_MONO` enum('N','Y') default 'N' after `TO_CART`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6394,8 +6708,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<269)&&(set_schema>cur_schema)) { - sql=QString("alter table GROUPS add column ")+ - "DEFAULT_CUT_LIFE int default -1 after DEFAULT_HIGH_CART"; + sql=QString("alter table `GROUPS` add column ")+ + "`DEFAULT_CUT_LIFE` int default -1 after `DEFAULT_HIGH_CART`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6404,18 +6718,18 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<270)&&(set_schema>cur_schema)) { - sql=QString("alter table STATIONS add column ")+ - "SHORT_NAME char(64) after NAME"; + sql=QString("alter table `STATIONS` add column ")+ + "`SHORT_NAME` char(64) after `NAME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("select NAME from STATIONS"); + sql=QString("select `NAME` from `STATIONS`"); q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("update STATIONS set ")+ - "SHORT_NAME=\""+RDEscapeString(q->value(0).toString())+"\" where "+ - "NAME=\""+RDEscapeString(q->value(0).toString())+"\""; + sql=QString("update `STATIONS` set ")+ + "`SHORT_NAME`='"+RDEscapeString(q->value(0).toString())+"' where "+ + "`NAME`='"+RDEscapeString(q->value(0).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6426,9 +6740,9 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<271)&&(set_schema>cur_schema)) { - sql=QString("alter table DROPBOXES ")+ - "add column SEGUE_LEVEL int(11) default 1 after FORCE_TO_MONO, "+ - "add column SEGUE_LENGTH int(11) default 0 after SEGUE_LEVEL"; + sql=QString("alter table `DROPBOXES` ")+ + "add column `SEGUE_LEVEL` int(11) default 1 after `FORCE_TO_MONO`, "+ + "add column `SEGUE_LENGTH` int(11) default 0 after `SEGUE_LEVEL`"; q=new RDSqlQuery(sql); delete q; @@ -6436,26 +6750,26 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<272)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists USER_SERVICE_PERMS (")+ - "ID int auto_increment not null primary key,"+ - "USER_NAME char(255) not null,"+ - "SERVICE_NAME char(10) not null,"+ - "index USER_NAME_IDX(USER_NAME))"+ + sql=QString("create table if not exists `USER_SERVICE_PERMS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`USER_NAME` char(255) not null,"+ + "`SERVICE_NAME` char(10) not null,"+ + "index `USER_NAME_IDX` (`USER_NAME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("select LOGIN_NAME from USERS"); + sql=QString("select `LOGIN_NAME` from `USERS`"); q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("select NAME from SERVICES"); + sql=QString("select `NAME` from `SERVICES`"); q1=new RDSqlQuery(sql,false); while(q1->next()) { - sql=QString("insert into USER_SERVICE_PERMS set ")+ - "USER_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - "SERVICE_NAME=\""+RDEscapeString(q1->value(0).toString())+"\""; + sql=QString("insert into `USER_SERVICE_PERMS` set ")+ + "`USER_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + "`SERVICE_NAME`='"+RDEscapeString(q1->value(0).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6468,26 +6782,26 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<273)&&(set_schema>cur_schema)) { - sql=QString("alter table LOGS ")+ - "add column LOCK_USER_NAME char(255) after NEXT_ID"; + sql=QString("alter table `LOGS` ")+ + "add column `LOCK_USER_NAME` char(255) after `NEXT_ID`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOGS ")+ - "add column LOCK_STATION_NAME char(64) after LOCK_USER_NAME"; + sql=QString("alter table `LOGS` ")+ + "add column `LOCK_STATION_NAME` char(64) after `LOCK_USER_NAME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOGS ")+ - "add column LOCK_IPV4_ADDRESS char(16) after LOCK_STATION_NAME"; + sql=QString("alter table `LOGS` ")+ + "add column `LOCK_IPV4_ADDRESS` char(16) after `LOCK_STATION_NAME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOGS ")+ - "add column LOCK_DATETIME datetime after LOCK_IPV4_ADDRESS"; + sql=QString("alter table `LOGS` ")+ + "add column `LOCK_DATETIME` datetime after `LOCK_IPV4_ADDRESS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6496,13 +6810,13 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<274)&&(set_schema>cur_schema)) { - sql=QString("alter table LOGS ")+ - "add column LOCK_GUID char(82) after LOCK_DATETIME"; + sql=QString("alter table `LOGS` ")+ + "add column `LOCK_GUID` char(82) after `LOCK_DATETIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOGS add index LOCK_GUID_IDX(LOCK_GUID)"); + sql=QString("alter table `LOGS` add index `LOCK_GUID_IDX` (`LOCK_GUID`)"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6511,9 +6825,9 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<275)&&(set_schema>cur_schema)) { - sql=QString("alter table SERVICES ")+ - "add column LOG_SHELFLIFE_ORIGIN int default 0 "+ - "after DEFAULT_LOG_SHELFLIFE"; + sql=QString("alter table `SERVICES` ")+ + "add column `LOG_SHELFLIFE_ORIGIN` int default 0 "+ + "after `DEFAULT_LOG_SHELFLIFE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6522,9 +6836,9 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<276)&&(set_schema>cur_schema)) { - sql=QString("alter table SYSTEM ")+ - "add column NOTIFICATION_ADDRESS char(15) default \""+ - RD_NOTIFICATION_ADDRESS+"\" after SHOW_USER_LIST"; + sql=QString("alter table `SYSTEM` ")+ + "add column `NOTIFICATION_ADDRESS` char(15) default '"+ + RD_NOTIFICATION_ADDRESS+"' after `SHOW_USER_LIST`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6533,9 +6847,9 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<277)&&(set_schema>cur_schema)) { - sql=QString("alter table USERS ")+ - "add column WEBGET_LOGIN_PRIV enum('N','Y') not null default 'N' "+ - "after EDIT_AUDIO_PRIV"; + sql=QString("alter table `USERS` ")+ + "add column `WEBGET_LOGIN_PRIV` enum('N','Y') not null default 'N' "+ + "after `EDIT_AUDIO_PRIV`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6544,24 +6858,24 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<278)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists LOG_MACHINES (")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "MACHINE int not null,"+ - "START_MODE int not null default 0,"+ - "AUTO_RESTART enum('N','Y') not null default 'N',"+ - "LOG_NAME char(64),"+ - "CURRENT_LOG char(64),"+ - "RUNNING enum('N','Y') not null default 'N',"+ - "LOG_ID int not null default -1,"+ - "LOG_LINE int not null default -1,"+ - "NOW_CART int unsigned not null default 0,"+ - "NEXT_CART int unsigned not null default 0,"+ - "UDP_ADDR char(255),"+ - "UDP_PORT int unsigned,"+ - "UDP_STRING char(255),"+ - "LOG_RML char(255),"+ - "index STATION_NAME_IDX(STATION_NAME,MACHINE))"+ + sql=QString("create table if not exists `LOG_MACHINES` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`MACHINE` int not null,"+ + "`START_MODE` int not null default 0,"+ + "`AUTO_RESTART` enum('N','Y') not null default 'N',"+ + "`LOG_NAME` char(64),"+ + "`CURRENT_LOG` char(64),"+ + "`RUNNING` enum('N','Y') not null default 'N',"+ + "`LOG_ID` int not null default -1,"+ + "`LOG_LINE` int not null default -1,"+ + "`NOW_CART` int unsigned not null default 0,"+ + "`NEXT_CART` int unsigned not null default 0,"+ + "`UDP_ADDR` char(255),"+ + "`UDP_PORT` int unsigned,"+ + "`UDP_STRING` char(255),"+ + "`LOG_RML` char(255),"+ + "index `STATION_NAME_IDX` (`STATION_NAME`,`MACHINE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -6570,39 +6884,39 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) for(int i=0;i<3;i++) { sql=QString("select ")+ - "STATION,"+ // 00 - QString().sprintf("LOG%d_START_MODE,",i)+ // 01 - QString().sprintf("LOG%d_AUTO_RESTART,",i)+ // 02 - QString().sprintf("LOG%d_LOG_NAME,",i)+ // 03 - QString().sprintf("LOG%d_CURRENT_LOG,",i)+ // 04 - QString().sprintf("LOG%d_RUNNING,",i)+ // 05 - QString().sprintf("LOG%d_LOG_ID,",i)+ // 06 - QString().sprintf("LOG%d_LOG_LINE,",i)+ // 07 - QString().sprintf("LOG%d_NOW_CART,",i)+ // 08 - QString().sprintf("LOG%d_NEXT_CART,",i)+ // 09 - QString().sprintf("UDP_ADDR%d,",i)+ // 10 - QString().sprintf("UDP_PORT%d,",i)+ // 11 - QString().sprintf("UDP_STRING%d,",i)+ // 12 - QString().sprintf("LOG_RML%d ",i)+ // 13 - "from RDAIRPLAY order by STATION"; + "`STATION`,"+ // 00 + QString().sprintf("`LOG%d_START_MODE`,",i)+ // 01 + QString().sprintf("`LOG%d_AUTO_RESTART`,",i)+ // 02 + QString().sprintf("`LOG%d_LOG_NAME`,",i)+ // 03 + QString().sprintf("`LOG%d_CURRENT_LOG`,",i)+ // 04 + QString().sprintf("`LOG%d_RUNNING`,",i)+ // 05 + QString().sprintf("`LOG%d_LOG_ID`,",i)+ // 06 + QString().sprintf("`LOG%d_LOG_LINE`,",i)+ // 07 + QString().sprintf("`LOG%d_NOW_CART`,",i)+ // 08 + QString().sprintf("`LOG%d_NEXT_CART`,",i)+ // 09 + QString().sprintf("`UDP_ADDR%d`,",i)+ // 10 + QString().sprintf("`UDP_PORT%d`,",i)+ // 11 + QString().sprintf("`UDP_STRING%d`,",i)+ // 12 + QString().sprintf("`LOG_RML%d` ",i)+ // 13 + "from `RDAIRPLAY` order by `STATION`"; q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("insert into LOG_MACHINES set ")+ - "STATION_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - QString().sprintf("MACHINE=%d,",i)+ - QString().sprintf("START_MODE=%d,",q->value(1).toInt())+ - "AUTO_RESTART=\""+q->value(2).toString()+"\","+ - "LOG_NAME=\""+RDEscapeString(q->value(3).toString())+"\","+ - "CURRENT_LOG=\""+RDEscapeString(q->value(4).toString())+"\","+ - "RUNNING=\""+q->value(5).toString()+"\","+ - QString().sprintf("LOG_ID=%d,",q->value(6).toInt())+ - QString().sprintf("LOG_LINE=%d,",q->value(7).toInt())+ - QString().sprintf("NOW_CART=%u,",q->value(8).toUInt())+ - QString().sprintf("NEXT_CART=%u,",q->value(9).toUInt())+ - "UDP_ADDR=\""+RDEscapeString(q->value(10).toString())+"\","+ - QString().sprintf("UDP_PORT=%u,",q->value(11).toUInt())+ - "UDP_STRING=\""+RDEscapeString(q->value(12).toString())+"\","+ - "LOG_RML=\""+RDEscapeString(q->value(13).toString())+"\""; + sql=QString("insert into `LOG_MACHINES` set ")+ + "`STATION_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + QString().sprintf("`MACHINE`=%d,",i)+ + QString().sprintf("`START_MODE`=%d,",q->value(1).toInt())+ + "`AUTO_RESTART`='"+q->value(2).toString()+"',"+ + "`LOG_NAME`='"+RDEscapeString(q->value(3).toString())+"',"+ + "`CURRENT_LOG`='"+RDEscapeString(q->value(4).toString())+"',"+ + "`RUNNING`='"+q->value(5).toString()+"',"+ + QString().sprintf("`LOG_ID`=%d,",q->value(6).toInt())+ + QString().sprintf("`LOG_LINE`=%d,",q->value(7).toInt())+ + QString().sprintf("`NOW_CART`=%u,",q->value(8).toUInt())+ + QString().sprintf("`NEXT_CART`=%u,",q->value(9).toUInt())+ + "`UDP_ADDR`='"+RDEscapeString(q->value(10).toString())+"',"+ + QString().sprintf("`UDP_PORT`=%u,",q->value(11).toUInt())+ + "`UDP_STRING`='"+RDEscapeString(q->value(12).toString())+"',"+ + "`LOG_RML`='"+RDEscapeString(q->value(13).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6610,13 +6924,13 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) delete q; } - sql=QString("select NAME from STATIONS"); + sql=QString("select `NAME` from `STATIONS`"); q=new RDSqlQuery(sql,false); while(q->next()) { for(int i=RD_RDVAIRPLAY_LOG_BASE;i<(RD_RDVAIRPLAY_LOG_BASE+RD_RDVAIRPLAY_LOG_QUAN);i++) { - sql=QString("insert into LOG_MACHINES set ")+ - "STATION_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - QString().sprintf("MACHINE=%d",i); + sql=QString("insert into `LOG_MACHINES` set ")+ + "`STATION_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + QString().sprintf("`MACHINE`=%d",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6644,13 +6958,13 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<279)&&(set_schema>cur_schema)) { - sql=QString("select NAME from STATIONS"); + sql=QString("select `NAME` from `STATIONS`"); q=new RDSqlQuery(sql,false); while(q->next()) { for(unsigned i=0;ivalue(0).toString())+"\","+ - QString().sprintf("INSTANCE=%u",i+RD_RDVAIRPLAY_LOG_BASE); + sql=QString("insert into `RDAIRPLAY_CHANNELS` set ")+ + "`STATION_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + QString().sprintf("`INSTANCE`=%u",i+RD_RDVAIRPLAY_LOG_BASE); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6662,13 +6976,13 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<280)&&(set_schema>cur_schema)) { - sql=QString("select NAME from STATIONS"); + sql=QString("select `NAME` from `STATIONS`"); q=new RDSqlQuery(sql,false); while(q->next()) { for(unsigned i=0;ivalue(0).toString())+"\","+ - QString().sprintf("MACHINE=%u",i+RD_RDVAIRPLAY_LOG_BASE); + sql=QString("insert into `LOG_MODES` set ")+ + "`STATION_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + QString().sprintf("`MACHINE`=%u",i+RD_RDVAIRPLAY_LOG_BASE); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6679,8 +6993,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<281)&&(set_schema>cur_schema)) { - sql=QString("alter table RDAIRPLAY add column ")+ - "VIRTUAL_EXIT_CODE int default 0 after EXIT_CODE"; + sql=QString("alter table `RDAIRPLAY` add column ")+ + "`VIRTUAL_EXIT_CODE` int default 0 after `EXIT_CODE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6689,28 +7003,28 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<282)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists AUDIO_CARDS (")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "CARD_NUMBER int not null,"+ - "DRIVER int not null default 0,"+ - "NAME char(64),"+ - "INPUTS int not null default -1,"+ - "OUTPUTS int not null default -1,"+ - "unique index STATION_NAME_IDX(STATION_NAME,CARD_NUMBER))"+ + sql=QString("create table if not exists `AUDIO_CARDS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`CARD_NUMBER` int not null,"+ + "`DRIVER` int not null default 0,"+ + "`NAME` char(64),"+ + "`INPUTS` int not null default -1,"+ + "`OUTPUTS` int not null default -1,"+ + "unique index `STATION_NAME_IDX` (`STATION_NAME`,`CARD_NUMBER`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("select NAME from STATIONS"); + sql=QString("select `NAME` from `STATIONS`"); q=new RDSqlQuery(sql,false); while(q->next()) { for(int i=0;ivalue(0).toString())+"\","+ - QString().sprintf("CARD_NUMBER=%d",i); + sql=QString("insert into `AUDIO_CARDS` set ")+ + "`STATION_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + QString().sprintf("`CARD_NUMBER`=%d",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6729,51 +7043,51 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<283)&&(set_schema>cur_schema)) { - sql=QString("alter table AUDIO_CARDS add column ")+ - "CLOCK_SOURCE int not null default 0 after OUTPUTS"; + sql=QString("alter table `AUDIO_CARDS` add column ")+ + "`CLOCK_SOURCE` int not null default 0 after `OUTPUTS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("select ")+ - "STATION_NAME,"+ - "CARD_NUMBER,"+ - "CLOCK_SOURCE "+ - "from AUDIO_PORTS"; + "`STATION_NAME`,"+ // 00 + "`CARD_NUMBER`,"+ // 01 + "`CLOCK_SOURCE` "+ // 02 + "from `AUDIO_PORTS`"; q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("update AUDIO_CARDS set ")+ - QString().sprintf("CLOCK_SOURCE=%d where ",q->value(2).toInt())+ - "STATION_NAME=\""+RDEscapeString(q->value(0).toString())+"\" && "+ - QString().sprintf("CARD_NUMBER=%d",q->value(1).toInt()); + sql=QString("update `AUDIO_CARDS` set ")+ + QString().sprintf("`CLOCK_SOURCE`=%d where ",q->value(2).toInt())+ + "`STATION_NAME`='"+RDEscapeString(q->value(0).toString())+"' && "+ + QString().sprintf("`CARD_NUMBER`=%d",q->value(1).toInt()); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } - sql=QString("create table if not exists AUDIO_INPUTS (")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "CARD_NUMBER int not null,"+ - "PORT_NUMBER int not null,"+ - "LEVEL int not null default 0,"+ - "TYPE int not null default 0," - "MODE int not null default 0,"+ - "unique index STATION_NAME_IDX(STATION_NAME,CARD_NUMBER,PORT_NUMBER))"+ + sql=QString("create table if not exists `AUDIO_INPUTS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`CARD_NUMBER` int not null,"+ + "`PORT_NUMBER` int not null,"+ + "`LEVEL` int not null default 0,"+ + "`TYPE` int not null default 0," + "`MODE` int not null default 0,"+ + "unique index `STATION_NAME_IDX` (`STATION_NAME`,`CARD_NUMBER`,`PORT_NUMBER`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("select NAME from STATIONS"); + sql=QString("select `NAME` from `STATIONS`"); q=new RDSqlQuery(sql,false); while(q->next()) { for(int i=0;i<24;i++) { for(int j=0;j<24;j++) { - sql=QString("insert into AUDIO_INPUTS set ")+ - "STATION_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - QString().sprintf("CARD_NUMBER=%d,",i)+ - QString().sprintf("PORT_NUMBER=%d",j); + sql=QString("insert into `AUDIO_INPUTS` set ")+ + "`STATION_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + QString().sprintf("`CARD_NUMBER`=%d,",i)+ + QString().sprintf("`PORT_NUMBER`=%d",j); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6783,21 +7097,21 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) delete q; for(int i=0;i<8;i++) { sql=QString("select ")+ - "STATION_NAME,"+ // 00 - "CARD_NUMBER,"+ // 01 - QString().sprintf("INPUT_%d_LEVEL,",i)+ // 02 - QString().sprintf("INPUT_%d_TYPE,",i)+ // 03 - QString().sprintf("INPUT_%d_MODE ",i)+ // 04 - "from AUDIO_PORTS"; + "`STATION_NAME`,"+ // 00 + "`CARD_NUMBER`,"+ // 01 + QString().sprintf("`INPUT_%d_LEVEL`,",i)+ // 02 + QString().sprintf("`INPUT_%d_TYPE`,",i)+ // 03 + QString().sprintf("`INPUT_%d_MODE` ",i)+ // 04 + "from `AUDIO_PORTS`"; q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("update AUDIO_INPUTS set ")+ - QString().sprintf("LEVEL=%d,",q->value(2).toInt())+ - QString().sprintf("TYPE=%d,",q->value(3).toInt())+ - QString().sprintf("MODE=%d where ",q->value(4).toInt())+ - "STATION_NAME=\""+RDEscapeString(q->value(0).toString())+"\" && "+ - QString().sprintf("CARD_NUMBER=%d && ",q->value(1).toInt())+ - QString().sprintf("PORT_NUMBER=%d",i); + sql=QString("update `AUDIO_INPUTS` set ")+ + QString().sprintf("`LEVEL`=%d,",q->value(2).toInt())+ + QString().sprintf("`TYPE`=%d,",q->value(3).toInt())+ + QString().sprintf("`MODE`=%d where ",q->value(4).toInt())+ + "`STATION_NAME`='"+RDEscapeString(q->value(0).toString())+"' && "+ + QString().sprintf("`CARD_NUMBER`=%d && ",q->value(1).toInt())+ + QString().sprintf("`PORT_NUMBER`=%d",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6805,27 +7119,27 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) delete q; } - sql=QString("create table if not exists AUDIO_OUTPUTS (")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME char(64) not null,"+ - "CARD_NUMBER int not null,"+ - "PORT_NUMBER int not null,"+ - "LEVEL int not null default 0,"+ - "unique index STATION_NAME_IDX(STATION_NAME,CARD_NUMBER,PORT_NUMBER))"+ + sql=QString("create table if not exists `AUDIO_OUTPUTS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` char(64) not null,"+ + "`CARD_NUMBER` int not null,"+ + "`PORT_NUMBER` int not null,"+ + "`LEVEL` int not null default 0,"+ + "unique index `STATION_NAME_IDX` (`STATION_NAME`,`CARD_NUMBER`,`PORT_NUMBER`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("select NAME from STATIONS"); + sql=QString("select `NAME` from `STATIONS`"); q=new RDSqlQuery(sql,false); while(q->next()) { for(int i=0;i<24;i++) { for(int j=0;j<24;j++) { - sql=QString("insert into AUDIO_OUTPUTS set ")+ - "STATION_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - QString().sprintf("CARD_NUMBER=%d,",i)+ - QString().sprintf("PORT_NUMBER=%d",j); + sql=QString("insert into `AUDIO_OUTPUTS` set ")+ + "`STATION_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + QString().sprintf("`CARD_NUMBER`=%d,",i)+ + QString().sprintf("`PORT_NUMBER`=%d",j); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6834,17 +7148,17 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } for(int i=0;i<8;i++) { sql=QString("select ")+ - "STATION_NAME,"+ // 00 - "CARD_NUMBER,"+ // 01 - QString().sprintf("OUTPUT_%d_LEVEL ",i)+ // 02 - "from AUDIO_PORTS"; + "`STATION_NAME`,"+ // 00 + "`CARD_NUMBER`,"+ // 01 + QString().sprintf("`OUTPUT_%d_LEVEL` ",i)+ // 02 + "from `AUDIO_PORTS`"; q=new RDSqlQuery(sql,false); while(q->next()) { - sql=QString("update AUDIO_OUTPUTS set ")+ - QString().sprintf("LEVEL=%d where ",q->value(2).toInt())+ - "STATION_NAME=\""+RDEscapeString(q->value(0).toString())+"\" && "+ - QString().sprintf("CARD_NUMBER=%d && ",q->value(1).toInt())+ - QString().sprintf("PORT_NUMBER=%d",i); + sql=QString("update `AUDIO_OUTPUTS` set ")+ + QString().sprintf("`LEVEL`=%d where ",q->value(2).toInt())+ + "`STATION_NAME`='"+RDEscapeString(q->value(0).toString())+"' && "+ + QString().sprintf("`CARD_NUMBER`=%d && ",q->value(1).toInt())+ + QString().sprintf("`PORT_NUMBER`=%d",i); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6883,37 +7197,37 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) DropColumn("RDPANEL",QString().sprintf("STOP_RML%d",i)); } - sql=QString("alter table MATRICES alter column PORT set default 0"); + sql=QString("alter table `MATRICES` alter column `PORT` set default 0"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table MATRICES alter column PORT_2 set default 0"); + sql=QString("alter table `MATRICES` alter column `PORT_2` set default 0"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table MATRICES alter column INPUTS set default 0"); + sql=QString("alter table `MATRICES` alter column `INPUTS` set default 0"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table MATRICES alter column OUTPUTS set default 0"); + sql=QString("alter table `MATRICES` alter column `OUTPUTS` set default 0"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table MATRICES alter column GPIS set default 0"); + sql=QString("alter table `MATRICES` alter column `GPIS` set default 0"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table MATRICES alter column GPOS set default 0"); + sql=QString("alter table `MATRICES` alter column `GPOS` set default 0"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPLICATORS alter column TYPE_ID set default 0"); + sql=QString("alter table `REPLICATORS` alter column `TYPE_ID` set default 0"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6949,8 +7263,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<287)&&(set_schema>cur_schema)) { - sql=QString("alter table STATIONS add column ")+ - "JACK_PORTS int not null default 8 after JACK_COMMAND_LINE"; + sql=QString("alter table `STATIONS` add column ")+ + "`JACK_PORTS` int not null default 8 after `JACK_COMMAND_LINE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -6959,153 +7273,153 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<288)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists LOG_LINES (")+ - "ID int auto_increment not null primary key,"+ - "LOG_NAME char(64) not null,"+ - "LINE_ID int not null,"+ - "COUNT int not null,"+ - "TYPE int default 0,"+ - "SOURCE int not null,"+ - "START_TIME int,"+ - "GRACE_TIME int default 0,"+ - "CART_NUMBER int UNSIGNED not null default 0,"+ - "TIME_TYPE int not null,"+ - "POST_POINT enum('N','Y') default 'N',"+ - "TRANS_TYPE int not null,"+ - "START_POINT int not null default -1,"+ - "END_POINT int not null default -1,"+ - "FADEUP_POINT int default -1,"+ - QString().sprintf("FADEUP_GAIN int default %d,",RD_FADE_DEPTH)+ - "FADEDOWN_POINT int default -1,"+ - QString().sprintf("FADEDOWN_GAIN int default %d,",RD_FADE_DEPTH)+ - "SEGUE_START_POINT int not null default -1,"+ - "SEGUE_END_POINT int not null default -1,"+ - QString().sprintf("SEGUE_GAIN int default %d,",RD_FADE_DEPTH)+ - "DUCK_UP_GAIN int default 0,"+ - "DUCK_DOWN_GAIN int default 0,"+ - "COMMENT CHAR(255),"+ - "LABEL CHAR(64),"+ - "ORIGIN_USER char(255),"+ - "ORIGIN_DATETIME datetime,"+ - "EVENT_LENGTH int default -1,"+ - "LINK_EVENT_NAME char(64),"+ - "LINK_START_TIME int,"+ - "LINK_LENGTH int default 0,"+ - "LINK_START_SLOP int default 0,"+ - "LINK_END_SLOP int default 0,"+ - "LINK_ID int default -1,"+ - "LINK_EMBEDDED enum('N','Y') default 'N',"+ - "EXT_START_TIME time,"+ - "EXT_LENGTH int,"+ - "EXT_CART_NAME char(32),"+ - "EXT_DATA char(32),"+ - "EXT_EVENT_ID char(32),"+ - "EXT_ANNC_TYPE char(8),"+ - "unique index LOG_NAME_IDX (LOG_NAME,COUNT),"+ - "index CART_NUMBER_IDX (CART_NUMBER),"+ - "index LABEL_IDX (LABEL))"+ + sql=QString("create table if not exists `LOG_LINES` (")+ + "`ID` int auto_increment not null primary key,"+ + "`LOG_NAME` char(64) not null,"+ + "`LINE_ID` int not null,"+ + "`COUNT` int not null,"+ + "`TYPE` int default 0,"+ + "`SOURCE` int not null,"+ + "`START_TIME` int,"+ + "`GRACE_TIME` int default 0,"+ + "`CART_NUMBER` int UNSIGNED not null default 0,"+ + "`TIME_TYPE` int not null,"+ + "`POST_POINT` enum('N','Y') default 'N',"+ + "`TRANS_TYPE` int not null,"+ + "`START_POINT` int not null default -1,"+ + "`END_POINT` int not null default -1,"+ + "`FADEUP_POINT` int default -1,"+ + QString().sprintf("`FADEUP_GAIN` int default %d,",RD_FADE_DEPTH)+ + "`FADEDOWN_POINT` int default -1,"+ + QString().sprintf("`FADEDOWN_GAIN` int default %d,",RD_FADE_DEPTH)+ + "`SEGUE_START_POINT` int not null default -1,"+ + "`SEGUE_END_POINT` int not null default -1,"+ + QString().sprintf("`SEGUE_GAIN` int default %d,",RD_FADE_DEPTH)+ + "`DUCK_UP_GAIN` int default 0,"+ + "`DUCK_DOWN_GAIN` int default 0,"+ + "`COMMENT` CHAR(255),"+ + "`LABEL` CHAR(64),"+ + "`ORIGIN_USER` char(255),"+ + "`ORIGIN_DATETIME` datetime,"+ + "`EVENT_LENGTH` int default -1,"+ + "`LINK_EVENT_NAME` char(64),"+ + "`LINK_START_TIME` int,"+ + "`LINK_LENGTH` int default 0,"+ + "`LINK_START_SLOP` int default 0,"+ + "`LINK_END_SLOP` int default 0,"+ + "`LINK_ID` int default -1,"+ + "`LINK_EMBEDDED` enum('N','Y') default 'N',"+ + "`EXT_START_TIME` time,"+ + "`EXT_LENGTH` int,"+ + "`EXT_CART_NAME` char(32),"+ + "`EXT_DATA` char(32),"+ + "`EXT_EVENT_ID` char(32),"+ + "`EXT_ANNC_TYPE` char(8),"+ + "unique index `LOG_NAME_IDX` (`LOG_NAME`,`COUNT`),"+ + "index `CART_NUMBER_IDX` (`CART_NUMBER`),"+ + "index `LABEL_IDX` (`LABEL`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("select NAME from LOGS"); + sql=QString("select `NAME` from `LOGS`"); q=new RDSqlQuery(sql,false); while(q->next()) { QString tablename=q->value(0).toString()+"_LOG"; tablename.replace(" ","_"); if(!TableExists(tablename)) { - fprintf(stderr,"rddbmgr: missing LOG table for log \"%s\"\n", + fprintf(stderr,"rddbmgr: missing LOG table for log '%s'\n", (const char *)q->value(0).toString().toUtf8()); } else { sql=QString("select ")+ - "ID,"+ // 00 - "COUNT,"+ // 01 - "TYPE,"+ // 02 - "SOURCE,"+ // 03 - "START_TIME,"+ // 04 - "GRACE_TIME,"+ // 05 - "CART_NUMBER,"+ // 06 - "TIME_TYPE,"+ // 07 - "POST_POINT,"+ // 08 - "TRANS_TYPE,"+ // 09 - "START_POINT,"+ // 10 - "END_POINT,"+ // 11 - "FADEUP_POINT,"+ // 12 - "FADEUP_GAIN,"+ // 13 - "FADEDOWN_POINT,"+ // 14 - "FADEDOWN_GAIN,"+ // 15 - "SEGUE_START_POINT,"+ // 16 - "SEGUE_END_POINT,"+ // 17 - "SEGUE_GAIN,"+ // 18 - "DUCK_UP_GAIN,"+ // 19 - "DUCK_DOWN_GAIN,"+ // 20 - "COMMENT,"+ // 21 - "LABEL,"+ // 22 - "ORIGIN_USER,"+ // 23 - "ORIGIN_DATETIME,"+ // 24 - "EVENT_LENGTH,"+ // 25 - "LINK_EVENT_NAME,"+ // 26 - "LINK_START_TIME,"+ // 27 - "LINK_LENGTH,"+ // 28 - "LINK_START_SLOP,"+ // 29 - "LINK_END_SLOP,"+ // 30 - "LINK_ID,"+ // 31 - "LINK_EMBEDDED,"+ // 32 - "EXT_START_TIME,"+ // 33 - "EXT_LENGTH,"+ // 34 - "EXT_CART_NAME,"+ // 35 - "EXT_DATA,"+ // 36 - "EXT_EVENT_ID,"+ // 37 - "EXT_ANNC_TYPE "+ // 38 - "from `"+tablename+"` order by COUNT"; + "`ID`,"+ // 00 + "`COUNT`,"+ // 01 + "`TYPE`,"+ // 02 + "`SOURCE`,"+ // 03 + "`START_TIME`,"+ // 04 + "`GRACE_TIME`,"+ // 05 + "`CART_NUMBER`,"+ // 06 + "`TIME_TYPE`,"+ // 07 + "`POST_POINT`,"+ // 08 + "`TRANS_TYPE`,"+ // 09 + "`START_POINT`,"+ // 10 + "`END_POINT`,"+ // 11 + "`FADEUP_POINT`,"+ // 12 + "`FADEUP_GAIN`,"+ // 13 + "`FADEDOWN_POINT`,"+ // 14 + "`FADEDOWN_GAIN`,"+ // 15 + "`SEGUE_START_POINT`,"+ // 16 + "`SEGUE_END_POINT`,"+ // 17 + "`SEGUE_GAIN`,"+ // 18 + "`DUCK_UP_GAIN`,"+ // 19 + "`DUCK_DOWN_GAIN`,"+ // 20 + "`COMMENT`,"+ // 21 + "`LABEL`,"+ // 22 + "`ORIGIN_USER`,"+ // 23 + "`ORIGIN_DATETIME`,"+ // 24 + "`EVENT_LENGTH`,"+ // 25 + "`LINK_EVENT_NAME`,"+ // 26 + "`LINK_START_TIME`,"+ // 27 + "`LINK_LENGTH`,"+ // 28 + "`LINK_START_SLOP`,"+ // 29 + "`LINK_END_SLOP`,"+ // 30 + "`LINK_ID`,"+ // 31 + "`LINK_EMBEDDED`,"+ // 32 + "`EXT_START_TIME`,"+ // 33 + "`EXT_LENGTH`,"+ // 34 + "`EXT_CART_NAME`,"+ // 35 + "`EXT_DATA`,"+ // 36 + "`EXT_EVENT_ID`,"+ // 37 + "`EXT_ANNC_TYPE` "+ // 38 + "from `"+tablename+"` order by `COUNT`"; q1=new RDSqlQuery(sql); while(q1->next()) { - sql=QString("insert into LOG_LINES set ")+ - "LOG_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - QString().sprintf("LINE_ID=%d,",q1->value(0).toInt())+ - QString().sprintf("COUNT=%d,",q1->value(1).toInt())+ - QString().sprintf("TYPE=%d,",q1->value(2).toInt())+ - QString().sprintf("SOURCE=%d,",q1->value(3).toInt())+ - QString().sprintf("START_TIME=%d,",q1->value(4).toInt())+ - QString().sprintf("GRACE_TIME=%d,",q1->value(5).toInt())+ - QString().sprintf("CART_NUMBER=%u,",q1->value(6).toUInt())+ - QString().sprintf("TIME_TYPE=%d,",q1->value(7).toInt())+ - "POST_POINT=\""+RDEscapeString(q1->value(8).toString())+"\","+ - QString().sprintf("TRANS_TYPE=%d,",q1->value(9).toInt())+ - QString().sprintf("START_POINT=%d,",q1->value(10).toInt())+ - QString().sprintf("END_POINT=%d,",q1->value(11).toInt())+ - QString().sprintf("FADEUP_POINT=%d,",q1->value(12).toInt())+ - QString().sprintf("FADEUP_GAIN=%d,",q1->value(13).toInt())+ - QString().sprintf("FADEDOWN_POINT=%d,",q1->value(14).toInt())+ - QString().sprintf("FADEDOWN_GAIN=%d,",q1->value(15).toInt())+ - QString().sprintf("SEGUE_START_POINT=%d,",q1->value(16).toInt())+ - QString().sprintf("SEGUE_END_POINT=%d,",q1->value(17).toInt())+ - QString().sprintf("SEGUE_GAIN=%d,",q1->value(18).toInt())+ - QString().sprintf("DUCK_UP_GAIN=%d,",q1->value(19).toInt())+ - QString().sprintf("DUCK_DOWN_GAIN=%d,",q1->value(20).toInt())+ - "COMMENT=\""+RDEscapeString(q1->value(21).toString())+"\","+ - "LABEL=\""+RDEscapeString(q1->value(22).toString())+"\","+ - "ORIGIN_USER=\""+RDEscapeString(q1->value(23).toString())+"\","+ - "ORIGIN_DATETIME="+RDCheckDateTime(q1->value(24).toDateTime(), + sql=QString("insert into `LOG_LINES` set ")+ + "`LOG_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + QString().sprintf("`LINE_ID`=%d,",q1->value(0).toInt())+ + QString().sprintf("`COUNT`=%d,",q1->value(1).toInt())+ + QString().sprintf("`TYPE`=%d,",q1->value(2).toInt())+ + QString().sprintf("`SOURCE`=%d,",q1->value(3).toInt())+ + QString().sprintf("`START_TIME`=%d,",q1->value(4).toInt())+ + QString().sprintf("`GRACE_TIME`=%d,",q1->value(5).toInt())+ + QString().sprintf("`CART_NUMBER`=%u,",q1->value(6).toUInt())+ + QString().sprintf("`TIME_TYPE`=%d,",q1->value(7).toInt())+ + "`POST_POINT`='"+RDEscapeString(q1->value(8).toString())+"',"+ + QString().sprintf("`TRANS_TYPE`=%d,",q1->value(9).toInt())+ + QString().sprintf("`START_POINT`=%d,",q1->value(10).toInt())+ + QString().sprintf("`END_POINT`=%d,",q1->value(11).toInt())+ + QString().sprintf("`FADEUP_POINT`=%d,",q1->value(12).toInt())+ + QString().sprintf("`FADEUP_GAIN`=%d,",q1->value(13).toInt())+ + QString().sprintf("`FADEDOWN_POINT`=%d,",q1->value(14).toInt())+ + QString().sprintf("`FADEDOWN_GAIN`=%d,",q1->value(15).toInt())+ + QString().sprintf("`SEGUE_START_POINT`=%d,",q1->value(16).toInt())+ + QString().sprintf("`SEGUE_END_POINT`=%d,",q1->value(17).toInt())+ + QString().sprintf("`SEGUE_GAIN`=%d,",q1->value(18).toInt())+ + QString().sprintf("`DUCK_UP_GAIN`=%d,",q1->value(19).toInt())+ + QString().sprintf("`DUCK_DOWN_GAIN`=%d,",q1->value(20).toInt())+ + "`COMMENT`='"+RDEscapeString(q1->value(21).toString())+"',"+ + "`LABEL`='"+RDEscapeString(q1->value(22).toString())+"',"+ + "`ORIGIN_USER`='"+RDEscapeString(q1->value(23).toString())+"',"+ + "`ORIGIN_DATETIME`="+RDCheckDateTime(q1->value(24).toDateTime(), "yyyy-MM-dd hh:mm:ss")+","+ - QString().sprintf("EVENT_LENGTH=%d,",q1->value(25).toInt())+ - "LINK_EVENT_NAME=\""+RDEscapeString(q1->value(26).toString())+"\","+ - QString().sprintf("LINK_START_TIME=%d,",q1->value(27).toInt())+ - QString().sprintf("LINK_LENGTH=%d,",q1->value(28).toInt())+ - QString().sprintf("LINK_START_SLOP=%d,",q1->value(29).toInt())+ - QString().sprintf("LINK_END_SLOP=%d,",q1->value(30).toInt())+ - QString().sprintf("LINK_ID=%d,",q1->value(31).toInt())+ - "LINK_EMBEDDED=\""+RDEscapeString(q1->value(32).toString())+"\","+ - "EXT_START_TIME="+ + QString().sprintf("`EVENT_LENGTH`=%d,",q1->value(25).toInt())+ + "`LINK_EVENT_NAME`='"+RDEscapeString(q1->value(26).toString())+"',"+ + QString().sprintf("`LINK_START_TIME`=%d,",q1->value(27).toInt())+ + QString().sprintf("`LINK_LENGTH`=%d,",q1->value(28).toInt())+ + QString().sprintf("`LINK_START_SLOP`=%d,",q1->value(29).toInt())+ + QString().sprintf("`LINK_END_SLOP`=%d,",q1->value(30).toInt())+ + QString().sprintf("`LINK_ID`=%d,",q1->value(31).toInt())+ + "`LINK_EMBEDDED`='"+RDEscapeString(q1->value(32).toString())+"',"+ + "`EXT_START_TIME`="+ RDCheckDateTime(q1->value(33).toTime(),"hh:mm:ss")+","+ - QString().sprintf("EXT_LENGTH=%d,",q1->value(34).toInt())+ - "EXT_CART_NAME=\""+RDEscapeString(q1->value(35).toString())+"\","+ - "EXT_DATA=\""+RDEscapeString(q1->value(36).toString())+"\","+ - "EXT_EVENT_ID=\""+RDEscapeString(q1->value(37).toString())+"\","+ - "EXT_ANNC_TYPE=\""+RDEscapeString(q1->value(38).toString())+"\""; + QString().sprintf("`EXT_LENGTH`=%d,",q1->value(34).toInt())+ + "`EXT_CART_NAME`='"+RDEscapeString(q1->value(35).toString())+"',"+ + "`EXT_DATA`='"+RDEscapeString(q1->value(36).toString())+"',"+ + "`EXT_EVENT_ID`='"+RDEscapeString(q1->value(37).toString())+"',"+ + "`EXT_ANNC_TYPE`='"+RDEscapeString(q1->value(38).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -7122,11 +7436,11 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // Delete orphaned log tables // sql=QString("show tables where ")+ - "Tables_in_"+db_config->mysqlDbname()+" like \"%_LOG\""; + "`Tables_in_"+db_config->mysqlDbname()+"` like '%_LOG'"; q=new RDSqlQuery(sql); while(q->next()) { if(DropTable(q->value(0).toString(),err_msg)) { - fprintf(stderr,"rddbmgr: dropping orphaned LOG table \"%s\"\n", + fprintf(stderr,"rddbmgr: dropping orphaned LOG table '%s'\n", q->value(0).toString().toUtf8().constData()); } } @@ -7136,129 +7450,129 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<289)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists ELR_LINES (")+ - "ID int unsigned auto_increment primary key,"+ - "SERVICE_NAME char(10) not null,"+ - "EVENT_DATETIME datetime not null,"+ - "LENGTH int,"+ - "LOG_NAME char(64),"+ - "LOG_ID int,"+ - "CART_NUMBER int unsigned,"+ - "CUT_NUMBER int,"+ - "TITLE char(255),"+ - "ARTIST char(255),"+ - "PUBLISHER char(64),"+ - "COMPOSER char(64),"+ - "USER_DEFINED char(255),"+ - "SONG_ID char(32),"+ - "ALBUM char(255),"+ - "LABEL char(64),"+ - "CONDUCTOR char(64),"+ - "USAGE_CODE int,"+ - "DESCRIPTION char(64),"+ - "OUTCUE char(64),"+ - "ISRC char(12),"+ - "ISCI char(32),"+ - "STATION_NAME char(64),"+ - "SCHEDULED_TIME time,"+ - "EVENT_TYPE int,"+ - "EVENT_SOURCE int,"+ - "PLAY_SOURCE int,"+ - "START_SOURCE int default 0,"+ - "ONAIR_FLAG enum('N','Y') default 'N',"+ - "EXT_START_TIME time,"+ - "EXT_LENGTH int,"+ - "EXT_CART_NAME char(32),"+ - "EXT_DATA char(32),"+ - "EXT_EVENT_ID char(8),"+ - "EXT_ANNC_TYPE char(8),"+ - "index SERVICE_NAME_EVENT_DATETIME_IDX(SERVICE_NAME,EVENT_DATETIME))"+ + sql=QString("create table if not exists `ELR_LINES` (")+ + "`ID` int unsigned auto_increment primary key,"+ + "`SERVICE_NAME` char(10) not null,"+ + "`EVENT_DATETIME` datetime not null,"+ + "`LENGTH` int,"+ + "`LOG_NAME` char(64),"+ + "`LOG_ID` int,"+ + "`CART_NUMBER` int unsigned,"+ + "`CUT_NUMBER` int,"+ + "`TITLE` char(255),"+ + "`ARTIST` char(255),"+ + "`PUBLISHER` char(64),"+ + "`COMPOSER` char(64),"+ + "`USER_DEFINED` char(255),"+ + "`SONG_ID` char(32),"+ + "`ALBUM` char(255),"+ + "`LABEL` char(64),"+ + "`CONDUCTOR` char(64),"+ + "`USAGE_CODE` int,"+ + "`DESCRIPTION` char(64),"+ + "`OUTCUE` char(64),"+ + "`ISRC` char(12),"+ + "`ISCI` char(32),"+ + "`STATION_NAME` char(64),"+ + "`SCHEDULED_TIME` time,"+ + "`EVENT_TYPE` int,"+ + "`EVENT_SOURCE` int,"+ + "`PLAY_SOURCE` int,"+ + "`START_SOURCE` int default 0,"+ + "`ONAIR_FLAG` enum('N','Y') default 'N',"+ + "`EXT_START_TIME` time,"+ + "`EXT_LENGTH` int,"+ + "`EXT_CART_NAME` char(32),"+ + "`EXT_DATA` char(32),"+ + "`EXT_EVENT_ID` char(8),"+ + "`EXT_ANNC_TYPE` char(8),"+ + "index `SERVICE_NAME_EVENT_DATETIME_IDX` (`SERVICE_NAME`,`EVENT_DATETIME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("select NAME from SERVICES"); + sql=QString("select `NAME` from `SERVICES`"); q=new RDSqlQuery(sql,false); while(q->next()) { QString tablename=q->value(0).toString()+"_SRT"; tablename.replace(" ","_"); sql=QString("select ")+ - "LENGTH,"+ // 00 - "LOG_NAME,"+ // 01 - "LOG_ID,"+ // 02 - "CART_NUMBER,"+ // 03 - "CUT_NUMBER,"+ // 04 - "TITLE,"+ // 05 - "ARTIST,"+ // 06 - "PUBLISHER,"+ // 07 - "COMPOSER,"+ // 08 - "USER_DEFINED,"+ // 09 - "SONG_ID,"+ // 10 - "ALBUM,"+ // 11 - "LABEL,"+ // 12 - "CONDUCTOR,"+ // 13 - "USAGE_CODE,"+ // 14 - "DESCRIPTION,"+ // 15 - "OUTCUE,"+ // 16 - "ISRC,"+ // 17 - "ISCI,"+ // 18 - "STATION_NAME,"+ // 19 - "EVENT_DATETIME,"+ // 20 - "SCHEDULED_TIME,"+ // 21 - "EVENT_TYPE,"+ // 22 - "EVENT_SOURCE,"+ // 23 - "PLAY_SOURCE,"+ // 24 - "START_SOURCE,"+ // 25 - "ONAIR_FLAG,"+ // 26 - "EXT_START_TIME,"+ // 27 - "EXT_LENGTH,"+ // 28 - "EXT_CART_NAME,"+ // 29 - "EXT_DATA,"+ // 30 - "EXT_EVENT_ID,"+ // 31 - "EXT_ANNC_TYPE "+ // 32 + "`LENGTH`,"+ // 00 + "`LOG_NAME`,"+ // 01 + "`LOG_ID`,"+ // 02 + "`CART_NUMBER`,"+ // 03 + "`CUT_NUMBER`,"+ // 04 + "`TITLE`,"+ // 05 + "`ARTIST`,"+ // 06 + "`PUBLISHER`,"+ // 07 + "`COMPOSER`,"+ // 08 + "`USER_DEFINED`,"+ // 09 + "`SONG_ID`,"+ // 10 + "`ALBUM`,"+ // 11 + "`LABEL`,"+ // 12 + "`CONDUCTOR`,"+ // 13 + "`USAGE_CODE`,"+ // 14 + "`DESCRIPTION`,"+ // 15 + "`OUTCUE`,"+ // 16 + "`ISRC`,"+ // 17 + "`ISCI`,"+ // 18 + "`STATION_NAME`,"+ // 19 + "`EVENT_DATETIME`,"+ // 20 + "`SCHEDULED_TIME`,"+ // 21 + "`EVENT_TYPE`,"+ // 22 + "`EVENT_SOURCE`,"+ // 23 + "`PLAY_SOURCE`,"+ // 24 + "`START_SOURCE`,"+ // 25 + "`ONAIR_FLAG`,"+ // 26 + "`EXT_START_TIME`,"+ // 27 + "`EXT_LENGTH`,"+ // 28 + "`EXT_CART_NAME`,"+ // 29 + "`EXT_DATA`,"+ // 30 + "`EXT_EVENT_ID`,"+ // 31 + "`EXT_ANNC_TYPE` "+ // 32 "from `"+tablename+"`"; q1=new RDSqlQuery(sql,false); while(q1->next()) { - sql=QString("insert into ELR_LINES set ")+ - "SERVICE_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - QString().sprintf("LENGTH=%d,",q1->value(0).toInt())+ - "LOG_NAME=\""+RDEscapeString(q1->value(1).toString())+"\","+ - QString().sprintf("LOG_ID=%d,",q1->value(2).toInt())+ - QString().sprintf("CART_NUMBER=%u,",q1->value(3).toUInt())+ - QString().sprintf("CUT_NUMBER=%d,",q1->value(4).toInt())+ - "TITLE=\""+RDEscapeString(q1->value(5).toString())+"\","+ - "ARTIST=\""+RDEscapeString(q1->value(6).toString())+"\","+ - "PUBLISHER=\""+RDEscapeString(q1->value(7).toString())+"\","+ - "COMPOSER=\""+RDEscapeString(q1->value(8).toString())+"\","+ - "USER_DEFINED=\""+RDEscapeString(q1->value(9).toString())+"\","+ - "SONG_ID=\""+RDEscapeString(q1->value(10).toString())+"\","+ - "ALBUM=\""+RDEscapeString(q1->value(11).toString())+"\","+ - "LABEL=\""+RDEscapeString(q1->value(12).toString())+"\","+ - "CONDUCTOR=\""+RDEscapeString(q1->value(13).toString())+"\","+ - "USAGE_CODE=\""+RDEscapeString(q1->value(14).toString())+"\","+ - "DESCRIPTION=\""+RDEscapeString(q1->value(15).toString())+"\","+ - "OUTCUE=\""+RDEscapeString(q1->value(16).toString())+"\","+ - "ISRC=\""+RDEscapeString(q1->value(17).toString())+"\","+ - "ISCI=\""+RDEscapeString(q1->value(18).toString())+"\","+ - "STATION_NAME=\""+RDEscapeString(q1->value(19).toString())+"\","+ - "EVENT_DATETIME=\""+RDEscapeString(q1->value(20).toDateTime(). - toString("yyyy-MM-dd hh:mm:ss"))+"\","+ - "SCHEDULED_TIME="+ + sql=QString("insert into `ELR_LINES` set ")+ + "`SERVICE_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + QString().sprintf("`LENGTH`=%d,",q1->value(0).toInt())+ + "`LOG_NAME`='"+RDEscapeString(q1->value(1).toString())+"',"+ + QString().sprintf("`LOG_ID`=%d,",q1->value(2).toInt())+ + QString().sprintf("`CART_NUMBER`=%u,",q1->value(3).toUInt())+ + QString().sprintf("`CUT_NUMBER`=%d,",q1->value(4).toInt())+ + "`TITLE`='"+RDEscapeString(q1->value(5).toString())+"',"+ + "`ARTIST`='"+RDEscapeString(q1->value(6).toString())+"',"+ + "`PUBLISHER`='"+RDEscapeString(q1->value(7).toString())+"',"+ + "`COMPOSER`='"+RDEscapeString(q1->value(8).toString())+"',"+ + "`USER_DEFINED`='"+RDEscapeString(q1->value(9).toString())+"',"+ + "`SONG_ID`='"+RDEscapeString(q1->value(10).toString())+"',"+ + "`ALBUM`='"+RDEscapeString(q1->value(11).toString())+"',"+ + "`LABEL`='"+RDEscapeString(q1->value(12).toString())+"',"+ + "`CONDUCTOR`='"+RDEscapeString(q1->value(13).toString())+"',"+ + "`USAGE_CODE`='"+RDEscapeString(q1->value(14).toString())+"',"+ + "`DESCRIPTION`='"+RDEscapeString(q1->value(15).toString())+"',"+ + "`OUTCUE`='"+RDEscapeString(q1->value(16).toString())+"',"+ + "`ISRC`='"+RDEscapeString(q1->value(17).toString())+"',"+ + "`ISCI`='"+RDEscapeString(q1->value(18).toString())+"',"+ + "`STATION_NAME`='"+RDEscapeString(q1->value(19).toString())+"',"+ + "`EVENT_DATETIME`='"+RDEscapeString(q1->value(20).toDateTime(). + toString("yyyy-MM-dd hh:mm:ss"))+"',"+ + "`SCHEDULED_TIME`="+ RDCheckDateTime(q1->value(21).toTime(),"hh:mm:ss")+","+ - QString().sprintf("EVENT_TYPE=%d,",q1->value(22).toInt())+ - QString().sprintf("EVENT_SOURCE=%d,",q1->value(23).toInt())+ - QString().sprintf("PLAY_SOURCE=%d,",q1->value(24).toInt())+ - QString().sprintf("START_SOURCE=%d,",q1->value(25).toInt())+ - "ONAIR_FLAG=\""+RDEscapeString(q1->value(26).toString())+"\","+ - "EXT_START_TIME="+ + QString().sprintf("`EVENT_TYPE`=%d,",q1->value(22).toInt())+ + QString().sprintf("`EVENT_SOURCE`=%d,",q1->value(23).toInt())+ + QString().sprintf("`PLAY_SOURCE`=%d,",q1->value(24).toInt())+ + QString().sprintf("`START_SOURCE`=%d,",q1->value(25).toInt())+ + "`ONAIR_FLAG`='"+RDEscapeString(q1->value(26).toString())+"',"+ + "`EXT_START_TIME`="+ RDCheckDateTime(q1->value(27).toTime(),"hh:mm:ss")+","+ - QString().sprintf("EXT_LENGTH=%d,",q1->value(28).toInt())+ - "EXT_CART_NAME=\""+RDEscapeString(q1->value(29).toString())+"\","+ - "EXT_DATA=\""+RDEscapeString(q1->value(30).toString())+"\","+ - "EXT_EVENT_ID=\""+RDEscapeString(q1->value(31).toString())+"\","+ - "EXT_ANNC_TYPE=\""+RDEscapeString(q1->value(32).toString())+"\""; + QString().sprintf("`EXT_LENGTH`=%d,",q1->value(28).toInt())+ + "`EXT_CART_NAME`='"+RDEscapeString(q1->value(29).toString())+"',"+ + "`EXT_DATA`='"+RDEscapeString(q1->value(30).toString())+"',"+ + "`EXT_EVENT_ID`='"+RDEscapeString(q1->value(31).toString())+"',"+ + "`EXT_ANNC_TYPE`='"+RDEscapeString(q1->value(32).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -7274,11 +7588,11 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // Delete orphaned elr tables // sql=QString("show tables where ")+ - "Tables_in_"+db_config->mysqlDbname()+" like \"%_SRT\""; + "`Tables_in_"+db_config->mysqlDbname()+"` like '%_SRT'"; q=new RDSqlQuery(sql); while(q->next()) { if(DropTable(q->value(0).toString(),err_msg)) { - fprintf(stderr,"rddbmgr: dropping orphaned SRT table \"%s\"\n", + fprintf(stderr,"rddbmgr: dropping orphaned SRT table '%s'\n", q->value(0).toString().toUtf8().constData()); } } @@ -7288,23 +7602,23 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<290)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists EVENT_LINES (")+ - "ID int unsigned auto_increment primary key,"+ - "EVENT_NAME char(64) not null,"+ - "TYPE int not null,"+ - "COUNT int not null,"+ - "EVENT_TYPE int not null,"+ - "CART_NUMBER int unsigned,"+ - "TRANS_TYPE int not null,"+ - "MARKER_COMMENT char(255),"+ - "unique index EVENT_NAME_TYPE_COUNT_IDX (EVENT_NAME,TYPE,COUNT))"+ + sql=QString("create table if not exists `EVENT_LINES` (")+ + "`ID` int unsigned auto_increment primary key,"+ + "`EVENT_NAME` char(64) not null,"+ + "`TYPE` int not null,"+ + "`COUNT` int not null,"+ + "`EVENT_TYPE` int not null,"+ + "`CART_NUMBER` int unsigned,"+ + "`TRANS_TYPE` int not null,"+ + "`MARKER_COMMENT` char(255),"+ + "unique index `EVENT_NAME_TYPE_COUNT_IDX` (`EVENT_NAME`,`TYPE`,`COUNT`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("select NAME from EVENTS"); + sql=QString("select `NAME` from `EVENTS`"); q=new RDSqlQuery(sql,false); while(q->next()) { // @@ -7313,28 +7627,28 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) QString tablename=q->value(0).toString()+"_PRE"; tablename.replace(" ","_"); if(!TableExists(tablename)) { - fprintf(stderr,"rddbmgr: missing PRE table for event \"%s\"\n", + fprintf(stderr,"rddbmgr: missing PRE table for event '%s'\n", (const char *)q->value(0).toString().toUtf8()); } else { sql=QString("select ")+ - "COUNT,"+ // 00 - "TYPE,"+ // 01 - "CART_NUMBER,"+ // 02 - "TRANS_TYPE,"+ // 03 - "COMMENT "+ // 05 + "`COUNT`,"+ // 00 + "`TYPE`,"+ // 01 + "`CART_NUMBER`,"+ // 02 + "`TRANS_TYPE`,"+ // 03 + "`COMMENT` "+ // 05 "from `"+tablename+"`"+ - "order by COUNT"; + "order by `COUNT`"; q1=new RDSqlQuery(sql,false); while(q1->next()) { - sql=QString("insert into EVENT_LINES set ")+ - "EVENT_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - "TYPE=0,"+ - QString().sprintf("COUNT=%d,",q1->value(0).toInt())+ - QString().sprintf("EVENT_TYPE=%d,",q1->value(1).toInt())+ - QString().sprintf("CART_NUMBER=%u,",q1->value(2).toUInt())+ - QString().sprintf("TRANS_TYPE=%d,",q1->value(3).toInt())+ - "MARKER_COMMENT=\""+RDEscapeString(q1->value(4).toString())+"\""; + sql=QString("insert into `EVENT_LINES` set ")+ + "`EVENT_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + "`TYPE`=0,"+ + QString().sprintf("`COUNT`=%d,",q1->value(0).toInt())+ + QString().sprintf("`EVENT_TYPE`=%d,",q1->value(1).toInt())+ + QString().sprintf("`CART_NUMBER`=%u,",q1->value(2).toUInt())+ + QString().sprintf("`TRANS_TYPE`=%d,",q1->value(3).toInt())+ + "`MARKER_COMMENT`='"+RDEscapeString(q1->value(4).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -7351,28 +7665,28 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) tablename=q->value(0).toString()+"_POST"; tablename.replace(" ","_"); if(!TableExists(tablename)) { - fprintf(stderr,"rddbmgr: missing POST table for event \"%s\"\n", + fprintf(stderr,"rddbmgr: missing POST table for event '%s'\n", (const char *)q->value(0).toString().toUtf8()); } else { sql=QString("select ")+ - "COUNT,"+ // 00 - "TYPE,"+ // 01 - "CART_NUMBER,"+ // 02 - "TRANS_TYPE,"+ // 03 - "COMMENT "+ // 05 + "`COUNT`,"+ // 00 + "`TYPE`,"+ // 01 + "`CART_NUMBER`,"+ // 02 + "`TRANS_TYPE`,"+ // 03 + "`COMMENT` "+ // 05 "from `"+tablename+"`"+ - "order by COUNT"; + "order by `COUNT`"; q1=new RDSqlQuery(sql,false); while(q1->next()) { - sql=QString("insert into EVENT_LINES set ")+ - "EVENT_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - "TYPE=1,"+ - QString().sprintf("COUNT=%d,",q1->value(0).toInt())+ - QString().sprintf("EVENT_TYPE=%d,",q1->value(1).toInt())+ - QString().sprintf("CART_NUMBER=%u,",q1->value(2).toUInt())+ - QString().sprintf("TRANS_TYPE=%d,",q1->value(3).toInt())+ - "MARKER_COMMENT=\""+RDEscapeString(q1->value(4).toString())+"\""; + sql=QString("insert into `EVENT_LINES` set ")+ + "`EVENT_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + "`TYPE`=1,"+ + QString().sprintf("`COUNT`=%d,",q1->value(0).toInt())+ + QString().sprintf("`EVENT_TYPE`=%d,",q1->value(1).toInt())+ + QString().sprintf("`CART_NUMBER`=%u,",q1->value(2).toUInt())+ + QString().sprintf("`TRANS_TYPE`=%d,",q1->value(3).toInt())+ + "`MARKER_COMMENT`='"+RDEscapeString(q1->value(4).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -7389,22 +7703,22 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // Delete orphaned event tables // sql=QString("show tables where ")+ - "Tables_in_"+db_config->mysqlDbname()+" like \"%_PRE\""; + "`Tables_in_"+db_config->mysqlDbname()+"` like '%_PRE'"; q=new RDSqlQuery(sql); while(q->next()) { if(DropTable(q->value(0).toString(),err_msg)) { - fprintf(stderr,"rddbmgr: dropping orphaned PRE table \"%s\"\n", + fprintf(stderr,"rddbmgr: dropping orphaned PRE table '%s'\n", q->value(0).toString().toUtf8().constData()); } } delete q; sql=QString("show tables where ")+ - "Tables_in_"+db_config->mysqlDbname()+" like \"%_POST\""; + "`Tables_in_"+db_config->mysqlDbname()+"` like '%_POST'"; q=new RDSqlQuery(sql); while(q->next()) { if(DropTable(q->value(0).toString(),err_msg)) { - fprintf(stderr,"rddbmgr: dropping orphaned POST table \"%s\"\n", + fprintf(stderr,"rddbmgr: dropping orphaned POST table '%s'\n", q->value(0).toString().toUtf8().constData()); } } @@ -7414,26 +7728,26 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<291)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists CLOCK_LINES (")+ - "ID int unsigned auto_increment not null primary key,"+ - "CLOCK_NAME char(64) not null,"+ - "EVENT_NAME char(64) not null,"+ - "START_TIME int not null,"+ - "LENGTH int not null,"+ - "unique index CLOCK_NAME_START_TIME_IDX (CLOCK_NAME,START_TIME))"+ + sql=QString("create table if not exists `CLOCK_LINES` (")+ + "`ID` int unsigned auto_increment not null primary key,"+ + "`CLOCK_NAME` char(64) not null,"+ + "`EVENT_NAME` char(64) not null,"+ + "`START_TIME` int not null,"+ + "`LENGTH` int not null,"+ + "unique index `CLOCK_NAME_START_TIME_IDX` (`CLOCK_NAME`,`START_TIME`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("select NAME from CLOCKS"); + sql=QString("select `NAME` from `CLOCKS`"); q=new RDSqlQuery(sql); while(q->next()) { QString tablename=q->value(0).toString()+"_CLK"; tablename.replace(" ","_"); if(!TableExists(tablename)) { - fprintf(stderr,"rddbmgr: missing CLK table for clock \"%s\"\n", + fprintf(stderr,"rddbmgr: missing CLK table for clock '%s'\n", (const char *)q->value(0).toString().toUtf8()); } else { @@ -7445,31 +7759,31 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) */ QList deleted_ids; sql=QString("select ")+ - "ID,"+ // 00 - "EVENT_NAME,"+ // 01 - "START_TIME,"+ // 02 - "LENGTH "+ // 03 + "`ID`,"+ // 00 + "`EVENT_NAME`,"+ // 01 + "`START_TIME`,"+ // 02 + "`LENGTH` "+ // 03 "from `"+tablename+"` "+ - "order by ID"; + "order by `ID`"; q1=new RDSqlQuery(sql); while(q1->next()) { sql=QString("select ")+ - "ID,"+ // 00 - "EVENT_NAME "+ // 01 + "`ID`,"+ // 00 + "`EVENT_NAME` "+ // 01 "from `"+tablename+"` where "+ - QString().sprintf("START_TIME=%d && ",q1->value(2).toInt())+ - QString().sprintf("ID!=%u ",q1->value(0).toUInt())+ - "order by ID"; + QString().sprintf("`START_TIME`=%d && ",q1->value(2).toInt())+ + QString().sprintf("`ID`!=%u ",q1->value(0).toUInt())+ + "order by `ID`"; q2=new RDSqlQuery(sql); while(q2->next()) { if(!deleted_ids.contains(q1->value(0).toUInt())) { fprintf(stderr, - "WARNING: deleted conflicting event \"%s\" from clock \"%s\"\n", - (const char *)q2->value(1).toString().toUtf8(), - (const char *)q->value(0).toString().toUtf8()); + "WARNING: deleted conflicting event '%s' from clock '%s'\n", + q2->value(1).toString().toUtf8().constData(), + q->value(0).toString().toUtf8().constData()); sql=QString("delete ")+ "from `"+tablename+"` where "+ - QString().sprintf("ID=%u",q2->value(0).toUInt()); + QString().sprintf("`ID`=%u",q2->value(0).toUInt()); RDSqlQuery::apply(sql); deleted_ids.push_back(q2->value(0).toUInt()); } @@ -7480,18 +7794,18 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) /* *** END OF HACK WARNING *** END OF HACK WARNING ***/ sql=QString("select ")+ - "EVENT_NAME,"+ // 00 - "START_TIME,"+ // 01 - "LENGTH "+ // 02 + "`EVENT_NAME`,"+ // 00 + "`START_TIME`,"+ // 01 + "`LENGTH` "+ // 02 "from `"+tablename+"` "+ - "order by START_TIME"; + "order by `START_TIME`"; q1=new RDSqlQuery(sql); while(q1->next()) { - sql=QString("insert into CLOCK_LINES set ")+ - "CLOCK_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - "EVENT_NAME=\""+RDEscapeString(q1->value(0).toString())+"\","+ - QString().sprintf("START_TIME=%d,",q1->value(1).toInt())+ - QString().sprintf("LENGTH=%d",q1->value(2).toInt()); + sql=QString("insert into `CLOCK_LINES` set ")+ + "`CLOCK_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + "`EVENT_NAME`='"+RDEscapeString(q1->value(0).toString())+"',"+ + QString().sprintf("`START_TIME`=%d,",q1->value(1).toInt())+ + QString().sprintf("`LENGTH`=%d",q1->value(2).toInt()); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -7505,11 +7819,11 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) delete q; sql=QString("show tables where ")+ - "Tables_in_"+db_config->mysqlDbname()+" like \"%_CLK\""; + "`Tables_in_"+db_config->mysqlDbname()+"` like '%_CLK'"; q=new RDSqlQuery(sql); while(q->next()) { if(DropTable(q->value(0).toString(),err_msg)) { - fprintf(stderr,"rddbmgr: dropping orphaned CLK table \"%s\"\n", + fprintf(stderr,"rddbmgr: dropping orphaned CLK table '%s'\n", q->value(0).toString().toUtf8().constData()); } } @@ -7519,51 +7833,51 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<292)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists RULE_LINES (")+ - "ID int unsigned auto_increment primary key,"+ - "CLOCK_NAME char(64) not null,"+ - "CODE varchar(10) not null,"+ - "MAX_ROW int unsigned,"+ - "MIN_WAIT int unsigned,"+ - "NOT_AFTER varchar(10),"+ - "OR_AFTER varchar(10),"+ - "OR_AFTER_II varchar(10),"+ - "unique index CLOCK_NAME_CODE_IDX(CLOCK_NAME,CODE))"+ + sql=QString("create table if not exists `RULE_LINES` (")+ + "`ID` int unsigned auto_increment primary key,"+ + "`CLOCK_NAME` char(64) not null,"+ + "`CODE` varchar(10) not null,"+ + "`MAX_ROW` int unsigned,"+ + "`MIN_WAIT` int unsigned,"+ + "`NOT_AFTER` varchar(10),"+ + "`OR_AFTER` varchar(10),"+ + "`OR_AFTER_II` varchar(10),"+ + "unique index `CLOCK_NAME_CODE_IDX` (`CLOCK_NAME`,`CODE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("select NAME from CLOCKS"); + sql=QString("select `NAME` from `CLOCKS`"); q=new RDSqlQuery(sql); while(q->next()) { QString tablename=q->value(0).toString()+"_RULES"; tablename.replace(" ","_"); if(!TableExists(tablename)) { - fprintf(stderr,"rddbmgr: missing RULES table for clock \"%s\"\n", + fprintf(stderr,"rddbmgr: missing RULES table for clock '%s'\n", (const char *)q->value(0).toString().toUtf8()); } else { sql=QString("select ")+ - "CODE,"+ // 00 - "MAX_ROW,"+ // 01 - "MIN_WAIT,"+ // 02 - "NOT_AFTER,"+ // 03 - "OR_AFTER,"+ // 04 - "OR_AFTER_II "+ // 05 + "`CODE`,"+ // 00 + "`MAX_ROW`,"+ // 01 + "`MIN_WAIT`,"+ // 02 + "`NOT_AFTER`,"+ // 03 + "`OR_AFTER`,"+ // 04 + "`OR_AFTER_II` "+ // 05 "from `"+tablename+"` "+ - "order by CODE"; + "order by `CODE`"; q1=new RDSqlQuery(sql); while(q1->next()) { - sql=QString("insert into RULE_LINES set ")+ - "CLOCK_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - "CODE=\""+RDEscapeString(q1->value(0).toString())+"\","+ - QString().sprintf("MAX_ROW=%u,",q1->value(1).toUInt())+ - QString().sprintf("MIN_WAIT=%u,",q1->value(2).toUInt())+ - "NOT_AFTER=\""+RDEscapeString(q1->value(3).toString())+"\","+ - "OR_AFTER=\""+RDEscapeString(q1->value(4).toString())+"\","+ - "OR_AFTER_II=\""+RDEscapeString(q1->value(5).toString())+"\""; + sql=QString("insert into `RULE_LINES` set ")+ + "`CLOCK_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + "`CODE`='"+RDEscapeString(q1->value(0).toString())+"',"+ + QString().sprintf("`MAX_ROW`=%u,",q1->value(1).toUInt())+ + QString().sprintf("`MIN_WAIT`=%u,",q1->value(2).toUInt())+ + "`NOT_AFTER`='"+RDEscapeString(q1->value(3).toString())+"',"+ + "`OR_AFTER`='"+RDEscapeString(q1->value(4).toString())+"',"+ + "`OR_AFTER_II`='"+RDEscapeString(q1->value(5).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -7577,11 +7891,11 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) delete q; sql=QString("show tables where ")+ - "Tables_in_"+db_config->mysqlDbname()+" like \"%_RULES\""; + "`Tables_in_"+db_config->mysqlDbname()+"` like '%_RULES'"; q=new RDSqlQuery(sql); while(q->next()) { if(DropTable(q->value(0).toString(),err_msg)) { - fprintf(stderr,"rddbmgr: dropping orphaned RULES table \"%s\"\n", + fprintf(stderr,"rddbmgr: dropping orphaned RULES table '%s'\n", q->value(0).toString().toUtf8().constData()); } } @@ -7591,22 +7905,22 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<293)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists STACK_LINES (")+ - "ID int unsigned not null auto_increment primary key,"+ - "SCHED_STACK_ID int unsigned not null,"+ - "SERVICE_NAME char(10) not null,"+ - "CART int unsigned not null,"+ - "ARTIST varchar(255),"+ - "SCHED_CODES varchar(255),"+ - "SCHEDULED_AT datetime default '1752-09-14 00:00:00',"+ - "index SERVICE_NAME_IDX(SERVICE_NAME),"+ - "index SCHED_STACK_ID_IDX(SERVICE_NAME,SCHED_STACK_ID,SCHED_CODES))"+ + sql=QString("create table if not exists `STACK_LINES` (")+ + "`ID` int unsigned not null auto_increment primary key,"+ + "`SCHED_STACK_ID` int unsigned not null,"+ + "`SERVICE_NAME` char(10) not null,"+ + "`CART` int unsigned not null,"+ + "`ARTIST` varchar(255),"+ + "`SCHED_CODES` varchar(255),"+ + "`SCHEDULED_AT` datetime default '1752-09-14 00:00:00',"+ + "index `SERVICE_NAME_IDX` (`SERVICE_NAME`),"+ + "index `SCHED_STACK_ID_IDX` (`SERVICE_NAME`,`SCHED_STACK_ID`,`SCHED_CODES`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("select NAME from SERVICES"); + sql=QString("select `NAME` from `SERVICES`"); q=new RDSqlQuery(sql,false); while(q->next()) { QString tablename=q->value(0).toString()+"_STACK"; @@ -7617,29 +7931,29 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // 9/14/1752 is the earliest valid QDate // sql=QString("update `")+tablename+"` set "+ - "SCHEDULED_AT=\"1752-09-14 00:00:00\" where "+ - "SCHEDULED_AT<\"1752-09-14 00:00:00\""; + "`SCHEDULED_AT`='1752-09-14 00:00:00' where "+ + "`SCHEDULED_AT`<'1752-09-14 00:00:00'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("select ")+ - "SCHED_STACK_ID,"+ // 00 - "CART,"+ // 01 - "ARTIST,"+ // 02 - "SCHED_CODES,"+ // 03 - "SCHEDULED_AT "+ // 04 + "`SCHED_STACK_ID`,"+ // 00 + "`CART`,"+ // 01 + "`ARTIST`,"+ // 02 + "`SCHED_CODES`,"+ // 03 + "`SCHEDULED_AT` "+ // 04 "from `"+tablename+"` "+ - "order by SCHEDULED_AT"; + "order by `SCHEDULED_AT`"; q1=new RDSqlQuery(sql,false); while(q1->next()) { - sql=QString("insert into STACK_LINES set ")+ - "SERVICE_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - QString().sprintf("SCHED_STACK_ID=%u,",q1->value(0).toUInt())+ - QString().sprintf("CART=%u,",q1->value(1).toUInt())+ - "ARTIST=\""+RDEscapeString(q1->value(2).toString())+"\","+ - "SCHED_CODES=\""+RDEscapeString(q1->value(3).toString())+"\","+ - "SCHEDULED_AT=\""+RDEscapeString(q1->value(4).toDateTime(). - toString("yyyy-MM-dd hh:mm:ss"))+"\""; + sql=QString("insert into `STACK_LINES` set ")+ + "`SERVICE_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + QString().sprintf("`SCHED_STACK_ID`=%u,",q1->value(0).toUInt())+ + QString().sprintf("`CART`=%u,",q1->value(1).toUInt())+ + "`ARTIST`='"+RDEscapeString(q1->value(2).toString())+"',"+ + "`SCHED_CODES`='"+RDEscapeString(q1->value(3).toString())+"',"+ + "`SCHEDULED_AT`='"+RDEscapeString(q1->value(4).toDateTime(). + toString("yyyy-MM-dd hh:mm:ss"))+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -7653,11 +7967,11 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) delete q; sql=QString("show tables where ")+ - "Tables_in_"+db_config->mysqlDbname()+" like \"%_STACK\""; + "`Tables_in_"+db_config->mysqlDbname()+"` like '%_STACK'"; q=new RDSqlQuery(sql); while(q->next()) { if(DropTable(q->value(0).toString(),err_msg)) { - fprintf(stderr,"rddbmgr: dropping orphaned STACK table \"%s\"\n", + fprintf(stderr,"rddbmgr: dropping orphaned STACK table '%s'\n", q->value(0).toString().toUtf8().constData()); } } @@ -7667,43 +7981,43 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<294)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists CAST_DOWNLOADS (")+ - "ID int unsigned not null auto_increment primary key,"+ - "FEED_KEY_NAME char(8) not null,"+ - "CAST_ID int unsigned not null,"+ - "ACCESS_DATE date not null,"+ - "ACCESS_COUNT int unsigned not null default 0,"+ - "unique index KEY_NAME_CAST_ID_DATE_IDX(FEED_KEY_NAME,CAST_ID,ACCESS_DATE))"+ + sql=QString("create table if not exists `CAST_DOWNLOADS` (")+ + "`ID` int unsigned not null auto_increment primary key,"+ + "`FEED_KEY_NAME` char(8) not null,"+ + "`CAST_ID` int unsigned not null,"+ + "`ACCESS_DATE` date not null,"+ + "`ACCESS_COUNT` int unsigned not null default 0,"+ + "unique index `KEY_NAME_CAST_ID_DATE_IDX` (`FEED_KEY_NAME`,`CAST_ID`,`ACCESS_DATE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("select KEY_NAME from FEEDS"); + sql=QString("select `KEY_NAME` from `FEEDS`"); q=new RDSqlQuery(sql,false); while(q->next()) { QString tablename=q->value(0).toString()+"_FLG"; tablename.replace(" ","_"); if(!TableExists(tablename)) { - fprintf(stderr,"rddbmgr: missing FLG table for feed \"%s\"\n", + fprintf(stderr,"rddbmgr: missing FLG table for feed '%s'\n", (const char *)q->value(0).toString().toUtf8()); } else { sql=QString("select ")+ - "CAST_ID,"+ // 00 - "ACCESS_DATE,"+ // 01 - "ACCESS_COUNT "+ // 02 + "`CAST_ID`,"+ // 00 + "`ACCESS_DATE`,"+ // 01 + "`ACCESS_COUNT` "+ // 02 "from `"+tablename+"` "+ - "order by ACCESS_DATE"; + "order by `ACCESS_DATE`"; q1=new RDSqlQuery(sql,false); while(q1->next()) { - sql=QString("insert into CAST_DOWNLOADS set ")+ - "FEED_KEY_NAME=\""+RDEscapeString(q->value(0).toString())+"\","+ - QString().sprintf("CAST_ID=%u,",q1->value(0).toUInt())+ - "ACCESS_DATE=\""+ - RDEscapeString(q1->value(1).toDate().toString("yyyy-MM-dd"))+"\","+ - QString().sprintf("ACCESS_COUNT=%u",q1->value(2).toUInt()); + sql=QString("insert into `CAST_DOWNLOADS` set ")+ + "`FEED_KEY_NAME`='"+RDEscapeString(q->value(0).toString())+"',"+ + QString().sprintf("`CAST_ID`=%u,",q1->value(0).toUInt())+ + "`ACCESS_DATE`='"+ + RDEscapeString(q1->value(1).toDate().toString("yyyy-MM-dd"))+"',"+ + QString().sprintf("`ACCESS_COUNT`=%u",q1->value(2).toUInt()); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -7720,29 +8034,29 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<295)&&(set_schema>cur_schema)) { - sql=QString("create table IMPORTER_LINES (")+ - "ID int not null primary key auto_increment,"+ - "STATION_NAME char(64) not null,"+ - "PROCESS_ID int unsigned not null," - "LINE_ID int unsigned not null,"+ - "START_HOUR int not null,"+ - "START_SECS int not null,"+ - "CART_NUMBER int unsigned,"+ - "TITLE char(255),"+ - "LENGTH int,"+ - "INSERT_BREAK enum('N','Y') default 'N',"+ - "INSERT_TRACK enum('N','Y') default 'N',"+ - "INSERT_FIRST int unsigned default 0,"+ - "TRACK_STRING char(255),"+ - "EXT_DATA char(32),"+ - "EXT_EVENT_ID char(32),"+ - "EXT_ANNC_TYPE char(8),"+ - "EXT_CART_NAME char(32),"+ - "LINK_START_TIME time default NULL,"+ - "LINK_LENGTH int default NULL,"+ - "EVENT_USED enum('N','Y') default 'N',"+ - "index STATION_NAME_PROCESS_ID_IDX (STATION_NAME,PROCESS_ID),"+ - "unique index START_TIME_IDX (STATION_NAME,PROCESS_ID,START_HOUR,START_SECS,LINE_ID)) "+ + sql=QString("create table `IMPORTER_LINES` (")+ + "`ID` int not null primary key auto_increment,"+ + "`STATION_NAME` char(64) not null,"+ + "`PROCESS_ID` int unsigned not null," + "`LINE_ID` int unsigned not null,"+ + "`START_HOUR` int not null,"+ + "`START_SECS` int not null,"+ + "`CART_NUMBER` int unsigned,"+ + "`TITLE` char(255),"+ + "`LENGTH` int,"+ + "`INSERT_BREAK` enum('N','Y') default 'N',"+ + "`INSERT_TRACK` enum('N','Y') default 'N',"+ + "`INSERT_FIRST` int unsigned default 0,"+ + "`TRACK_STRING` char(255),"+ + "`EXT_DATA` char(32),"+ + "`EXT_EVENT_ID` char(32),"+ + "`EXT_ANNC_TYPE` char(8),"+ + "`EXT_CART_NAME` char(32),"+ + "`LINK_START_TIME` time default NULL,"+ + "`LINK_LENGTH` int default NULL,"+ + "`EVENT_USED` enum('N','Y') default 'N',"+ + "index `STATION_NAME_PROCESS_ID_IDX` (`STATION_NAME`,`PROCESS_ID`),"+ + "unique index `START_TIME_IDX` (`STATION_NAME`,`PROCESS_ID`,`START_HOUR`,`START_SECS`,`LINE_ID`)) "+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -7760,1772 +8074,1772 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<297)&&(set_schema>cur_schema)) { - sql=QString("alter table AUDIO_CARDS ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `AUDIO_CARDS` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table AUDIO_CARDS ")+ - "modify column NAME varchar(64)"; + sql=QString("alter table `AUDIO_CARDS` ")+ + "modify column `NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table AUDIO_INPUTS ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `AUDIO_INPUTS` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table AUDIO_OUTPUTS ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `AUDIO_OUTPUTS` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table AUDIO_PERMS ")+ - "modify column GROUP_NAME varchar(10)"; + sql=QString("alter table `AUDIO_PERMS` ")+ + "modify column `GROUP_NAME` varchar(10)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table AUDIO_PERMS ")+ - "modify column SERVICE_NAME varchar(10)"; + sql=QString("alter table `AUDIO_PERMS` ")+ + "modify column `SERVICE_NAME` varchar(10)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table AUTOFILLS ")+ - "modify column SERVICE varchar(10)"; + sql=QString("alter table `AUTOFILLS` ")+ + "modify column `SERVICE` varchar(10)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table AUX_METADATA ")+ - "modify column VAR_NAME varchar(16)"; + sql=QString("alter table `AUX_METADATA` ")+ + "modify column `VAR_NAME` varchar(16)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table AUX_METADATA ")+ - "modify column CAPTION varchar(64)"; + sql=QString("alter table `AUX_METADATA` ")+ + "modify column `CAPTION` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CART ")+ - "modify column GROUP_NAME varchar(10) not null"; + sql=QString("alter table `CART` ")+ + "modify column `GROUP_NAME` varchar(10) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CART ")+ - "modify column TITLE varchar(191)"; + sql=QString("alter table `CART` ")+ + "modify column `TITLE` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CART ")+ - "modify column ARTIST varchar(191)"; + sql=QString("alter table `CART` ")+ + "modify column `ARTIST` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CART ")+ - "modify column ALBUM varchar(191)"; + sql=QString("alter table `CART` ")+ + "modify column `ALBUM` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CART ")+ - "modify column CONDUCTOR varchar(64)"; + sql=QString("alter table `CART` ")+ + "modify column `CONDUCTOR` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CART ")+ - "modify column LABEL varchar(64)"; + sql=QString("alter table `CART` ")+ + "modify column `LABEL` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CART ")+ - "modify column CLIENT varchar(64)"; + sql=QString("alter table `CART` ")+ + "modify column `CLIENT` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CART ")+ - "modify column AGENCY varchar(64)"; + sql=QString("alter table `CART` ")+ + "modify column `AGENCY` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CART ")+ - "modify column PUBLISHER varchar(64)"; + sql=QString("alter table `CART` ")+ + "modify column `PUBLISHER` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CART ")+ - "modify column COMPOSER varchar(64)"; + sql=QString("alter table `CART` ")+ + "modify column `COMPOSER` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CART ")+ - "modify column USER_DEFINED varchar(191)"; + sql=QString("alter table `CART` ")+ + "modify column `USER_DEFINED` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CART ")+ - "modify column SONG_ID varchar(32)"; + sql=QString("alter table `CART` ")+ + "modify column `SONG_ID` varchar(32)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CART ")+ - "modify column OWNER varchar(64)"; + sql=QString("alter table `CART` ")+ + "modify column `OWNER` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CART ")+ - "modify column PENDING_STATION varchar(64)"; + sql=QString("alter table `CART` ")+ + "modify column `PENDING_STATION` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CARTSLOTS ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `CARTSLOTS` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CARTSLOTS ")+ - "modify column SERVICE_NAME varchar(10)"; + sql=QString("alter table `CARTSLOTS` ")+ + "modify column `SERVICE_NAME` varchar(10)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CAST_DOWNLOADS ")+ - "modify column FEED_KEY_NAME varchar(8) not null"; + sql=QString("alter table `CAST_DOWNLOADS` ")+ + "modify column `FEED_KEY_NAME` varchar(8) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CLIPBOARD ")+ - "modify column CUT_NAME varchar(12) not null"; + sql=QString("alter table `CLIPBOARD` ")+ + "modify column `CUT_NAME` varchar(12) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CLIPBOARD ")+ - "modify column DESCRIPTION varchar(64)"; + sql=QString("alter table `CLIPBOARD` ")+ + "modify column `DESCRIPTION` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CLIPBOARD ")+ - "modify column OUTCUE varchar(64)"; + sql=QString("alter table `CLIPBOARD` ")+ + "modify column `OUTCUE` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CLIPBOARD ")+ - "modify column ORIGIN_NAME varchar(64)"; + sql=QString("alter table `CLIPBOARD` ")+ + "modify column `ORIGIN_NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CLOCKS ")+ - "modify column NAME varchar(64) not null"; + sql=QString("alter table `CLOCKS` ")+ + "modify column `NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CLOCKS ")+ - "modify column SHORT_NAME varchar(8)"; + sql=QString("alter table `CLOCKS` ")+ + "modify column `SHORT_NAME` varchar(8)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CLOCKS ")+ - "modify column COLOR varchar(7)"; + sql=QString("alter table `CLOCKS` ")+ + "modify column `COLOR` varchar(7)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CLOCKS ")+ - "modify column REMARKS text"; + sql=QString("alter table `CLOCKS` ")+ + "modify column `REMARKS` text"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CLOCK_LINES ")+ - "modify column CLOCK_NAME varchar(64) not null"; + sql=QString("alter table `CLOCK_LINES` ")+ + "modify column `CLOCK_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CLOCK_LINES ")+ - "modify column EVENT_NAME varchar(64) not null"; + sql=QString("alter table `CLOCK_LINES` ")+ + "modify column `EVENT_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CLOCK_PERMS ")+ - "modify column CLOCK_NAME varchar(64) not null"; + sql=QString("alter table `CLOCK_PERMS` ")+ + "modify column `CLOCK_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CLOCK_PERMS ")+ - "modify column SERVICE_NAME varchar(10) not null"; + sql=QString("alter table `CLOCK_PERMS` ")+ + "modify column `SERVICE_NAME` varchar(10) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CUTS ")+ - "modify column CUT_NAME varchar(12) not null"; + sql=QString("alter table `CUTS` ")+ + "modify column `CUT_NAME` varchar(12) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CUTS ")+ - "modify column DESCRIPTION varchar(64)"; + sql=QString("alter table `CUTS` ")+ + "modify column `DESCRIPTION` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CUTS ")+ - "modify column OUTCUE varchar(64)"; + sql=QString("alter table `CUTS` ")+ + "modify column `OUTCUE` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CUTS ")+ - "modify column ISRC varchar(12)"; + sql=QString("alter table `CUTS` ")+ + "modify column `ISRC` varchar(12)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CUTS ")+ - "modify column ISCI varchar(32)"; + sql=QString("alter table `CUTS` ")+ + "modify column `ISCI` varchar(32)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CUTS ")+ - "modify column SHA1_HASH varchar(40)"; + sql=QString("alter table `CUTS` ")+ + "modify column `SHA1_HASH` varchar(40)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CUTS ")+ - "modify column ORIGIN_NAME varchar(64)"; + sql=QString("alter table `CUTS` ")+ + "modify column `ORIGIN_NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CUTS ")+ - "modify column ORIGIN_LOGIN_NAME varchar(191)"; + sql=QString("alter table `CUTS` ")+ + "modify column `ORIGIN_LOGIN_NAME` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CUTS ")+ - "modify column SOURCE_HOSTNAME varchar(191)"; + sql=QString("alter table `CUTS` ")+ + "modify column `SOURCE_HOSTNAME` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CUT_EVENTS ")+ - "modify column CUT_NAME varchar(12) not null"; + sql=QString("alter table `CUT_EVENTS` ")+ + "modify column `CUT_NAME` varchar(12) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table DECKS ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `DECKS` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table DECKS ")+ - "modify column SWITCH_STATION varchar(64)"; + sql=QString("alter table `DECKS` ")+ + "modify column `SWITCH_STATION` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table DECK_EVENTS ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `DECK_EVENTS` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table DROPBOXES ")+ - "modify column STATION_NAME varchar(64)"; + sql=QString("alter table `DROPBOXES` ")+ + "modify column `STATION_NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table DROPBOXES ")+ - "modify column GROUP_NAME varchar(10)"; + sql=QString("alter table `DROPBOXES` ")+ + "modify column `GROUP_NAME` varchar(10)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table DROPBOXES ")+ - "modify column PATH varchar(191)"; + sql=QString("alter table `DROPBOXES` ")+ + "modify column `PATH` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table DROPBOXES ")+ - "modify column METADATA_PATTERN varchar(64)"; + sql=QString("alter table `DROPBOXES` ")+ + "modify column `METADATA_PATTERN` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table DROPBOXES ")+ - "modify column LOG_PATH varchar(191)"; + sql=QString("alter table `DROPBOXES` ")+ + "modify column `LOG_PATH` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table DROPBOXES ")+ - "modify column SET_USER_DEFINED varchar(191)"; + sql=QString("alter table `DROPBOXES` ")+ + "modify column `SET_USER_DEFINED` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table DROPBOX_PATHS ")+ - "modify column FILE_PATH varchar(191) not null"; + sql=QString("alter table `DROPBOX_PATHS` ")+ + "modify column `FILE_PATH` varchar(191) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table DROPBOX_SCHED_CODES ")+ - "modify column SCHED_CODE varchar(11) not null"; + sql=QString("alter table `DROPBOX_SCHED_CODES` ")+ + "modify column `SCHED_CODE` varchar(11) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ELR_LINES ")+ - "modify column SERVICE_NAME varchar(10) not null"; + sql=QString("alter table `ELR_LINES` ")+ + "modify column `SERVICE_NAME` varchar(10) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ELR_LINES ")+ - "modify column LOG_NAME varchar(64)"; + sql=QString("alter table `ELR_LINES` ")+ + "modify column `LOG_NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ELR_LINES ")+ - "modify column TITLE varchar(191)"; + sql=QString("alter table `ELR_LINES` ")+ + "modify column `TITLE` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ELR_LINES ")+ - "modify column ARTIST varchar(191)"; + sql=QString("alter table `ELR_LINES` ")+ + "modify column `ARTIST` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ELR_LINES ")+ - "modify column PUBLISHER varchar(64)"; + sql=QString("alter table `ELR_LINES` ")+ + "modify column `PUBLISHER` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ELR_LINES ")+ - "modify column COMPOSER varchar(64)"; + sql=QString("alter table `ELR_LINES` ")+ + "modify column `COMPOSER` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ELR_LINES ")+ - "modify column USER_DEFINED varchar(191)"; + sql=QString("alter table `ELR_LINES` ")+ + "modify column `USER_DEFINED` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ELR_LINES ")+ - "modify column SONG_ID varchar(32)"; + sql=QString("alter table `ELR_LINES` ")+ + "modify column `SONG_ID` varchar(32)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ELR_LINES ")+ - "modify column ALBUM varchar(191)"; + sql=QString("alter table `ELR_LINES` ")+ + "modify column `ALBUM` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ELR_LINES ")+ - "modify column LABEL varchar(64)"; + sql=QString("alter table `ELR_LINES` ")+ + "modify column `LABEL` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ELR_LINES ")+ - "modify column CONDUCTOR varchar(64)"; + sql=QString("alter table `ELR_LINES` ")+ + "modify column `CONDUCTOR` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ELR_LINES ")+ - "modify column DESCRIPTION varchar(64)"; + sql=QString("alter table `ELR_LINES` ")+ + "modify column `DESCRIPTION` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ELR_LINES ")+ - "modify column OUTCUE varchar(64)"; + sql=QString("alter table `ELR_LINES` ")+ + "modify column `OUTCUE` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ELR_LINES ")+ - "modify column ISRC varchar(12)"; + sql=QString("alter table `ELR_LINES` ")+ + "modify column `ISRC` varchar(12)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ELR_LINES ")+ - "modify column ISCI varchar(32)"; + sql=QString("alter table `ELR_LINES` ")+ + "modify column `ISCI` varchar(32)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ELR_LINES ")+ - "modify column STATION_NAME varchar(64)"; + sql=QString("alter table `ELR_LINES` ")+ + "modify column `STATION_NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ELR_LINES ")+ - "modify column EXT_CART_NAME varchar(32)"; + sql=QString("alter table `ELR_LINES` ")+ + "modify column `EXT_CART_NAME` varchar(32)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ELR_LINES ")+ - "modify column EXT_DATA varchar(32)"; + sql=QString("alter table `ELR_LINES` ")+ + "modify column `EXT_DATA` varchar(32)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ELR_LINES ")+ - "modify column EXT_EVENT_ID varchar(8)"; + sql=QString("alter table `ELR_LINES` ")+ + "modify column `EXT_EVENT_ID` varchar(8)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ELR_LINES ")+ - "modify column EXT_ANNC_TYPE varchar(8)"; + sql=QString("alter table `ELR_LINES` ")+ + "modify column `EXT_ANNC_TYPE` varchar(8)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ENCODERS ")+ - "modify column NAME varchar(32) not null"; + sql=QString("alter table `ENCODERS` ")+ + "modify column `NAME` varchar(32) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ENCODERS ")+ - "modify column STATION_NAME varchar(64)"; + sql=QString("alter table `ENCODERS` ")+ + "modify column `STATION_NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ENCODERS ")+ - "modify column COMMAND_LINE varchar(191)"; + sql=QString("alter table `ENCODERS` ")+ + "modify column `COMMAND_LINE` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ENCODERS ")+ - "modify column DEFAULT_EXTENSION varchar(16)"; + sql=QString("alter table `ENCODERS` ")+ + "modify column `DEFAULT_EXTENSION` varchar(16)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table EVENTS ")+ - "modify column NAME varchar(64) not null"; + sql=QString("alter table `EVENTS` ")+ + "modify column `NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table EVENTS ")+ - "modify column PROPERTIES varchar(64)"; + sql=QString("alter table `EVENTS` ")+ + "modify column `PROPERTIES` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table EVENTS ")+ - "modify column DISPLAY_TEXT varchar(64)"; + sql=QString("alter table `EVENTS` ")+ + "modify column `DISPLAY_TEXT` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table EVENTS ")+ - "modify column NOTE_TEXT varchar(191)"; + sql=QString("alter table `EVENTS` ")+ + "modify column `NOTE_TEXT` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table EVENTS ")+ - "modify column COLOR varchar(7)"; + sql=QString("alter table `EVENTS` ")+ + "modify column `COLOR` varchar(7)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table EVENTS ")+ - "modify column SCHED_GROUP varchar(10)"; + sql=QString("alter table `EVENTS` ")+ + "modify column `SCHED_GROUP` varchar(10)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table EVENTS ")+ - "modify column HAVE_CODE varchar(10)"; + sql=QString("alter table `EVENTS` ")+ + "modify column `HAVE_CODE` varchar(10)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table EVENTS ")+ - "modify column HAVE_CODE2 varchar(10)"; + sql=QString("alter table `EVENTS` ")+ + "modify column `HAVE_CODE2` varchar(10)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table EVENTS ")+ - "modify column NESTED_EVENT varchar(64)"; + sql=QString("alter table `EVENTS` ")+ + "modify column `NESTED_EVENT` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table EVENTS ")+ - "modify column REMARKS text"; + sql=QString("alter table `EVENTS` ")+ + "modify column `REMARKS` text"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table EVENT_LINES ")+ - "modify column EVENT_NAME varchar(64) not null"; + sql=QString("alter table `EVENT_LINES` ")+ + "modify column `EVENT_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table EVENT_LINES ")+ - "modify column MARKER_COMMENT varchar(191)"; + sql=QString("alter table `EVENT_LINES` ")+ + "modify column `MARKER_COMMENT` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table EVENT_PERMS ")+ - "modify column EVENT_NAME varchar(64)"; + sql=QString("alter table `EVENT_PERMS` ")+ + "modify column `EVENT_NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table EVENT_PERMS ")+ - "modify column SERVICE_NAME varchar(10)"; + sql=QString("alter table `EVENT_PERMS` ")+ + "modify column `SERVICE_NAME` varchar(10)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table EXTENDED_PANELS ")+ - "modify column OWNER varchar(64) not null"; + sql=QString("alter table `EXTENDED_PANELS` ")+ + "modify column `OWNER` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table EXTENDED_PANELS ")+ - "modify column LABEL varchar(64)"; + sql=QString("alter table `EXTENDED_PANELS` ")+ + "modify column `LABEL` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table EXTENDED_PANELS ")+ - "modify column DEFAULT_COLOR varchar(7)"; + sql=QString("alter table `EXTENDED_PANELS` ")+ + "modify column `DEFAULT_COLOR` varchar(7)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table EXTENDED_PANEL_NAMES ")+ - "modify column OWNER varchar(64) not null"; + sql=QString("alter table `EXTENDED_PANEL_NAMES` ")+ + "modify column `OWNER` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table EXTENDED_PANEL_NAMES ")+ - "modify column NAME varchar(64)"; + sql=QString("alter table `EXTENDED_PANEL_NAMES` ")+ + "modify column `NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEEDS ")+ - "modify column KEY_NAME varchar(8) not null"; + sql=QString("alter table `FEEDS` ")+ + "modify column `KEY_NAME` varchar(8) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEEDS ")+ - "modify column CHANNEL_TITLE varchar(191)"; + sql=QString("alter table `FEEDS` ")+ + "modify column `CHANNEL_TITLE` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEEDS ")+ - "modify column CHANNEL_DESCRIPTION text"; + sql=QString("alter table `FEEDS` ")+ + "modify column `CHANNEL_DESCRIPTION` text"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEEDS ")+ - "modify column CHANNEL_CATEGORY varchar(64)"; + sql=QString("alter table `FEEDS` ")+ + "modify column `CHANNEL_CATEGORY` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEEDS ")+ - "modify column CHANNEL_LINK varchar(191)"; + sql=QString("alter table `FEEDS` ")+ + "modify column `CHANNEL_LINK` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEEDS ")+ - "modify column CHANNEL_COPYRIGHT varchar(64)"; + sql=QString("alter table `FEEDS` ")+ + "modify column `CHANNEL_COPYRIGHT` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEEDS ")+ - "modify column CHANNEL_WEBMASTER varchar(64)"; + sql=QString("alter table `FEEDS` ")+ + "modify column `CHANNEL_WEBMASTER` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEEDS ")+ - "modify column CHANNEL_LANGUAGE varchar(5) default \"en-us\""; + sql=QString("alter table `FEEDS` ")+ + "modify column `CHANNEL_LANGUAGE` varchar(5) default 'en-us'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEEDS ")+ - "modify column BASE_URL varchar(191)"; + sql=QString("alter table `FEEDS` ")+ + "modify column `BASE_URL` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEEDS ")+ - "modify column BASE_PREAMBLE varchar(191)"; + sql=QString("alter table `FEEDS` ")+ + "modify column `BASE_PREAMBLE` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEEDS ")+ - "modify column PURGE_URL varchar(191)"; + sql=QString("alter table `FEEDS` ")+ + "modify column `PURGE_URL` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEEDS ")+ - "modify column PURGE_USERNAME varchar(64)"; + sql=QString("alter table `FEEDS` ")+ + "modify column `PURGE_USERNAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEEDS ")+ - "modify column PURGE_PASSWORD varchar(64)"; + sql=QString("alter table `FEEDS` ")+ + "modify column `PURGE_PASSWORD` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEEDS ")+ - "modify column UPLOAD_EXTENSION varchar(16) default \"mp3\""; + sql=QString("alter table `FEEDS` ")+ + "modify column `UPLOAD_EXTENSION` varchar(16) default 'mp3'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEEDS ")+ - "modify column REDIRECT_PATH varchar(191)"; + sql=QString("alter table `FEEDS` ")+ + "modify column `REDIRECT_PATH` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEED_PERMS ")+ - "modify column USER_NAME varchar(191)"; + sql=QString("alter table `FEED_PERMS` ")+ + "modify column `USER_NAME` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEED_PERMS ")+ - "modify column KEY_NAME varchar(8)"; + sql=QString("alter table `FEED_PERMS` ")+ + "modify column `KEY_NAME` varchar(8)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table GPIO_EVENTS ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `GPIO_EVENTS` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table GPIS ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `GPIS` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table GPOS ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `GPOS` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table GROUPS ")+ - "modify column NAME varchar(10) not null"; + sql=QString("alter table `GROUPS` ")+ + "modify column `NAME` varchar(10) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table GROUPS ")+ - "modify column DESCRIPTION varchar(191)"; + sql=QString("alter table `GROUPS` ")+ + "modify column `DESCRIPTION` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table GROUPS ")+ - "modify column DEFAULT_TITLE varchar(191) default 'Imported from %f.%e'"; + sql=QString("alter table `GROUPS` ")+ + "modify column `DEFAULT_TITLE` varchar(191) default 'Imported from %f.%e'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table GROUPS ")+ - "modify column COLOR varchar(7)"; + sql=QString("alter table `GROUPS` ")+ + "modify column `COLOR` varchar(7)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table HOSTVARS ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `HOSTVARS` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table HOSTVARS ")+ - "modify column NAME varchar(32) not null"; + sql=QString("alter table `HOSTVARS` ")+ + "modify column `NAME` varchar(32) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table HOSTVARS ")+ - "modify column VARVALUE varchar(191)"; + sql=QString("alter table `HOSTVARS` ")+ + "modify column `VARVALUE` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table HOSTVARS ")+ - "modify column REMARK varchar(191)"; + sql=QString("alter table `HOSTVARS` ")+ + "modify column `REMARK` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table IMPORTER_LINES ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `IMPORTER_LINES` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table IMPORTER_LINES ")+ - "modify column TITLE varchar(191)"; + sql=QString("alter table `IMPORTER_LINES` ")+ + "modify column `TITLE` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table IMPORTER_LINES ")+ - "modify column TRACK_STRING varchar(191)"; + sql=QString("alter table `IMPORTER_LINES` ")+ + "modify column `TRACK_STRING` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table IMPORTER_LINES ")+ - "modify column EXT_DATA varchar(32)"; + sql=QString("alter table `IMPORTER_LINES` ")+ + "modify column `EXT_DATA` varchar(32)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table IMPORTER_LINES ")+ - "modify column EXT_EVENT_ID varchar(32)"; + sql=QString("alter table `IMPORTER_LINES` ")+ + "modify column `EXT_EVENT_ID` varchar(32)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table IMPORTER_LINES ")+ - "modify column EXT_ANNC_TYPE varchar(8)"; + sql=QString("alter table `IMPORTER_LINES` ")+ + "modify column `EXT_ANNC_TYPE` varchar(8)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table IMPORTER_LINES ")+ - "modify column EXT_CART_NAME varchar(32)"; + sql=QString("alter table `IMPORTER_LINES` ")+ + "modify column `EXT_CART_NAME` varchar(32)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table IMPORT_TEMPLATES ")+ - "modify column NAME varchar(64) not null"; + sql=QString("alter table `IMPORT_TEMPLATES` ")+ + "modify column `NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table INPUTS ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `INPUTS` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table INPUTS ")+ - "modify column NAME varchar(64)"; + sql=QString("alter table `INPUTS` ")+ + "modify column `NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table INPUTS ")+ - "modify column FEED_NAME varchar(8)"; + sql=QString("alter table `INPUTS` ")+ + "modify column `FEED_NAME` varchar(8)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table INPUTS ")+ - "modify column NODE_HOSTNAME varchar(176)"; + sql=QString("alter table `INPUTS` ")+ + "modify column `NODE_HOSTNAME` varchar(176)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ISCI_XREFERENCE ")+ - "modify column ISCI varchar(32) not null"; + sql=QString("alter table `ISCI_XREFERENCE` ")+ + "modify column `ISCI` varchar(32) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ISCI_XREFERENCE ")+ - "modify column FILENAME varchar(64) not null"; + sql=QString("alter table `ISCI_XREFERENCE` ")+ + "modify column `FILENAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ISCI_XREFERENCE ")+ - "modify column TYPE varchar(1) not null"; + sql=QString("alter table `ISCI_XREFERENCE` ")+ + "modify column `TYPE` varchar(1) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ISCI_XREFERENCE ")+ - "modify column ADVERTISER_NAME varchar(30)"; + sql=QString("alter table `ISCI_XREFERENCE` ")+ + "modify column `ADVERTISER_NAME` varchar(30)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ISCI_XREFERENCE ")+ - "modify column PRODUCT_NAME varchar(35)"; + sql=QString("alter table `ISCI_XREFERENCE` ")+ + "modify column `PRODUCT_NAME` varchar(35)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ISCI_XREFERENCE ")+ - "modify column CREATIVE_TITLE varchar(30)"; + sql=QString("alter table `ISCI_XREFERENCE` ")+ + "modify column `CREATIVE_TITLE` varchar(30)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table ISCI_XREFERENCE ")+ - "modify column REGION_NAME varchar(80)"; + sql=QString("alter table `ISCI_XREFERENCE` ")+ + "modify column `REGION_NAME` varchar(80)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table JACK_CLIENTS ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `JACK_CLIENTS` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table JACK_CLIENTS ")+ - "modify column DESCRIPTION varchar(64)"; + sql=QString("alter table `JACK_CLIENTS` ")+ + "modify column `DESCRIPTION` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table JACK_CLIENTS ")+ - "modify column COMMAND_LINE text"; + sql=QString("alter table `JACK_CLIENTS` ")+ + "modify column `COMMAND_LINE` text"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LIVEWIRE_GPIO_SLOTS ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `LIVEWIRE_GPIO_SLOTS` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LIVEWIRE_GPIO_SLOTS ")+ - "modify column IP_ADDRESS varchar(15)"; + sql=QString("alter table `LIVEWIRE_GPIO_SLOTS` ")+ + "modify column `IP_ADDRESS` varchar(15)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOGS ")+ - "modify column NAME varchar(64) not null"; + sql=QString("alter table `LOGS` ")+ + "modify column `NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOGS ")+ - "modify column SERVICE varchar(10) not null"; + sql=QString("alter table `LOGS` ")+ + "modify column `SERVICE` varchar(10) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOGS ")+ - "modify column DESCRIPTION varchar(64)"; + sql=QString("alter table `LOGS` ")+ + "modify column `DESCRIPTION` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOGS ")+ - "modify column ORIGIN_USER varchar(191) not null"; + sql=QString("alter table `LOGS` ")+ + "modify column `ORIGIN_USER` varchar(191) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOGS ")+ - "modify column LOCK_USER_NAME varchar(191)"; + sql=QString("alter table `LOGS` ")+ + "modify column `LOCK_USER_NAME` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOGS ")+ - "modify column LOCK_STATION_NAME varchar(64)"; + sql=QString("alter table `LOGS` ")+ + "modify column `LOCK_STATION_NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOGS ")+ - "modify column LOCK_IPV4_ADDRESS varchar(16)"; + sql=QString("alter table `LOGS` ")+ + "modify column `LOCK_IPV4_ADDRESS` varchar(16)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOGS ")+ - "modify column LOCK_GUID varchar(82)"; + sql=QString("alter table `LOGS` ")+ + "modify column `LOCK_GUID` varchar(82)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOG_LINES ")+ - "modify column LOG_NAME varchar(64) not null"; + sql=QString("alter table `LOG_LINES` ")+ + "modify column `LOG_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOG_LINES ")+ - "modify column COMMENT varchar(191)"; + sql=QString("alter table `LOG_LINES` ")+ + "modify column `COMMENT` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOG_LINES ")+ - "modify column LABEL varchar(64)"; + sql=QString("alter table `LOG_LINES` ")+ + "modify column `LABEL` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOG_LINES ")+ - "modify column ORIGIN_USER varchar(191)"; + sql=QString("alter table `LOG_LINES` ")+ + "modify column `ORIGIN_USER` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOG_LINES ")+ - "modify column LINK_EVENT_NAME varchar(64)"; + sql=QString("alter table `LOG_LINES` ")+ + "modify column `LINK_EVENT_NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOG_LINES ")+ - "modify column EXT_CART_NAME varchar(32)"; + sql=QString("alter table `LOG_LINES` ")+ + "modify column `EXT_CART_NAME` varchar(32)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOG_LINES ")+ - "modify column EXT_DATA varchar(32)"; + sql=QString("alter table `LOG_LINES` ")+ + "modify column `EXT_DATA` varchar(32)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOG_LINES ")+ - "modify column EXT_EVENT_ID varchar(32)"; + sql=QString("alter table `LOG_LINES` ")+ + "modify column `EXT_EVENT_ID` varchar(32)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOG_LINES ")+ - "modify column EXT_ANNC_TYPE varchar(8)"; + sql=QString("alter table `LOG_LINES` ")+ + "modify column `EXT_ANNC_TYPE` varchar(8)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOG_MACHINES ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `LOG_MACHINES` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOG_MACHINES ")+ - "modify column LOG_NAME varchar(64)"; + sql=QString("alter table `LOG_MACHINES` ")+ + "modify column `LOG_NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOG_MACHINES ")+ - "modify column CURRENT_LOG varchar(64)"; + sql=QString("alter table `LOG_MACHINES` ")+ + "modify column `CURRENT_LOG` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOG_MACHINES ")+ - "modify column UDP_ADDR varchar(191)"; + sql=QString("alter table `LOG_MACHINES` ")+ + "modify column `UDP_ADDR` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOG_MACHINES ")+ - "modify column UDP_STRING varchar(191)"; + sql=QString("alter table `LOG_MACHINES` ")+ + "modify column `UDP_STRING` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOG_MACHINES ")+ - "modify column LOG_RML varchar(191)"; + sql=QString("alter table `LOG_MACHINES` ")+ + "modify column `LOG_RML` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOG_MODES ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `LOG_MODES` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table MATRICES ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `MATRICES` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table MATRICES ")+ - "modify column NAME varchar(64)"; + sql=QString("alter table `MATRICES` ")+ + "modify column `NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table MATRICES ")+ - "modify column IP_ADDRESS varchar(16)"; + sql=QString("alter table `MATRICES` ")+ + "modify column `IP_ADDRESS` varchar(16)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table MATRICES ")+ - "modify column IP_ADDRESS_2 varchar(16)"; + sql=QString("alter table `MATRICES` ")+ + "modify column `IP_ADDRESS_2` varchar(16)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table MATRICES ")+ - "modify column USERNAME varchar(32)"; + sql=QString("alter table `MATRICES` ")+ + "modify column `USERNAME` varchar(32)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table MATRICES ")+ - "modify column USERNAME_2 varchar(32)"; + sql=QString("alter table `MATRICES` ")+ + "modify column `USERNAME_2` varchar(32)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table MATRICES ")+ - "modify column PASSWORD varchar(32)"; + sql=QString("alter table `MATRICES` ")+ + "modify column `PASSWORD` varchar(32)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table MATRICES ")+ - "modify column PASSWORD_2 varchar(32)"; + sql=QString("alter table `MATRICES` ")+ + "modify column `PASSWORD_2` varchar(32)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table MATRICES ")+ - "modify column GPIO_DEVICE varchar(191)"; + sql=QString("alter table `MATRICES` ")+ + "modify column `GPIO_DEVICE` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table NOWNEXT_PLUGINS ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `NOWNEXT_PLUGINS` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table NOWNEXT_PLUGINS ")+ - "modify column PLUGIN_PATH varchar(191)"; + sql=QString("alter table `NOWNEXT_PLUGINS` ")+ + "modify column `PLUGIN_PATH` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table NOWNEXT_PLUGINS ")+ - "modify column PLUGIN_ARG varchar(191)"; + sql=QString("alter table `NOWNEXT_PLUGINS` ")+ + "modify column `PLUGIN_ARG` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table OUTPUTS ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `OUTPUTS` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table OUTPUTS ")+ - "modify column NAME varchar(64)"; + sql=QString("alter table `OUTPUTS` ")+ + "modify column `NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table OUTPUTS ")+ - "modify column NODE_HOSTNAME varchar(176)"; + sql=QString("alter table `OUTPUTS` ")+ + "modify column `NODE_HOSTNAME` varchar(176)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table PANELS ")+ - "modify column OWNER varchar(64) not null"; + sql=QString("alter table `PANELS` ")+ + "modify column `OWNER` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table PANELS ")+ - "modify column LABEL varchar(64)"; + sql=QString("alter table `PANELS` ")+ + "modify column `LABEL` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table PANELS ")+ - "modify column DEFAULT_COLOR varchar(7)"; + sql=QString("alter table `PANELS` ")+ + "modify column `DEFAULT_COLOR` varchar(7)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table PANEL_NAMES ")+ - "modify column OWNER varchar(64) not null"; + sql=QString("alter table `PANEL_NAMES` ")+ + "modify column `OWNER` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table PANEL_NAMES ")+ - "modify column NAME varchar(64)"; + sql=QString("alter table `PANEL_NAMES` ")+ + "modify column `NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table PODCASTS ")+ - "modify column ITEM_TITLE varchar(191)"; + sql=QString("alter table `PODCASTS` ")+ + "modify column `ITEM_TITLE` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table PODCASTS ")+ - "modify column ITEM_DESCRIPTION text"; + sql=QString("alter table `PODCASTS` ")+ + "modify column `ITEM_DESCRIPTION` text"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table PODCASTS ")+ - "modify column ITEM_CATEGORY varchar(64)"; + sql=QString("alter table `PODCASTS` ")+ + "modify column `ITEM_CATEGORY` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table PODCASTS ")+ - "modify column ITEM_LINK varchar(191)"; + sql=QString("alter table `PODCASTS` ")+ + "modify column `ITEM_LINK` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table PODCASTS ")+ - "modify column ITEM_COMMENTS varchar(191)"; + sql=QString("alter table `PODCASTS` ")+ + "modify column `ITEM_COMMENTS` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table PODCASTS ")+ - "modify column ITEM_AUTHOR varchar(191)"; + sql=QString("alter table `PODCASTS` ")+ + "modify column `ITEM_AUTHOR` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table PODCASTS ")+ - "modify column ITEM_SOURCE_TEXT varchar(64)"; + sql=QString("alter table `PODCASTS` ")+ + "modify column `ITEM_SOURCE_TEXT` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table PODCASTS ")+ - "modify column ITEM_SOURCE_URL varchar(191)"; + sql=QString("alter table `PODCASTS` ")+ + "modify column `ITEM_SOURCE_URL` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table PODCASTS ")+ - "modify column AUDIO_FILENAME varchar(191)"; + sql=QString("alter table `PODCASTS` ")+ + "modify column `AUDIO_FILENAME` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY ")+ - "modify column STATION varchar(64) not null"; + sql=QString("alter table `RDAIRPLAY` ")+ + "modify column `STATION` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY ")+ - "modify column BUTTON_LABEL_TEMPLATE varchar(32) default '%t'"; + sql=QString("alter table `RDAIRPLAY` ")+ + "modify column `BUTTON_LABEL_TEMPLATE` varchar(32) default '%t'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY ")+ - "modify column DEFAULT_SERVICE varchar(10)"; + sql=QString("alter table `RDAIRPLAY` ")+ + "modify column `DEFAULT_SERVICE` varchar(10)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY ")+ - "modify column TITLE_TEMPLATE varchar(64) default '%t'"; + sql=QString("alter table `RDAIRPLAY` ")+ + "modify column `TITLE_TEMPLATE` varchar(64) default '%t'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY ")+ - "modify column ARTIST_TEMPLATE varchar(64) default '%a'"; + sql=QString("alter table `RDAIRPLAY` ")+ + "modify column `ARTIST_TEMPLATE` varchar(64) default '%a'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY ")+ - "modify column OUTCUE_TEMPLATE varchar(64) default '%o'"; + sql=QString("alter table `RDAIRPLAY` ")+ + "modify column `OUTCUE_TEMPLATE` varchar(64) default '%o'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY ")+ - "modify column DESCRIPTION_TEMPLATE varchar(64) default '%i'"; + sql=QString("alter table `RDAIRPLAY` ")+ + "modify column `DESCRIPTION_TEMPLATE` varchar(64) default '%i'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY ")+ - "modify column EXIT_PASSWORD varchar(41)"; + sql=QString("alter table `RDAIRPLAY` ")+ + "modify column `EXIT_PASSWORD` varchar(41)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY ")+ - "modify column SKIN_PATH varchar(191) default '/usr/share/pixmaps/rivendell/rdairplay_skin.png'"; + sql=QString("alter table `RDAIRPLAY` ")+ + "modify column `SKIN_PATH` varchar(191) default '/usr/share/pixmaps/rivendell/rdairplay_skin.png'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY_CHANNELS ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `RDAIRPLAY_CHANNELS` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY_CHANNELS ")+ - "modify column START_RML varchar(191)"; + sql=QString("alter table `RDAIRPLAY_CHANNELS` ")+ + "modify column `START_RML` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDAIRPLAY_CHANNELS ")+ - "modify column STOP_RML varchar(191)"; + sql=QString("alter table `RDAIRPLAY_CHANNELS` ")+ + "modify column `STOP_RML` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDCATCH ")+ - "modify column STATION varchar(64) not null"; + sql=QString("alter table `RDCATCH` ")+ + "modify column `STATION` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDCATCH ")+ - "modify column ERROR_RML varchar(191)"; + sql=QString("alter table `RDCATCH` ")+ + "modify column `ERROR_RML` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDHOTKEYS ")+ - "modify column STATION_NAME varchar(64)"; + sql=QString("alter table `RDHOTKEYS` ")+ + "modify column `STATION_NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDHOTKEYS ")+ - "modify column MODULE_NAME varchar(64)"; + sql=QString("alter table `RDHOTKEYS` ")+ + "modify column `MODULE_NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDHOTKEYS ")+ - "modify column KEY_VALUE varchar(64)"; + sql=QString("alter table `RDHOTKEYS` ")+ + "modify column `KEY_VALUE` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDHOTKEYS ")+ - "modify column KEY_LABEL varchar(64)"; + sql=QString("alter table `RDHOTKEYS` ")+ + "modify column `KEY_LABEL` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDLIBRARY ")+ - "modify column STATION varchar(64) not null"; + sql=QString("alter table `RDLIBRARY` ")+ + "modify column `STATION` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDLIBRARY ")+ - "modify column RIPPER_DEVICE varchar(64) default '/dev/cdrom'"; + sql=QString("alter table `RDLIBRARY` ")+ + "modify column `RIPPER_DEVICE` varchar(64) default '/dev/cdrom'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDLIBRARY ")+ - "modify column CDDB_SERVER varchar(64) default 'freedb.freedb.org'"; + sql=QString("alter table `RDLIBRARY` ")+ + "modify column `CDDB_SERVER` varchar(64) default 'freedb.freedb.org'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDLOGEDIT ")+ - "modify column STATION varchar(64) not null"; + sql=QString("alter table `RDLOGEDIT` ")+ + "modify column `STATION` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDPANEL ")+ - "modify column STATION varchar(64) not null"; + sql=QString("alter table `RDPANEL` ")+ + "modify column `STATION` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDPANEL ")+ - "modify column BUTTON_LABEL_TEMPLATE varchar(32) default '%t'"; + sql=QString("alter table `RDPANEL` ")+ + "modify column `BUTTON_LABEL_TEMPLATE` varchar(32) default '%t'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDPANEL ")+ - "modify column DEFAULT_SERVICE varchar(10)"; + sql=QString("alter table `RDPANEL` ")+ + "modify column `DEFAULT_SERVICE` varchar(10)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDPANEL ")+ - "modify column SKIN_PATH varchar(191) default '/usr/share/pixmaps/rivendell/rdpanel_skin.png'"; + sql=QString("alter table `RDPANEL` ")+ + "modify column `SKIN_PATH` varchar(191) default '/usr/share/pixmaps/rivendell/rdpanel_skin.png'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDPANEL_CHANNELS ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `RDPANEL_CHANNELS` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDPANEL_CHANNELS ")+ - "modify column START_RML varchar(191)"; + sql=QString("alter table `RDPANEL_CHANNELS` ")+ + "modify column `START_RML` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDPANEL_CHANNELS ")+ - "modify column STOP_RML varchar(191)"; + sql=QString("alter table `RDPANEL_CHANNELS` ")+ + "modify column `STOP_RML` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RECORDINGS ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `RECORDINGS` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RECORDINGS ")+ - "modify column CUT_NAME varchar(12) not null"; + sql=QString("alter table `RECORDINGS` ")+ + "modify column `CUT_NAME` varchar(12) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RECORDINGS ")+ - "modify column DESCRIPTION varchar(64)"; + sql=QString("alter table `RECORDINGS` ")+ + "modify column `DESCRIPTION` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RECORDINGS ")+ - "modify column URL varchar(191)"; + sql=QString("alter table `RECORDINGS` ")+ + "modify column `URL` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RECORDINGS ")+ - "modify column URL_USERNAME varchar(64)"; + sql=QString("alter table `RECORDINGS` ")+ + "modify column `URL_USERNAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RECORDINGS ")+ - "modify column URL_PASSWORD varchar(64)"; + sql=QString("alter table `RECORDINGS` ")+ + "modify column `URL_PASSWORD` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPLICATORS ")+ - "modify column NAME varchar(32) not null"; + sql=QString("alter table `REPLICATORS` ")+ + "modify column `NAME` varchar(32) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPLICATORS ")+ - "modify column DESCRIPTION varchar(64)"; + sql=QString("alter table `REPLICATORS` ")+ + "modify column `DESCRIPTION` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPLICATORS ")+ - "modify column STATION_NAME varchar(64)"; + sql=QString("alter table `REPLICATORS` ")+ + "modify column `STATION_NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPLICATORS ")+ - "modify column URL varchar(191)"; + sql=QString("alter table `REPLICATORS` ")+ + "modify column `URL` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPLICATORS ")+ - "modify column URL_USERNAME varchar(64)"; + sql=QString("alter table `REPLICATORS` ")+ + "modify column `URL_USERNAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPLICATORS ")+ - "modify column URL_PASSWORD varchar(64)"; + sql=QString("alter table `REPLICATORS` ")+ + "modify column `URL_PASSWORD` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPLICATOR_MAP ")+ - "modify column REPLICATOR_NAME varchar(32) not null"; + sql=QString("alter table `REPLICATOR_MAP` ")+ + "modify column `REPLICATOR_NAME` varchar(32) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPLICATOR_MAP ")+ - "modify column GROUP_NAME varchar(10) not null"; + sql=QString("alter table `REPLICATOR_MAP` ")+ + "modify column `GROUP_NAME` varchar(10) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPL_CART_STATE ")+ - "modify column REPLICATOR_NAME varchar(32) not null"; + sql=QString("alter table `REPL_CART_STATE` ")+ + "modify column `REPLICATOR_NAME` varchar(32) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPL_CART_STATE ")+ - "modify column POSTED_FILENAME varchar(191)"; + sql=QString("alter table `REPL_CART_STATE` ")+ + "modify column `POSTED_FILENAME` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPL_CUT_STATE ")+ - "modify column REPLICATOR_NAME varchar(32) not null"; + sql=QString("alter table `REPL_CUT_STATE` ")+ + "modify column `REPLICATOR_NAME` varchar(32) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPL_CUT_STATE ")+ - "modify column CUT_NAME varchar(12) not null"; + sql=QString("alter table `REPL_CUT_STATE` ")+ + "modify column `CUT_NAME` varchar(12) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPORTS ")+ - "modify column NAME varchar(64) not null"; + sql=QString("alter table `REPORTS` ")+ + "modify column `NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPORTS ")+ - "modify column DESCRIPTION varchar(64)"; + sql=QString("alter table `REPORTS` ")+ + "modify column `DESCRIPTION` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPORTS ")+ - "modify column EXPORT_PATH varchar(191)"; + sql=QString("alter table `REPORTS` ")+ + "modify column `EXPORT_PATH` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPORTS ")+ - "modify column WIN_EXPORT_PATH varchar(191)"; + sql=QString("alter table `REPORTS` ")+ + "modify column `WIN_EXPORT_PATH` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPORTS ")+ - "modify column STATION_ID varchar(16)"; + sql=QString("alter table `REPORTS` ")+ + "modify column `STATION_ID` varchar(16)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPORTS ")+ - "modify column SERVICE_NAME varchar(64)"; + sql=QString("alter table `REPORTS` ")+ + "modify column `SERVICE_NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPORTS ")+ - "modify column STATION_FORMAT varchar(64)"; + sql=QString("alter table `REPORTS` ")+ + "modify column `STATION_FORMAT` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPORT_GROUPS ")+ - "modify column REPORT_NAME varchar(64) not null"; + sql=QString("alter table `REPORT_GROUPS` ")+ + "modify column `REPORT_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPORT_GROUPS ")+ - "modify column GROUP_NAME varchar(10)"; + sql=QString("alter table `REPORT_GROUPS` ")+ + "modify column `GROUP_NAME` varchar(10)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPORT_SERVICES ")+ - "modify column REPORT_NAME varchar(64) not null"; + sql=QString("alter table `REPORT_SERVICES` ")+ + "modify column `REPORT_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPORT_SERVICES ")+ - "modify column SERVICE_NAME varchar(10)"; + sql=QString("alter table `REPORT_SERVICES` ")+ + "modify column `SERVICE_NAME` varchar(10)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPORT_SERVICES ")+ - "modify column REPORT_NAME varchar(64) not null"; + sql=QString("alter table `REPORT_SERVICES` ")+ + "modify column `REPORT_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPORT_SERVICES ")+ - "modify column SERVICE_NAME varchar(10)"; + sql=QString("alter table `REPORT_SERVICES` ")+ + "modify column `SERVICE_NAME` varchar(10)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPORT_STATIONS ")+ - "modify column REPORT_NAME varchar(64) not null"; + sql=QString("alter table `REPORT_STATIONS` ")+ + "modify column `REPORT_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table REPORT_STATIONS ")+ - "modify column STATION_NAME varchar(64)"; + sql=QString("alter table `REPORT_STATIONS` ")+ + "modify column `STATION_NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICES ")+ - "modify column NAME varchar(10) not null"; + sql=QString("alter table `SERVICES` ")+ + "modify column `NAME` varchar(10) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICES ")+ - "modify column DESCRIPTION varchar(191)"; + sql=QString("alter table `SERVICES` ")+ + "modify column `DESCRIPTION` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICES ")+ - "modify column NAME_TEMPLATE varchar(191)"; + sql=QString("alter table `SERVICES` ")+ + "modify column `NAME_TEMPLATE` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICES ")+ - "modify column DESCRIPTION_TEMPLATE varchar(191)"; + sql=QString("alter table `SERVICES` ")+ + "modify column `DESCRIPTION_TEMPLATE` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICES ")+ - "modify column PROGRAM_CODE varchar(191)"; + sql=QString("alter table `SERVICES` ")+ + "modify column `PROGRAM_CODE` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICES ")+ - "modify column TRACK_GROUP varchar(10)"; + sql=QString("alter table `SERVICES` ")+ + "modify column `TRACK_GROUP` varchar(10)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICES ")+ - "modify column AUTOSPOT_GROUP varchar(10)"; + sql=QString("alter table `SERVICES` ")+ + "modify column `AUTOSPOT_GROUP` varchar(10)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICES ")+ - "modify column TFC_PATH varchar(191)"; + sql=QString("alter table `SERVICES` ")+ + "modify column `TFC_PATH` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICES ")+ - "modify column TFC_WIN_PATH varchar(191)"; + sql=QString("alter table `SERVICES` ")+ + "modify column `TFC_WIN_PATH` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICES ")+ - "modify column TFC_IMPORT_TEMPLATE varchar(64) default 'Rivendell Standard Import'"; + sql=QString("alter table `SERVICES` ")+ + "modify column `TFC_IMPORT_TEMPLATE` varchar(64) default 'Rivendell Standard Import'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICES ")+ - "modify column TFC_LABEL_CART varchar(32)"; + sql=QString("alter table `SERVICES` ")+ + "modify column `TFC_LABEL_CART` varchar(32)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICES ")+ - "modify column TFC_TRACK_CART varchar(32)"; + sql=QString("alter table `SERVICES` ")+ + "modify column `TFC_TRACK_CART` varchar(32)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICES ")+ - "modify column TFC_BREAK_STRING varchar(64)"; + sql=QString("alter table `SERVICES` ")+ + "modify column `TFC_BREAK_STRING` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICES ")+ - "modify column TFC_TRACK_STRING varchar(64)"; + sql=QString("alter table `SERVICES` ")+ + "modify column `TFC_TRACK_STRING` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICES ")+ - "modify column MUS_PATH varchar(191)"; + sql=QString("alter table `SERVICES` ")+ + "modify column `MUS_PATH` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICES ")+ - "modify column MUS_WIN_PATH varchar(191)"; + sql=QString("alter table `SERVICES` ")+ + "modify column `MUS_WIN_PATH` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICES ")+ - "modify column MUS_IMPORT_TEMPLATE varchar(64) default 'Rivendell Standard Import'"; + sql=QString("alter table `SERVICES` ")+ + "modify column `MUS_IMPORT_TEMPLATE` varchar(64) default 'Rivendell Standard Import'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICES ")+ - "modify column MUS_LABEL_CART varchar(32)"; + sql=QString("alter table `SERVICES` ")+ + "modify column `MUS_LABEL_CART` varchar(32)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICES ")+ - "modify column MUS_TRACK_CART varchar(32)"; + sql=QString("alter table `SERVICES` ")+ + "modify column `MUS_TRACK_CART` varchar(32)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICES ")+ - "modify column MUS_BREAK_STRING varchar(64)"; + sql=QString("alter table `SERVICES` ")+ + "modify column `MUS_BREAK_STRING` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICES ")+ - "modify column MUS_TRACK_STRING varchar(64)"; + sql=QString("alter table `SERVICES` ")+ + "modify column `MUS_TRACK_STRING` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICE_CLOCKS ")+ - "modify column SERVICE_NAME varchar(10) not null"; + sql=QString("alter table `SERVICE_CLOCKS` ")+ + "modify column `SERVICE_NAME` varchar(10) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICE_CLOCKS ")+ - "modify column CLOCK_NAME varchar(64)"; + sql=QString("alter table `SERVICE_CLOCKS` ")+ + "modify column `CLOCK_NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICE_PERMS ")+ - "modify column STATION_NAME varchar(64)"; + sql=QString("alter table `SERVICE_PERMS` ")+ + "modify column `STATION_NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SERVICE_PERMS ")+ - "modify column SERVICE_NAME varchar(10)"; + sql=QString("alter table `SERVICE_PERMS` ")+ + "modify column `SERVICE_NAME` varchar(10)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STACK_LINES ")+ - "modify column SERVICE_NAME varchar(10) not null"; + sql=QString("alter table `STACK_LINES` ")+ + "modify column `SERVICE_NAME` varchar(10) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STACK_LINES ")+ - "modify column ARTIST varchar(191) not null"; + sql=QString("alter table `STACK_LINES` ")+ + "modify column `ARTIST` varchar(191) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STACK_LINES ")+ - "modify column SCHED_CODES varchar(191) not null"; + sql=QString("alter table `STACK_LINES` ")+ + "modify column `SCHED_CODES` varchar(191) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STATIONS ")+ - "modify column NAME varchar(64) not null"; + sql=QString("alter table `STATIONS` ")+ + "modify column `NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STATIONS ")+ - "modify column SHORT_NAME varchar(64)"; + sql=QString("alter table `STATIONS` ")+ + "modify column `SHORT_NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STATIONS ")+ - "modify column DESCRIPTION varchar(64)"; + sql=QString("alter table `STATIONS` ")+ + "modify column `DESCRIPTION` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STATIONS ")+ - "modify column USER_NAME varchar(191)"; + sql=QString("alter table `STATIONS` ")+ + "modify column `USER_NAME` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STATIONS ")+ - "modify column DEFAULT_NAME varchar(191)"; + sql=QString("alter table `STATIONS` ")+ + "modify column `DEFAULT_NAME` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STATIONS ")+ - "modify column IPV4_ADDRESS varchar(15) default '127.0.0.2'"; + sql=QString("alter table `STATIONS` ")+ + "modify column `IPV4_ADDRESS` varchar(15) default '127.0.0.2'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STATIONS ")+ - "modify column HTTP_STATION varchar(64) default 'localhost'"; + sql=QString("alter table `STATIONS` ")+ + "modify column `HTTP_STATION` varchar(64) default 'localhost'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STATIONS ")+ - "modify column CAE_STATION varchar(64) default 'localhost'"; + sql=QString("alter table `STATIONS` ")+ + "modify column `CAE_STATION` varchar(64) default 'localhost'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STATIONS ")+ - "modify column EDITOR_PATH varchar(191)"; + sql=QString("alter table `STATIONS` ")+ + "modify column `EDITOR_PATH` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STATIONS ")+ - "modify column JACK_SERVER_NAME varchar(64)"; + sql=QString("alter table `STATIONS` ")+ + "modify column `JACK_SERVER_NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STATIONS ")+ - "modify column JACK_COMMAND_LINE varchar(191)"; + sql=QString("alter table `STATIONS` ")+ + "modify column `JACK_COMMAND_LINE` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STATIONS ")+ - "modify column HPI_VERSION varchar(16)"; + sql=QString("alter table `STATIONS` ")+ + "modify column `HPI_VERSION` varchar(16)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STATIONS ")+ - "modify column JACK_VERSION varchar(16)"; + sql=QString("alter table `STATIONS` ")+ + "modify column `JACK_VERSION` varchar(16)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table STATIONS ")+ - "modify column ALSA_VERSION varchar(16)"; + sql=QString("alter table `STATIONS` ")+ + "modify column `ALSA_VERSION` varchar(16)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SWITCHER_NODES ")+ - "modify column STATION_NAME varchar(64)"; + sql=QString("alter table `SWITCHER_NODES` ")+ + "modify column `STATION_NAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SWITCHER_NODES ")+ - "modify column HOSTNAME varchar(64)"; + sql=QString("alter table `SWITCHER_NODES` ")+ + "modify column `HOSTNAME` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SWITCHER_NODES ")+ - "modify column PASSWORD varchar(64)"; + sql=QString("alter table `SWITCHER_NODES` ")+ + "modify column `PASSWORD` varchar(64)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SWITCHER_NODES ")+ - "modify column DESCRIPTION varchar(191)"; + sql=QString("alter table `SWITCHER_NODES` ")+ + "modify column `DESCRIPTION` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SYSTEM ")+ - "modify column ISCI_XREFERENCE_PATH varchar(191)"; + sql=QString("alter table `SYSTEM` ")+ + "modify column `ISCI_XREFERENCE_PATH` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SYSTEM ")+ - "modify column TEMP_CART_GROUP varchar(10)"; + sql=QString("alter table `SYSTEM` ")+ + "modify column `TEMP_CART_GROUP` varchar(10)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table SYSTEM ")+ - "modify column NOTIFICATION_ADDRESS varchar(15) default '"+ + sql=QString("alter table `SYSTEM` ")+ + "modify column `NOTIFICATION_ADDRESS` varchar(15) default '"+ RD_NOTIFICATION_ADDRESS+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table TRIGGERS ")+ - "modify column CUT_NAME varchar(12)"; + sql=QString("alter table `TRIGGERS` ")+ + "modify column `CUT_NAME` varchar(12)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table TTYS ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `TTYS` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table TTYS ")+ - "modify column PORT varchar(20)"; + sql=QString("alter table `TTYS` ")+ + "modify column `PORT` varchar(20)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table USERS ")+ - "modify column LOGIN_NAME varchar(191) not null"; + sql=QString("alter table `USERS` ")+ + "modify column `LOGIN_NAME` varchar(191) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table USERS ")+ - "modify column FULL_NAME varchar(191)"; + sql=QString("alter table `USERS` ")+ + "modify column `FULL_NAME` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table USERS ")+ - "modify column PHONE_NUMBER varchar(20)"; + sql=QString("alter table `USERS` ")+ + "modify column `PHONE_NUMBER` varchar(20)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table USERS ")+ - "modify column DESCRIPTION varchar(191)"; + sql=QString("alter table `USERS` ")+ + "modify column `DESCRIPTION` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table USERS ")+ - "modify column PASSWORD varchar(32)"; + sql=QString("alter table `USERS` ")+ + "modify column `PASSWORD` varchar(32)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table USERS ")+ - "modify column PAM_SERVICE varchar(32) default 'rivendell'"; + sql=QString("alter table `USERS` ")+ + "modify column `PAM_SERVICE` varchar(32) default 'rivendell'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table USER_PERMS ")+ - "modify column USER_NAME varchar(191)"; + sql=QString("alter table `USER_PERMS` ")+ + "modify column `USER_NAME` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table USER_PERMS ")+ - "modify column GROUP_NAME varchar(10)"; + sql=QString("alter table `USER_PERMS` ")+ + "modify column `GROUP_NAME` varchar(10)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table USER_SERVICE_PERMS ")+ - "modify column USER_NAME varchar(191) not null"; + sql=QString("alter table `USER_SERVICE_PERMS` ")+ + "modify column `USER_NAME` varchar(191) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table USER_SERVICE_PERMS ")+ - "modify column SERVICE_NAME varchar(10) not null"; + sql=QString("alter table `USER_SERVICE_PERMS` ")+ + "modify column `SERVICE_NAME` varchar(10) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table VGUEST_RESOURCES ")+ - "modify column STATION_NAME varchar(64) not null"; + sql=QString("alter table `VGUEST_RESOURCES` ")+ + "modify column `STATION_NAME` varchar(64) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table WEBAPI_AUTHS ")+ - "modify column TICKET varchar(41) not null"; + sql=QString("alter table `WEBAPI_AUTHS` ")+ + "modify column `TICKET` varchar(41) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table WEBAPI_AUTHS ")+ - "modify column LOGIN_NAME varchar(191) not null"; + sql=QString("alter table `WEBAPI_AUTHS` ")+ + "modify column `LOGIN_NAME` varchar(191) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table WEBAPI_AUTHS ")+ - "modify column IPV4_ADDRESS varchar(16) not null"; + sql=QString("alter table `WEBAPI_AUTHS` ")+ + "modify column `IPV4_ADDRESS` varchar(16) not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table WEB_CONNECTIONS ")+ - "modify column LOGIN_NAME varchar(191)"; + sql=QString("alter table `WEB_CONNECTIONS` ")+ + "modify column `LOGIN_NAME` varchar(191)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table WEB_CONNECTIONS ")+ - "modify column IP_ADDRESS varchar(16)"; + sql=QString("alter table `WEB_CONNECTIONS` ")+ + "modify column `IP_ADDRESS` varchar(16)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -9543,14 +9857,14 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // if((cur_schema<298)&&(set_schema>cur_schema)) { - sql=QString("alter table RDLOGEDIT ")+ - "modify column INPUT_CARD int(11) default 0"; + sql=QString("alter table `RDLOGEDIT` ")+ + "modify column `INPUT_CARD` int(11) default 0"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDLOGEDIT ")+ - "modify column OUTPUT_CARD int(11) default 0"; + sql=QString("alter table `RDLOGEDIT ")+ + "modify column `OUTPUT_CARD` int(11) default 0"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -9559,25 +9873,25 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<299)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists CART_SCHED_CODES (")+ - "ID int auto_increment not null primary key,"+ - "CART_NUMBER int unsigned not null default 0,"+ - "SCHED_CODE varchar(11) not null,"+ - "index SCHED_CODE_IDX (CART_NUMBER,SCHED_CODE))"+ + sql=QString("create table if not exists `CART_SCHED_CODES` (")+ + "`ID` int auto_increment not null primary key,"+ + "`CART_NUMBER` int unsigned not null default 0,"+ + "`SCHED_CODE` varchar(11) not null,"+ + "index `SCHED_CODE_IDX` (`CART_NUMBER`,`SCHED_CODE`))"+ " charset utf8mb4 collate utf8mb4_general_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - q=new RDSqlQuery("select NUMBER,SCHED_CODES from CART where TYPE=1",false); + q=new RDSqlQuery("select `NUMBER`,`SCHED_CODES` from `CART` where `TYPE`=1",false); while(q->next()) { for(int i=0;i<255;i+=11) { QString code=q->value(1).toString().mid(i,11).trimmed(); if((!code.isEmpty())&&(code!=".")) { - sql=QString("insert into CART_SCHED_CODES set ")+ - "CART_NUMBER="+q->value(0).toString()+","+ - "SCHED_CODE=\""+code+"\""; + sql=QString("insert into `CART_SCHED_CODES` set ")+ + "`CART_NUMBER`="+q->value(0).toString()+","+ + "`SCHED_CODE`='"+code+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -9600,14 +9914,14 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<301)&&(set_schema>cur_schema)) { - sql=QString("alter table SERVICES add column ")+ - "INCLUDE_IMPORT_MARKERS enum('N','Y') default 'Y' after ELR_SHELFLIFE"; + sql=QString("alter table `SERVICES` add column ")+ + "`INCLUDE_IMPORT_MARKERS` enum('N','Y') default 'Y' after `ELR_SHELFLIFE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table LOGS add column ")+ - "INCLUDE_IMPORT_MARKERS enum('N','Y') default 'Y' after COMPLETED_TRACKS"; + sql=QString("alter table `LOGS add column ")+ + "`INCLUDE_IMPORT_MARKERS` enum('N','Y') default 'Y' after `COMPLETED_TRACKS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -9616,8 +9930,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<302)&&(set_schema>cur_schema)) { - sql=QString("alter table STATIONS add column ")+ - "REPORT_EDITOR_PATH varchar(191) after EDITOR_PATH"; + sql=QString("alter table `STATIONS` add column ")+ + "`REPORT_EDITOR_PATH` varchar(191) after `EDITOR_PATH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -9626,13 +9940,13 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<303)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists PYPAD_INSTANCES (")+ - "ID int auto_increment not null primary key,"+ - "STATION_NAME varchar(64) not null,"+ - "SCRIPT_PATH varchar(191) not null,"+ - "DESCRIPTION varchar(191) default '[new]',"+ - "CONFIG text not null,"+ - "index STATION_NAME_IDX(STATION_NAME))"+ + sql=QString("create table if not exists `PYPAD_INSTANCES` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STATION_NAME` varchar(64) not null,"+ + "`SCRIPT_PATH` varchar(191) not null,"+ + "`DESCRIPTION` varchar(191) default '[new]',"+ + "`CONFIG` text not null,"+ + "index `STATION_NAME_IDX` (`STATION_NAME`))"+ " charset utf8mb4 collate utf8mb4_general_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -9643,18 +9957,18 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<304)&&(set_schema>cur_schema)) { - sql=QString("alter table PYPAD_INSTANCES add column ")+ - "IS_RUNNING enum('N','Y') not null default 'N' after CONFIG"; + sql=QString("alter table `PYPAD_INSTANCES` add column ")+ + "`IS_RUNNING` enum('N','Y') not null default 'N' after `CONFIG`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table PYPAD_INSTANCES add column ")+ - "EXIT_CODE int not null default 0 after IS_RUNNING"; + sql=QString("alter table `PYPAD_INSTANCES` add column ")+ + "`EXIT_CODE` int not null default 0 after `IS_RUNNING`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table PYPAD_INSTANCES add column ")+ - "ERROR_TEXT text after EXIT_CODE"; + sql=QString("alter table `PYPAD_INSTANCES` add column ")+ + "`ERROR_TEXT` text after `EXIT_CODE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -9673,22 +9987,22 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<306)&&(set_schema>cur_schema)) { - sql=QString("alter table RDLIBRARY drop index STATION_IDX"); + sql=QString("alter table `RDLIBRARY` drop index `STATION_IDX`"); RDSqlQuery::apply(sql); DropColumn("RDLIBRARY","INSTANCE"); - sql=QString("create index STATION_IDX on RDLIBRARY (STATION)"); + sql=QString("create index `STATION_IDX` on `RDLIBRARY` (`STATION`)"); RDSqlQuery::apply(sql); WriteSchemaVersion(++cur_schema); } if((cur_schema<307)&&(set_schema>cur_schema)) { - sql=QString("alter table EVENTS add column ")+ - "ARTIST_SEP int(10) after SCHED_GROUP"; + sql=QString("alter table `EVENTS` add column ")+ + "`ARTIST_SEP` int(10) after `SCHED_GROUP`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table EVENTS modify column TITLE_SEP int(10)"; + sql="alter table `EVENTS` modify column `TITLE_SEP` int(10)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -9701,28 +10015,28 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<308)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists STACK_SCHED_CODES (")+ - "ID int auto_increment not null primary key,"+ - "STACK_LINES_ID int unsigned,"+ - "SCHED_CODE varchar(10),"+ - "index SCHED_CODE_IDX(SCHED_CODE))"+ + sql=QString("create table if not exists `STACK_SCHED_CODES` (")+ + "`ID` int auto_increment not null primary key,"+ + "`STACK_LINES_ID` int unsigned,"+ + "`SCHED_CODE` varchar(10),"+ + "index `SCHED_CODE_IDX` (`SCHED_CODE`))"+ " charset utf8mb4 collate utf8mb4_general_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("select ")+ - "ID,"+ // 00 - "SCHED_CODES " // 01 - "from STACK_LINES"; + "`ID`,"+ // 00 + "`SCHED_CODES` " // 01 + "from `STACK_LINES`"; q=new RDSqlQuery(sql,false); while(q->next()) { QStringList f0=q->value(1).toString().split(" ",QString::SkipEmptyParts); for(int i=0;ivalue(0).toUInt())+ - "SCHED_CODE=\""+RDEscapeString(f0.at(i).trimmed())+"\""; + sql=QString("insert into `STACK_SCHED_CODES` set ")+ + QString().sprintf("`STACK_LINES_ID`=%u,",q->value(0).toUInt())+ + "`SCHED_CODE`='"+RDEscapeString(f0.at(i).trimmed())+"'"; RDSqlQuery::apply(sql,err_msg); } } @@ -9734,14 +10048,14 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<309)&&(set_schema>cur_schema)) { - sql=QString("alter table DROPBOXES add column ")+ - "LOG_TO_SYSLOG enum('N','Y') not null "+ - "default 'Y' after FIX_BROKEN_FORMATS"; + sql=QString("alter table `DROPBOXES` add column ")+ + "`LOG_TO_SYSLOG` enum('N','Y') not null "+ + "default 'Y' after `FIX_BROKEN_FORMATS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("update DROPBOXES set LOG_TO_SYSLOG='N' where ")+ - "LOG_PATH is not null"; + sql=QString("update `DROPBOXES` set `LOG_TO_SYSLOG`='N' where ")+ + "`LOG_PATH` is not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -9750,93 +10064,93 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<310)&&(set_schema>cur_schema)) { - sql="alter table CART add column MINIMUM_TALK_LENGTH int unsigned default 0 after AVERAGE_HOOK_LENGTH"; + sql="alter table `CART` add column `MINIMUM_TALK_LENGTH` int unsigned default 0 after `AVERAGE_HOOK_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql="alter table CART add column MAXIMUM_TALK_LENGTH int unsigned default 0 after MINIMUM_TALK_LENGTH"; + sql="alter table `CART` add column `MAXIMUM_TALK_LENGTH` int unsigned default 0 after `MINIMUM_TALK_LENGTH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("create table if not exists NEXUS_FIELDS (")+ - "STATION varchar(255) NOT NULL,"+ - "RD_NAME varchar(255),"+ - "NEXUS_NAME varchar(255),"+ - "NEXUS_ID int(11))"+ + sql=QString("create table if not exists `NEXUS_FIELDS` (")+ + "`STATION` varchar(255) NOT NULL,"+ + "`RD_NAME` varchar(255),"+ + "`NEXUS_NAME` varchar(255),"+ + "`NEXUS_ID` int(11))"+ " charset utf8mb4 collate utf8mb4_general_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("create table if not exists NEXUS_QUEUE (")+ - "ID int auto_increment not null primary key,"+ - "NOTIFICATION varchar(255),"+ - "ERROR varchar(255),"+ - "CREATED timestamp default current_timestamp)"+ + sql=QString("create table if not exists `NEXUS_QUEUE` (")+ + "`ID` int auto_increment not null primary key,"+ + "`NOTIFICATION` varchar(255),"+ + "`ERROR` varchar(255),"+ + "`CREATED` timestamp default current_timestamp)"+ " charset utf8mb4 collate utf8mb4_general_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("create table if not exists NEXUS_SERVER (")+ - "ENABLED enum('N','Y') default 'N',"+ - "ADDRESS varchar(50) NOT NULL,"+ - "PORT int(11) NOT NULL DEFAULT 8080,"+ - "STATION_NAME varchar(64))"+ + sql=QString("create table if not exists `NEXUS_SERVER` (")+ + "`ENABLED` enum('N','Y') default 'N',"+ + "`ADDRESS` varchar(50) NOT NULL,"+ + "`PORT` int(11) NOT NULL DEFAULT 8080,"+ + "`STATION_NAME` varchar(64))"+ " charset utf8mb4 collate utf8mb4_general_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("create table if not exists NEXUS_STATIONS (")+ - "STATION varchar(255) not null,"+ - "CATEGORY varchar(10) not null,"+ - "AUTO_MERGE enum('N','Y') default 'N',"+ - "RD_SERVICE varchar(10) not null,"+ - "RD_GROUP_NAME varchar(10) not null,"+ - "RD_SCHED_CODE varchar(11) not null)"+ + sql=QString("create table if not exists `NEXUS_STATIONS` (")+ + "`STATION` varchar(255) not null,"+ + "`CATEGORY` varchar(10) not null,"+ + "`AUTO_MERGE` enum('N','Y') default 'N',"+ + "`RD_SERVICE` varchar(10) not null,"+ + "`RD_GROUP_NAME` varchar(10) not null,"+ + "`RD_SCHED_CODE` varchar(11) not null)"+ " charset utf8mb4 collate utf8mb4_general_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - // q=new RDSqlQuery("select NAME from SERVICES",false); + // q=new RDSqlQuery("select `NAME` from `SERVICES`",false); // while(q->next()) { - // sql=QString("insert into NEXUS_STATIONS set ")+ - // "RD_SERVICE=\""+RDEscapeString(q->value(0).toString())+"\""; + // sql=QString("insert into `NEXUS_STATIONS` set ")+ + // "`RD_SERVICE`='"+RDEscapeString(q->value(0).toString())+"'"; // if(!RDSqlQuery::apply(sql,err_msg)) { // return false; // } // } // delete q; - sql=QString("insert into IMPORT_TEMPLATES set ")+ - "NAME='MusicMaster Nexus',"+ - "HOURS_OFFSET=0,"+ - "HOURS_LENGTH=2,"+ - "MINUTES_OFFSET=3,"+ - "MINUTES_LENGTH=2,"+ - "SECONDS_OFFSET=6,"+ - "SECONDS_LENGTH=2,"+ - "DATA_OFFSET=10,"+ - "DATA_LENGTH=6,"+ - "CART_OFFSET=20,"+ - "CART_LENGTH=6,"+ - "TITLE_OFFSET=30,"+ - "TITLE_LENGTH=60,"+ - "LEN_HOURS_OFFSET=0,"+ - "LEN_HOURS_LENGTH=0,"+ - "LEN_MINUTES_OFFSET=95,"+ - "LEN_MINUTES_LENGTH=2,"+ - "LEN_SECONDS_OFFSET=98,"+ - "LEN_SECONDS_LENGTH=2,"+ - "EVENT_ID_OFFSET=101,"+ - "EVENT_ID_LENGTH=10"; + sql=QString("insert into `IMPORT_TEMPLATES` set ")+ + "`NAME='MusicMaster Nexus',"+ + "`HOURS_OFFSET`=0,"+ + "`HOURS_LENGTH`=2,"+ + "`MINUTES_OFFSET`=3,"+ + "`MINUTES_LENGTH`=2,"+ + "`SECONDS_OFFSET`=6,"+ + "`SECONDS_LENGTH`=2,"+ + "`DATA_OFFSET`=10,"+ + "`DATA_LENGTH`=6,"+ + "`CART_OFFSET`=20,"+ + "`CART_LENGTH`=6,"+ + "`TITLE_OFFSET`=30,"+ + "`TITLE_LENGTH`=60,"+ + "`LEN_HOURS_OFFSET`=0,"+ + "`LEN_HOURS_LENGTH`=0,"+ + "`LEN_MINUTES_OFFSET`=95,"+ + "`LEN_MINUTES_LENGTH`=2,"+ + "`LEN_SECONDS_OFFSET`=98,"+ + "`LEN_SECONDS_LENGTH`=2,"+ + "`EVENT_ID_OFFSET`=101,"+ + "`EVENT_ID_LENGTH`=10"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -9847,9 +10161,9 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<311)&&(set_schema>cur_schema)) { - sql=QString("alter table RDLOGEDIT add column ")+ - "WAVEFORM_CAPTION varchar(64) not null default '%t - %a' "+ - "after TAIL_PREROLL"; + sql=QString("alter table `RDLOGEDIT` add column ")+ + "`WAVEFORM_CAPTION` varchar(64) not null default '%t - %a' "+ + "after `TAIL_PREROLL`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -9858,18 +10172,18 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<312)&&(set_schema>cur_schema)) { - sql=QString("alter table RDLIBRARY add column ")+ - "CD_SERVER_TYPE int unsigned not null default 2 after RIPPER_LEVEL"; + sql=QString("alter table `RDLIBRARY` add column ")+ + "`CD_SERVER_TYPE` int unsigned not null default 2 after `RIPPER_LEVEL`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("update RDLIBRARY set CD_SERVER_TYPE=1"); + sql=QString("update `RDLIBRARY` set `CD_SERVER_TYPE`=1"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RDLIBRARY add column ")+ - "MB_SERVER varchar(64) default 'musicbrainz.org' after CDDB_SERVER"; + sql=QString("alter table `RDLIBRARY` add column ")+ + "`MB_SERVER` varchar(64) default 'musicbrainz.org' after `CDDB_SERVER`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -9878,14 +10192,14 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<313)&&(set_schema>cur_schema)) { - sql=QString("alter table CUTS add column ")+ - "RECORDING_MBID varchar(40) after ISCI"; + sql=QString("alter table `CUTS` add column ")+ + "`RECORDING_MBID` varchar(40) after `ISCI`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table CUTS add column ")+ - "RELEASE_MBID varchar(40) after RECORDING_MBID"; + sql=QString("alter table `CUTS` add column ")+ + "`RELEASE_MBID` varchar(40) after `RECORDING_MBID`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -9894,8 +10208,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<314)&&(set_schema>cur_schema)) { - sql=QString("alter table STATIONS add column ")+ - "BROWSER_PATH varchar(191) default 'firefox' after REPORT_EDITOR_PATH"; + sql=QString("alter table `STATIONS` add column ")+ + "`BROWSER_PATH` varchar(191) default 'firefox' after `REPORT_EDITOR_PATH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -9923,8 +10237,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<317)&&(set_schema>cur_schema)) { - sql=QString("create index STACK_LINES_ID_IDX on ")+ - "STACK_SCHED_CODES(STACK_LINES_ID)"; + sql=QString("create index `STACK_LINES_ID_IDX` on ")+ + "`STACK_SCHED_CODES` (`STACK_LINES_ID`)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -9933,26 +10247,26 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<318)&&(set_schema>cur_schema)) { - sql=QString("alter table FEEDS add column ")+ - "IS_SUPERFEED enum('N','Y') default 'N' after KEY_NAME"; + sql=QString("alter table `FEEDS` add column ")+ + "`IS_SUPERFEED` enum('N','Y') default 'N' after `KEY_NAME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEEDS add index IS_SUPERFEED_IDX(IS_SUPERFEED)"); + sql=QString("alter table `FEEDS` add index `IS_SUPERFEED_IDX` (`IS_SUPERFEED`)"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("create table SUPERFEED_MAPS (")+ - "ID int unsigned primary key auto_increment,"+ - "FEED_ID int unsigned not null,"+ - "MEMBER_FEED_ID int unsigned not null,"+ - "KEY_NAME varchar(8) not null,"+ - "MEMBER_KEY_NAME varchar(8) not null,"+ - "index FEED_ID_IDX(FEED_ID),"+ - "index MEMBER_FEED_ID_IDX(MEMBER_FEED_ID),"+ - "index KEY_NAME_IDX(KEY_NAME),"+ - "index MEMBER_KEY_NAME_IDX(MEMBER_KEY_NAME)) "+ + sql=QString("create table `SUPERFEED_MAPS` (")+ + "`ID` int unsigned primary key auto_increment,"+ + "`FEED_ID` int unsigned not null,"+ + "`MEMBER_FEED_ID` int unsigned not null,"+ + "`KEY_NAME` varchar(8) not null,"+ + "`MEMBER_KEY_NAME` varchar(8) not null,"+ + "index `FEED_ID_IDX` (`FEED_ID`),"+ + "index `MEMBER_FEED_ID_IDX` (`MEMBER_FEED_ID`),"+ + "index `KEY_NAME_IDX` (`KEY_NAME`),"+ + "index `MEMBER_KEY_NAME_IDX` (`MEMBER_KEY_NAME`)) "+ " charset utf8mb4 collate utf8mb4_general_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -9963,12 +10277,12 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<319)&&(set_schema>cur_schema)) { - sql=QString("alter table FEEDS add column ")+ - "AUDIENCE_METRICS enum('N','Y') default 'N' after IS_SUPERFEED"; + sql=QString("alter table `FEEDS` add column ")+ + "`AUDIENCE_METRICS` enum('N','Y') default 'N' after `IS_SUPERFEED`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("update FEEDS set AUDIENCE_METRICS='Y'"); + sql=QString("update `FEEDS` set `AUDIENCE_METRICS`='Y'"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -9978,8 +10292,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) /// if((cur_schema<320)&&(set_schema>cur_schema)) { - sql=QString("alter table USERS add column ")+ - "EMAIL_ADDRESS varchar(191) after FULL_NAME"; + sql=QString("alter table `USERS` add column ")+ + "`EMAIL_ADDRESS` varchar(191) after `FULL_NAME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -9988,8 +10302,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<321)&&(set_schema>cur_schema)) { - sql=QString("alter table FEEDS add column ")+ - "CHANNEL_EDITOR varchar(64) after CHANNEL_COPYRIGHT"; + sql=QString("alter table `FEEDS` add column ")+ + "`CHANNEL_EDITOR` varchar(64) after `CHANNEL_COPYRIGHT`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -9998,21 +10312,21 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<322)&&(set_schema>cur_schema)) { - sql=QString("create table RSS_SCHEMAS (")+ - "ID int unsigned primary key,"+ - "NAME varchar(64) unique not null,"+ - "HEADER_XML text,"+ - "CHANNEL_XML text,"+ - "ITEM_XML text,"+ - "index NAME_IDX(NAME)) "+ + sql=QString("create table `RSS_SCHEMAS` (")+ + "`ID` int unsigned primary key,"+ + "`NAME` varchar(64) unique not null,"+ + "`HEADER_XML` text,"+ + "`CHANNEL_XML` text,"+ + "`ITEM_XML` text,"+ + "index `NAME_IDX` (`NAME`)) "+ " charset utf8mb4 collate utf8mb4_general_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEEDS add column ")+ - "RSS_SCHEMA int unsigned not null default 0 after PURGE_PASSWORD"; + sql=QString("alter table `FEEDS` add column ")+ + "`RSS_SCHEMA` int unsigned not null default 0 after `PURGE_PASSWORD`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10021,18 +10335,18 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<323)&&(set_schema>cur_schema)) { - sql=QString("create table FEED_IMAGES (")+ - "ID int unsigned primary key auto_increment,"+ - "FEED_ID int unsigned not null,"+ - "FEED_KEY_NAME varchar(8) not null,"+ - "WIDTH int not null,"+\ - "HEIGHT int not null,"+ - "DEPTH int not null,"+ - "DESCRIPTION varchar(191) not null,"+ - "FILE_EXTENSION varchar(10) not null,"+ - "DATA mediumblob not null,"+ - "index FEED_ID_IDX (FEED_ID),"+ - "index FEED_KEY_NAME_IDX (FEED_KEY_NAME)) "+ + sql=QString("create table `FEED_IMAGES` (")+ + "`ID` int unsigned primary key auto_increment,"+ + "`FEED_ID` int unsigned not null,"+ + "`FEED_KEY_NAME` varchar(8) not null,"+ + "`WIDTH` int not null,"+\ + "`HEIGHT` int not null,"+ + "`DEPTH` int not null,"+ + "`DESCRIPTION` varchar(191) not null,"+ + "`FILE_EXTENSION` varchar(10) not null,"+ + "`DATA` mediumblob not null,"+ + "index `FEED_ID_IDX` (`FEED_ID`),"+ + "index `FEED_KEY_NAME_IDX` (`FEED_KEY_NAME`)) "+ " charset utf8mb4 collate utf8mb4_general_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -10043,18 +10357,18 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<324)&&(set_schema>cur_schema)) { - sql=QString("alter table FEEDS add column CHANNEL_IMAGE_ID ")+ - "int not null default -1 after CHANNEL_LANGUAGE"; + sql=QString("alter table `FEEDS` add column `CHANNEL_IMAGE_ID` ")+ + "int not null default -1 after `CHANNEL_LANGUAGE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEEDS add column DEFAULT_ITEM_IMAGE_ID ")+ - "int not null default -1 after KEEP_METADATA"; + sql=QString("alter table `FEEDS add column `DEFAULT_ITEM_IMAGE_ID` ")+ + "int not null default -1 after `KEEP_METADATA`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table PODCASTS add column ITEM_IMAGE_ID ")+ - "int not null default -1 after ITEM_SOURCE_URL"; + sql=QString("alter table `PODCASTS` add column `ITEM_IMAGE_ID` ")+ + "int not null default -1 after `ITEM_SOURCE_URL`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10069,28 +10383,28 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<326)&&(set_schema>cur_schema)) { - sql=QString("alter table FEEDS add column CHANNEL_AUTHOR varchar(64) ")+ - "after CHANNEL_EDITOR"; + sql=QString("alter table `FEEDS` add column `CHANNEL_AUTHOR` varchar(64) ")+ + "after `CHANNEL_EDITOR`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEEDS add column CHANNEL_OWNER_NAME varchar(64) ")+ - "after CHANNEL_AUTHOR"; + sql=QString("alter table `FEEDS` add column `CHANNEL_OWNER_NAME` varchar(64) ")+ + "after `CHANNEL_AUTHOR`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEEDS add column ")+ - "CHANNEL_OWNER_EMAIL varchar(64) after CHANNEL_OWNER_NAME"; + sql=QString("alter table `FEEDS` add column ")+ + "`CHANNEL_OWNER_EMAIL` varchar(64) after `CHANNEL_OWNER_NAME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEEDS add column CHANNEL_EXPLICIT enum('N','Y') ")+ - "not null default 'N' after CHANNEL_LANGUAGE"; + sql=QString("alter table `FEEDS` add column `CHANNEL_EXPLICIT` enum('N','Y') ")+ + "not null default 'N' after `CHANNEL_LANGUAGE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table PODCASTS add column ITEM_EXPLICIT enum('N','Y') ")+ - "not null default 'N' after ITEM_SOURCE_URL"; + sql=QString("alter table `PODCASTS` add column `ITEM_EXPLICIT` enum('N','Y') ")+ + "not null default 'N' after `ITEM_SOURCE_URL`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10099,9 +10413,9 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<327)&&(set_schema>cur_schema)) { - sql=QString("alter table FEEDS ")+ - "add column CHANNEL_SUB_CATEGORY varchar(64) "+ - "after CHANNEL_CATEGORY"; + sql=QString("alter table `FEEDS` ")+ + "add column `CHANNEL_SUB_CATEGORY` varchar(64) "+ + "after `CHANNEL_CATEGORY`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10120,41 +10434,41 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<329)&&(set_schema>cur_schema)) { - sql=QString("alter table SYSTEM ")+ - "add column RSS_PROCESSOR_STATION varchar(64) "+ - "after NOTIFICATION_ADDRESS"; + sql=QString("alter table `SYSTEM` ")+ + "add column `RSS_PROCESSOR_STATION` varchar(64) "+ + "after `NOTIFICATION_ADDRESS`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("select NAME from STATIONS where SYSTEM_MAINT='Y'"); + sql=QString("select `NAME` from `STATIONS` where `SYSTEM_MAINT`='Y'"); q=new RDSqlQuery(sql); if(q->first()) { - sql=QString("update SYSTEM set ")+ - "RSS_PROCESSOR_STATION=\""+RDEscapeString(q->value(0).toString())+"\""; + sql=QString("update `SYSTEM` set ")+ + "`RSS_PROCESSOR_STATION`='"+RDEscapeString(q->value(0).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } } delete q; - sql=QString("alter table PODCASTS ")+ - "add column EXPIRATION_DATETIME datetime after EFFECTIVE_DATETIME"; + sql=QString("alter table `PODCASTS` ")+ + "add column `EXPIRATION_DATETIME` datetime after EFFECTIVE_DATETIME"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("select ")+ - "ID,"+ // 00 - "ORIGIN_DATETIME,"+ // 01 - "SHELF_LIFE "+ // 02 - "from PODCASTS where "+ - "SHELF_LIFE>0"; + "`ID`,"+ // 00 + "`ORIGIN_DATETIME`,"+ // 01 + "`SHELF_LIFE` "+ // 02 + "from `PODCASTS` where "+ + "`SHELF_LIFE`>0"; q=new RDSqlQuery(sql); while(q->next()) { - sql=QString("update PODCASTS set ")+ - "EXPIRATION_DATETIME=\""+ + sql=QString("update `PODCASTS` set ")+ + "`EXPIRATION_DATETIME`='"+ q->value(1).toDateTime().addDays(q->value(2).toInt()). - toString("yyyy-MM-dd hh:mm:ss")+"\" where "+ - QString().sprintf("ID=%u",q->value(0).toUInt()); + toString("yyyy-MM-dd hh:mm:ss")+"' where "+ + QString().sprintf("`ID`=%u",q->value(0).toUInt()); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10167,13 +10481,13 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<330)&&(set_schema>cur_schema)) { - sql=QString("alter table PODCASTS ")+ - "add column ORIGIN_LOGIN_NAME varchar(191) after AUDIO_TIME"; + sql=QString("alter table `PODCASTS` ")+ + "add column `ORIGIN_LOGIN_NAME` varchar(191) after `AUDIO_TIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table PODCASTS ")+ - "add column ORIGIN_STATION varchar(64) after ORIGIN_LOGIN_NAME"; + sql=QString("alter table `PODCASTS` ")+ + "add column `ORIGIN_STATION` varchar(64) after `ORIGIN_LOGIN_NAME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10191,9 +10505,9 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<332)&&(set_schema>cur_schema)) { - sql=QString("alter table FEEDS ")+ - "add column CHANNEL_AUTHOR_IS_DEFAULT enum('N','Y') default 'N' "+ - "after CHANNEL_AUTHOR"; + sql=QString("alter table `FEEDS` ")+ + "add column `CHANNEL_AUTHOR_IS_DEFAULT` enum('N','Y') default 'N' "+ + "after `CHANNEL_AUTHOR`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10202,20 +10516,20 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<333)&&(set_schema>cur_schema)) { - sql=QString("alter table STATIONS add ")+ - "SSH_IDENTITY_FILE text after BROWSER_PATH"; + sql=QString("alter table `STATIONS` add ")+ + "`SSH_IDENTITY_FILE` text after `BROWSER_PATH`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table RECORDINGS ")+ - "add column URL_USE_ID_FILE enum('N','Y') default 'N' after URL_PASSWORD"; + sql=QString("alter table `RECORDINGS` ")+ + "add column `URL_USE_ID_FILE` enum('N','Y') default 'N' after `URL_PASSWORD`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEEDS add ")+ - "column PURGE_USE_ID_FILE enum('N','Y') default 'N' after PURGE_PASSWORD"; + sql=QString("alter table `FEEDS` add ")+ + "column `PURGE_USE_ID_FILE` enum('N','Y') default 'N' after `PURGE_PASSWORD`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10224,21 +10538,21 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<334)&&(set_schema>cur_schema)) { - sql=QString("alter table FEEDS modify column ")+ - "PURGE_PASSWORD text"; + sql=QString("alter table `FEEDS` modify column ")+ + "`PURGE_PASSWORD` text"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } sql=QString("select ")+ - "KEY_NAME,"+ // 00 - "PURGE_PASSWORD "+ // 01 - "from FEEDS"; + "`KEY_NAME`,"+ // 00 + "`PURGE_PASSWORD` "+ // 01 + "from `FEEDS`"; q=new RDSqlQuery(sql); while(q->next()) { - sql=QString("update FEEDS set ")+ - "PURGE_PASSWORD=\""+ - RDEscapeString(q->value(1).toString().toUtf8().toBase64())+"\" where "+ - "KEY_NAME=\""+RDEscapeString(q->value(0).toString())+"\""; + sql=QString("update `FEEDS` set ")+ + "`PURGE_PASSWORD`='"+ + RDEscapeString(q->value(1).toString().toUtf8().toBase64())+"' where "+ + "`KEY_NAME`='"+RDEscapeString(q->value(0).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10249,12 +10563,12 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<335)&&(set_schema>cur_schema)) { - sql=QString("alter table PODCASTS add column ")+ - "SHA1_HASH varchar(40) after AUDIO_TIME"; + sql=QString("alter table `PODCASTS` add column ")+ + "`SHA1_HASH` varchar(40) after `AUDIO_TIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table PODCASTS add index SHA1_HASH_IDX(SHA1_HASH)"); + sql=QString("alter table `PODCASTS` add index `SHA1_HASH_IDX` (`SHA1_HASH`)"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10263,8 +10577,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<336)&&(set_schema>cur_schema)) { - sql=QString("alter table FEED_IMAGES modify column ")+ - "DATA longblob not null"; + sql=QString("alter table `FEED_IMAGES` modify column ")+ + "`DATA` longblob not null"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10273,18 +10587,18 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<337)&&(set_schema>cur_schema)) { - sql=QString("alter table FEEDS ")+ - "add index CHANNEL_IMAGE_ID_IDX(CHANNEL_IMAGE_ID)"; + sql=QString("alter table `FEEDS` ")+ + "add index `CHANNEL_IMAGE_ID_IDX` (`CHANNEL_IMAGE_ID`)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table FEEDS ")+ - "add index DEFAULT_ITEM_IMAGE_ID_IDX(DEFAULT_ITEM_IMAGE_ID)"; + sql=QString("alter table `FEEDS` ")+ + "add index `DEFAULT_ITEM_IMAGE_ID_IDX` (`DEFAULT_ITEM_IMAGE_ID`)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table PODCASTS ")+ - "add index ITEM_IMAGE_ID_IDX(ITEM_IMAGE_ID)"; + sql=QString("alter table `PODCASTS` ")+ + "add index `ITEM_IMAGE_ID_IDX` (`ITEM_IMAGE_ID`)"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10293,8 +10607,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<338)&&(set_schema>cur_schema)) { - sql=QString("alter table FEEDS ")+ - "modify column CHANNEL_LANGUAGE varchar(8) default 'en-us'"; + sql=QString("alter table `FEEDS` ")+ + "modify column `CHANNEL_LANGUAGE` varchar(8) default 'en-us'"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10303,9 +10617,9 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<339)&&(set_schema>cur_schema)) { - sql=QString("alter table SERVICES ")+ - "add column SUB_EVENT_INHERITANCE int not null default 0 "+ - "after CHAIN_LOG"; + sql=QString("alter table `SERVICES` ")+ + "add column `SUB_EVENT_INHERITANCE` int not null default 0 "+ + "after `CHAIN_LOG`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10314,23 +10628,23 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<340)&&(set_schema>cur_schema)) { - sql=QString("delete from IMPORTER_LINES"); // Purge stale lines first + sql=QString("delete from `IMPORTER_LINES`"); // Purge stale lines first if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table IMPORTER_LINES ")+ - "add column TYPE int unsigned not null "+ - "after LINE_ID"; + sql=QString("alter table `IMPORTER_LINES` ")+ + "add column `TYPE` int unsigned not null "+ + "after `LINE_ID`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table IMPORTER_LINES ")+ - "modify column START_HOUR int"; + sql=QString("alter table `IMPORTER_LINES` ")+ + "modify column `START_HOUR` int"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table IMPORTER_LINES ")+ - "modify column START_SECS int"; + sql=QString("alter table `IMPORTER_LINES` ")+ + "modify column `START_SECS` int"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10345,22 +10659,22 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<341)&&(set_schema>cur_schema)) { - sql=QString("delete from IMPORTER_LINES"); // Purge stale lines first + sql=QString("delete from `IMPORTER_LINES`"); // Purge stale lines first if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table IMPORTER_LINES ")+ - "add column FILE_LINE int unsigned not null after PROCESS_ID"; + sql=QString("alter table `IMPORTER_LINES` ")+ + "add column `FILE_LINE` int unsigned not null after `PROCESS_ID`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table IMPORTER_LINES ")+ - "add column LINK_START_TIME time after EXT_CART_NAME"; + sql=QString("alter table `IMPORTER_LINES` ")+ + "add column `LINK_START_TIME` time after `EXT_CART_NAME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table IMPORTER_LINES ")+ - "add column LINK_LENGTH int after LINK_START_TIME"; + sql=QString("alter table `IMPORTER_LINES` ")+ + "add column `LINK_LENGTH` int after `LINK_START_TIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10370,7 +10684,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) if((cur_schema<342)&&(set_schema>cur_schema)) { sql= - QString("create index EVENT_DATETIME_IDX on GPIO_EVENTS(EVENT_DATETIME)"); + QString("create index `EVENT_DATETIME_IDX` on `GPIO_EVENTS` (`EVENT_DATETIME`)"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10379,17 +10693,17 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<343)&&(set_schema>cur_schema)) { - sql=QString("create table if not exists ENCODER_PRESETS (")+ - "ID int auto_increment not null primary key,"+ - "NAME varchar(64) not null,"+ - "FORMAT int unsigned not null,"+ - "CHANNELS int unsigned not null,"+ - "SAMPLE_RATE int unsigned not null,"+ - "BIT_RATE int unsigned not null,"+ - "QUALITY int unsigned not null,"+ - "NORMALIZATION_LEVEL int not null,"+ - "AUTOTRIM_LEVEL int not null,"+ - "unique index NAME_IDX (NAME))"+ + sql=QString("create table if not exists `ENCODER_PRESETS` (")+ + "`ID` int auto_increment not null primary key,"+ + "`NAME` varchar(64) not null,"+ + "`FORMAT` int unsigned not null,"+ + "`CHANNELS` int unsigned not null,"+ + "`SAMPLE_RATE` int unsigned not null,"+ + "`BIT_RATE` int unsigned not null,"+ + "`QUALITY` int unsigned not null,"+ + "`NORMALIZATION_LEVEL` int not null,"+ + "`AUTOTRIM_LEVEL` int not null,"+ + "unique index `NAME_IDX` (`NAME`))"+ " charset utf8mb4 collate utf8mb4_general_ci"+ db_table_create_postfix; if(!RDSqlQuery::apply(sql,err_msg)) { @@ -10400,16 +10714,16 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<344)&&(set_schema>cur_schema)) { - sql=QString("alter table SYSTEM add column ")+ - "ORIGIN_EMAIL_ADDRESS varchar(64) not null "+ + sql=QString("alter table `SYSTEM` add column ")+ + "`ORIGIN_EMAIL_ADDRESS` varchar(64) not null "+ "default 'Rivendell ' "+ - "after RSS_PROCESSOR_STATION"; + "after `RSS_PROCESSOR_STATION`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table GROUPS add column ")+ - "NOTIFY_EMAIL_ADDRESS text after COLOR"; + sql=QString("alter table `GROUPS` add column ")+ + "`NOTIFY_EMAIL_ADDRESS` text after `COLOR`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10418,8 +10732,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<345)&&(set_schema>cur_schema)) { - sql=QString("alter table DROPBOXES add column ")+ - "SEND_EMAIL enum('N','Y') not null default 'N' after DELETE_SOURCE"; + sql=QString("alter table `DROPBOXES` add column ")+ + "`SEND_EMAIL` enum('N','Y') not null default 'N' after `DELETE_SOURCE`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10427,12 +10741,12 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<346)&&(set_schema>cur_schema)) { - sql=QString("alter table USERS drop column ADMIN_USERS_PRIV"); + sql=QString("alter table `USERS` drop column `ADMIN_USERS_PRIV`"); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } - sql=QString("alter table USERS add column ")+ - "ADMIN_RSS_PRIV enum('N','Y') not null default 'N' "+ + sql=QString("alter table `USERS` add column ")+ + "`ADMIN_RSS_PRIV` enum('N','Y') not null default 'N' "+ "after ADMIN_CONFIG_PRIV"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; @@ -10442,8 +10756,8 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) } if((cur_schema<347)&&(set_schema>cur_schema)) { - sql=QString("alter table STACK_LINES add column ")+ - "TITLE varchar(191) not null after ARTIST"; + sql=QString("alter table `STACK_LINES` add column ")+ + "`TITLE` varchar(191) not null after `ARTIST`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10476,7 +10790,7 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg) // Update Cart Lengths, If Required // if(length_update_required) { - sql=QString().sprintf("select NUMBER from CART where TYPE=%u", + sql=QString().sprintf("select `NUMBER` from `CART` where `TYPE`=%u", RDCart::Audio); q=new RDSqlQuery(sql,false); while(q->next()) { @@ -10506,11 +10820,11 @@ void MainObject::AverageCuts89(unsigned cartnum) const RDSqlQuery *q; sql=QString("select ")+ - "LENGTH,"+ - "WEIGHT,"+ - "END_DATETIME "+ - "from CUTS where "+ - QString().sprintf("(CART_NUMBER=%u)&&(LENGTH>0)",cartnum); + "`LENGTH`,"+ // 00 + "`WEIGHT`,"+ // 01 + "`END_DATETIME` "+ // 02 + "from `CUTS` where "+ + QString().sprintf("(`CART_NUMBER`=%u)&&(`LENGTH`>0)",cartnum); q=new RDSqlQuery(sql,false); while(q->next()) { weight = q->value(1).toUInt(); @@ -10543,10 +10857,10 @@ void MainObject::AverageCuts89(unsigned cartnum) const else { max_dev=avg-low; } - sql=QString("update CART set ")+ - QString().sprintf("LENGTH_DEVIATION=%u,",max_dev)+ - QString().sprintf("AVERAGE_LENGTH=%u where ",avg)+ - QString().sprintf("NUMBER=%u",cartnum); + sql=QString("update `CART` set ")+ + QString().sprintf("`LENGTH_DEVIATION`=%u,",max_dev)+ + QString().sprintf("`AVERAGE_LENGTH`=%u where ",avg)+ + QString().sprintf("`NUMBER`=%u",cartnum); q=new RDSqlQuery(sql,false); delete q; } @@ -10556,8 +10870,8 @@ void MainObject::TotalMacros89(unsigned cartnum) const { int len=0; - QString sql=QString("select MACROS from CART where ")+ - QString().sprintf("NUMBER=%d",cartnum); + QString sql=QString("select `MACROS` from `CART` where ")+ + QString().sprintf("`NUMBER`=%d",cartnum); RDSqlQuery *q=new RDSqlQuery(sql,false); if(q->first()) { QStringList f0=q->value(0).toString().split("!"); @@ -10568,10 +10882,10 @@ void MainObject::TotalMacros89(unsigned cartnum) const } } delete q; - sql=QString("update CART set ")+ - QString().sprintf("AVERAGE_LENGTH=%u,",len)+ - QString().sprintf("FORCED_LENGTH=%u ",len)+ - QString().sprintf("where NUMBER=%u",cartnum); + sql=QString("update `CART` set ")+ + QString().sprintf("`AVERAGE_LENGTH`=%u,",len)+ + QString().sprintf("`FORCED_LENGTH`=%u ",len)+ + QString().sprintf("where `NUMBER`=%u",cartnum); q=new RDSqlQuery(sql,false); delete q; } @@ -10582,7 +10896,7 @@ void MainObject::CreateAuxFieldsTable143(const QString &key_name) const QString keyname=key_name; keyname.replace(" ","_"); QString sql=QString("create table if not exists `")+ - keyname+"_FIELDS` (CAST_ID int unsigned not null primary key) "+ + keyname+"_FIELDS` (`CAST_ID` int unsigned not null primary key) "+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; RDSqlQuery *q=new RDSqlQuery(sql); @@ -10599,11 +10913,11 @@ void MainObject::CreateFeedLog151(const QString &key_name) const keyname.replace(" ","_"); sql=QString("create table if not exists `")+keyname+"_FLG` ("+ - "ID int unsigned primary key auto_increment,"+ - "CAST_ID int unsigned,"+ - "ACCESS_DATE date,"+ - "ACCESS_COUNT int unsigned default 0,"+ - "index CAST_ID_IDX(CAST_ID,ACCESS_DATE))"+ + "`ID` int unsigned primary key auto_increment,"+ + "`CAST_ID` int unsigned,"+ + "`ACCESS_DATE` date,"+ + "`ACCESS_COUNT` int unsigned default 0,"+ + "index `CAST_ID_IDX` (`CAST_ID`,`ACCESS_DATE`))"+ " charset latin1 collate latin1_swedish_ci"+ db_table_create_postfix; q=new RDSqlQuery(sql); @@ -10618,7 +10932,7 @@ bool MainObject::UpdateLogTable186(const QString &table,QString *err_msg) const // // Drop POST_TIME // - sql=QString("alter table `")+table+"` drop column POST_TIME"; + sql=QString("alter table `")+table+"` drop column `POST_TIME`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10647,7 +10961,7 @@ bool MainObject::ConvertTimeField186(const QString &table,const QString &field, // Create temporary field // sql=QString("alter table `")+table+ - "` add column "+field+"_TEMP int after "+field; + "` add column `"+field+"_TEMP` int after `"+field+"`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10655,13 +10969,13 @@ bool MainObject::ConvertTimeField186(const QString &table,const QString &field, // // Copy data to temporary field // - sql=QString("select ID,")+field+" from `"+table+"`"; + sql=QString("select `ID`,`")+field+"` from `"+table+"`"; q=new RDSqlQuery(sql,false); while(q->next()) { if(!q->value(1).isNull()) { sql=QString("update `")+table+ - "` set "+ - field+QString().sprintf("_TEMP=%d where ID=%d", + "` set `"+ + field+QString().sprintf("_TEMP`=%d where `ID`=%d", QTime().msecsTo(q->value(1).toTime()), q->value(0).toInt()); if(!RDSqlQuery::apply(sql,err_msg)) { @@ -10674,7 +10988,7 @@ bool MainObject::ConvertTimeField186(const QString &table,const QString &field, // // Convert primary field // - sql=QString("alter table `")+table+"` modify column "+field+" int"; + sql=QString("alter table `")+table+"` modify column `"+field+"` int"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10682,13 +10996,13 @@ bool MainObject::ConvertTimeField186(const QString &table,const QString &field, // // Copy data back to primary field // - sql=QString("select ID,")+field+"_TEMP from `"+table+"`"; + sql=QString("select `ID`,`")+field+"_TEMP` from `"+table+"`"; q=new RDSqlQuery(sql,false); while(q->next()) { if(!q->value(1).isNull()) { sql=QString("update `")+table+ - "` set "+field+ - QString().sprintf("=%d where ID=%d", + "` set `"+field+ + QString().sprintf("`=%d where `ID`=%d", q->value(1).toInt(), q->value(0).toInt()); if(!RDSqlQuery::apply(sql,err_msg)) { @@ -10701,7 +11015,7 @@ bool MainObject::ConvertTimeField186(const QString &table,const QString &field, // // Delete Temporary field // - sql=QString("alter table `")+table+"` drop column "+field+"_TEMP"; + sql=QString("alter table `")+table+"` drop column `"+field+"_TEMP`"; if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10715,7 +11029,7 @@ bool MainObject::ConvertArtistSep307(QString *err_msg) const RDSqlQuery *q; int max=-1; - sql=QString("select ARTISTSEP from CLOCKS"); + sql=QString("select `ARTISTSEP` from `CLOCKS`"); q=new RDSqlQuery(sql,false); while(q->next()) { if(q->value(0).toInt()>max) { @@ -10724,7 +11038,7 @@ bool MainObject::ConvertArtistSep307(QString *err_msg) const } delete q; - sql=QString().sprintf("update EVENTS set ARTIST_SEP=%d",max); + sql=QString().sprintf("update `EVENTS` set `ARTIST_SEP`=%d",max); if(!RDSqlQuery::apply(sql,err_msg)) { return false; } @@ -10740,12 +11054,12 @@ bool MainObject::StackLineTitles347(QString *err_msg) const // // Add titles to STACK_LINES // - q=new RDSqlQuery("select NUMBER,TITLE from CART",false); + q=new RDSqlQuery("select `NUMBER`,`TITLE` from `CART`",false); while(q->next()) { if(!q->value(1).isNull()) { - sql=QString("update STACK_LINES set ")+ - "TITLE=\""+RDEscapeString(q->value(1).toString().toLower().replace(" ",""))+"\" "+ - "where CART=\""+RDEscapeString(q->value(0).toString())+"\""; + sql=QString("update `STACK_LINES` set ")+ + "`TITLE`='"+RDEscapeString(q->value(1).toString().toLower().replace(" ",""))+"' "+ + "where `CART`='"+RDEscapeString(q->value(0).toString())+"'"; if(!RDSqlQuery::apply(sql,err_msg)) { delete q; return false; @@ -10756,4 +11070,3 @@ bool MainObject::StackLineTitles347(QString *err_msg) const return true; } -