From 79953efa7f8502bc930b97fcca6720d4f34d0fb4 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 27 Aug 2014 14:02:17 -0400 Subject: [PATCH] 2014-08-27 Fred Gleason * Fixed a regression in 'lib/rdcreate_log.cpp' that caused auxiliary table creation to fail. --- ChangeLog | 3 +++ lib/rdcreate_log.cpp | 6 +++--- lib/rdsvc.cpp | 2 +- rdlogmanager/edit_clock.cpp | 2 +- rdlogmanager/list_clocks.cpp | 2 +- utils/rddbcheck/rddbcheck.cpp | 23 +++++++++-------------- 6 files changed, 18 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1283d523..94b5acbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14401,3 +14401,6 @@ * Removed code that disabled 'Delete cuts before importing' checkbox when no 'To Cart' value was specified in the 'Dropbox Configuration' dialog in 'rdadmin/edit_dropbox.cpp'. +2014-08-27 Fred Gleason + * Fixed a regression in 'lib/rdcreate_log.cpp' that caused auxiliary + table creation to fail. diff --git a/lib/rdcreate_log.cpp b/lib/rdcreate_log.cpp index 6bf28c61..e4c267cf 100644 --- a/lib/rdcreate_log.cpp +++ b/lib/rdcreate_log.cpp @@ -38,7 +38,7 @@ void RDCreateLogTable(const QString &name) QString RDCreateLogTableSql(QString name) { - return QString("create table if not exists `")+RDLog::tableName(name)+"`"+ + return QString("create table if not exists `")+name+"`"+ "(ID INT NOT NULL PRIMARY KEY,"+ "COUNT INT NOT NULL,"+ "TYPE INT DEFAULT 0,"+ @@ -86,7 +86,7 @@ QString RDCreateLogTableSql(QString name) QString RDCreateClockTableSql(QString name) { - return QString("create table `")+RDClock::tableName(name)+"` ("+ + return QString("create table `")+name+"` ("+ "ID int unsigned auto_increment not null primary key,"+ "EVENT_NAME char(64) not null,"+ "START_TIME int not null,"+ @@ -97,7 +97,7 @@ QString RDCreateClockTableSql(QString name) QString RDCreateReconciliationTableSql(QString name) { - QString sql=QString("create table `")+RDSvc::svcTableName(name)+"` ("+ + QString sql=QString("create table `")+name+"` ("+ "ID int unsigned auto_increment primary key,"+ "LENGTH int,"+ "LOG_NAME char(64),"+ diff --git a/lib/rdsvc.cpp b/lib/rdsvc.cpp index fad746af..88335cf6 100644 --- a/lib/rdsvc.cpp +++ b/lib/rdsvc.cpp @@ -1326,7 +1326,7 @@ void RDSvc::create(const QString exemplar) const // // Create Service Reconciliation Table // - sql=RDCreateReconciliationTableSql(svc_name); + sql=RDCreateReconciliationTableSql(RDSvc::svcTableName(svc_name)); q=new RDSqlQuery(sql); delete q; } diff --git a/rdlogmanager/edit_clock.cpp b/rdlogmanager/edit_clock.cpp index 2b5ef7b5..4d4baf9d 100644 --- a/rdlogmanager/edit_clock.cpp +++ b/rdlogmanager/edit_clock.cpp @@ -461,7 +461,7 @@ void EditClock::saveAsData() } delete q; edit_clock->setName(clockname); - sql=RDCreateClockTableSql(clockname); + sql=RDCreateClockTableSql(RDClock::tableName(clockname)); q=new RDSqlQuery(sql); delete q; diff --git a/rdlogmanager/list_clocks.cpp b/rdlogmanager/list_clocks.cpp index 6b92b958..9d0d8371 100644 --- a/rdlogmanager/list_clocks.cpp +++ b/rdlogmanager/list_clocks.cpp @@ -247,7 +247,7 @@ void ListClocks::addData() (const char *)clockname); q=new RDSqlQuery(sql); delete q; - sql=RDCreateClockTableSql(clockname); + sql=RDCreateClockTableSql(RDClock::tableName(clockname)); q=new RDSqlQuery(sql); delete q; EditClock *clock_dialog=new EditClock(clockname,true,&new_clocks, diff --git a/utils/rddbcheck/rddbcheck.cpp b/utils/rddbcheck/rddbcheck.cpp index c1f4978e..f6c4e166 100644 --- a/utils/rddbcheck/rddbcheck.cpp +++ b/utils/rddbcheck/rddbcheck.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -283,20 +284,16 @@ void MainObject::CheckClocks() QSqlQuery *q1; QSqlQuery *q2; QSqlQuery *q3; - QString clockname; QString eventname; sql="select NAME from CLOCKS"; q=new QSqlQuery(sql); while(q->next()) { - clockname=q->value(0).toString(); - clockname.replace(" ","_"); - // // Check the CLK Table // - sql=QString().sprintf ("select EVENT_NAME,ID from %s_CLK", - (const char *)clockname); + sql=QString("select EVENT_NAME,ID from ")+ + RDClock::tableName(q->value(0).toString()); q1=new QSqlQuery(sql); if(q1->isActive()) { // @@ -309,15 +306,14 @@ void MainObject::CheckClocks() if(q2->first()) { if(q1->value(0)!=q2->value(0)) { // Make sure the cases match! printf(" Clock %s's linkage to event %s is broken -- fix (y/N)? ", - (const char *)clockname, + (const char *)q->value(0).toString(), (const char *)q2->value(0).toString()); fflush(NULL); if(UserResponse()) { - sql=QString().sprintf("update %s_CLK set EVENT_NAME=\"%s\"\ - where ID=%d", - (const char *)clockname, - (const char *)q2->value(0).toString(), - q1->value(1).toInt()); + sql=QString("update ")+ + RDClock::tableName(q->value(0).toString())+ + " set EVENT_NAME=\""+RDEscapeString(q2->value(0).toString())+ + "\""+QString().sprintf(" where ID=%d",q1->value(1).toInt()); q3=new QSqlQuery(sql); delete q3; } @@ -331,7 +327,7 @@ void MainObject::CheckClocks() (const char *)q->value(0).toString()); fflush(NULL); if(UserResponse()) { - sql=RDCreateClockTableSql(clockname); + sql=RDCreateClockTableSql(RDClock::tableName(q->value(0).toString())); q2=new QSqlQuery(sql); delete q2; } @@ -339,7 +335,6 @@ void MainObject::CheckClocks() delete q1; } delete q; - }