Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-06-08 08:02:41 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'deltecent-issue-274'

Browse Source
This commit is contained in:
Fred Gleason 2018-10-23 11:13:13 -04:00
commit 9bf2b5e30d
5 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -17851,6 +17851,7 @@
2018-10-19 Fred Gleason <fredg@paravelsystems.com> 2018-10-19 Fred Gleason <fredg@paravelsystems.com>
* Removed check for Win32 installer from 'configure.ac'. * Removed check for Win32 installer from 'configure.ac'.
* Removed win32 clauses from '.pro' files. * Removed win32 clauses from '.pro' files.
<<<<<<< HEAD
2018-10-19 Fred Gleason <fredg@paravelsystems.com> 2018-10-19 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'make slack' target. * Removed the 'make slack' target.
* Removed the 'make slax' target. * Removed the 'make slax' target.
@ -17886,3 +17887,7 @@
* Disable play/stop button focus in rdlibrary(1) * Disable play/stop button focus in rdlibrary(1)
* Added space bar shortcut to play/stop buttons in rdlibrary(1) * Added space bar shortcut to play/stop buttons in rdlibrary(1)
* Fixed bug in cart validation after edit in rdlibrary(1) * Fixed bug in cart validation after edit in rdlibrary(1)
2018-10-23 Patrick Linstruth <patrick@deltecent.com>
* Changed 'RDLOGEDIT.INPUT_CARD' and 'RDLOGEDIT.OUTPUT_CARD'
defaults to 0 to match RDLIBRARY defaults
* Incremented the database version to 298.

2
lib/dbversion.h
View File

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

18
utils/rddbmgr/revertschema.cpp
View File

@ -40,6 +40,24 @@ bool MainObject::RevertSchema(int cur_schema,int set_schema,QString *err_msg)
// NEW SCHEMA REVERSIONS GO HERE... // NEW SCHEMA REVERSIONS GO HERE...
//
// Revert 298
//
if((cur_schema==298)&&(set_schema<cur_schema)) {
sql=QString("alter table RDLOGEDIT ")+
"modify column INPUT_CARD int(11) default -1";
if(!RDSqlQuery::apply(sql,err_msg)) {
return false;
}
sql=QString("alter table RDLOGEDIT ")+
"modify column OUTPUT_CARD int(11) default -1";
if(!RDSqlQuery::apply(sql,err_msg)) {
return false;
}
WriteSchemaVersion(--cur_schema);
}
// //
// Maintainer's Note: // Maintainer's Note:

2
utils/rddbmgr/schemamap.cpp
View File

@ -140,7 +140,7 @@ void MainObject::InitializeSchemaMap() {
global_version_map["2.17"]=268; global_version_map["2.17"]=268;
global_version_map["2.18"]=272; global_version_map["2.18"]=272;
global_version_map["2.19"]=275; global_version_map["2.19"]=275;
global_version_map["3.0"]=297; global_version_map["3.0"]=298;
} }

16
utils/rddbmgr/updateschema.cpp
View File

@ -9741,6 +9741,22 @@ bool MainObject::UpdateSchema(int cur_schema,int set_schema,QString *err_msg)
WriteSchemaVersion(++cur_schema); WriteSchemaVersion(++cur_schema);
} }
if((cur_schema<298)&&(set_schema>cur_schema)) {
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";
if(!RDSqlQuery::apply(sql,err_msg)) {
return false;
}
WriteSchemaVersion(++cur_schema);
}
// //
// Maintainer's Note: // Maintainer's Note:
// //