2019-02-19 Fred Gleason <fredg@paravelsystems.com>

* Dropped the 'RDLIBRARY.INSTANCE' field from the database.
	* Incremented the database version to 306.
This commit is contained in:
Fred Gleason 2019-02-19 15:06:31 -05:00
parent 8a70993a33
commit 7ac41a06f7
5 changed files with 33 additions and 3 deletions

View File

@ -18487,3 +18487,6 @@
2019-02-19 Fred Gleason <fredg@paravelsystems.com>
* Changed the minimum size of the 'Edit PyPAD Instance dialog in
rdadmin(1) to be 600x660.
2019-02-19 Fred Gleason <fredg@paravelsystems.com>
* Dropped the 'RDLIBRARY.INSTANCE' field from the database.
* Incremented the database version to 306.

View File

@ -24,7 +24,7 @@
/*
* Current Database Version
*/
#define RD_VERSION_DATABASE 305
#define RD_VERSION_DATABASE 306
#endif // DBVERSION_H

View File

@ -40,6 +40,23 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg)
// NEW SCHEMA REVERSIONS GO HERE...
//
// Revert 306
//
if((cur_schema==306)&&(set_schema<cur_schema)) {
sql=QString("alter table RDLIBRARY drop index STATION_IDX");
RDSqlQuery::apply(sql);
sql=QString("alter table RDLIBRARY add column ")+
"INSTANCE int unsigned not null after STATION";
RDSqlQuery::apply(sql);
sql=QString("create index STATION_IDX on RDLIBRARY (STATION,INSTANCE)");
RDSqlQuery::apply(sql);
WriteSchemaVersion(--cur_schema);
}
//
// Revert 305
//

View File

@ -122,7 +122,7 @@ void MainObject::InitializeSchemaMap() {
// (upcoming) release. If this is the first schema change made after a
// public release, a line referencing the next (upcoming) release should
// be added and its value set to that of the new schema version. Otherwise,
// it should be incremented every time a schmea update is committed.
// it should be incremented every time a schema update is committed.
//
// When the first production release in the minor version referenced
// on the last line occurs, that line too is declared immutable, and
@ -156,7 +156,7 @@ void MainObject::InitializeSchemaMap() {
global_version_map["2.17"]=268;
global_version_map["2.18"]=272;
global_version_map["2.19"]=275;
global_version_map["3.0"]=305;
global_version_map["3.0"]=306;
}

View File

@ -9671,6 +9671,16 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg)
WriteSchemaVersion(++cur_schema);
}
if((cur_schema<306)&&(set_schema>cur_schema)) {
sql=QString("alter table RDLIBRARY drop index STATION_IDX");
RDSqlQuery::apply(sql);
DropColumn("RDLIBRARY","INSTANCE");
sql=QString("create index STATION_IDX on RDLIBRARY (STATION)");
RDSqlQuery::apply(sql);
WriteSchemaVersion(++cur_schema);
}
// NEW SCHEMA UPDATES GO HERE...