Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-17 16:11:12 +02:00
Code Issues Projects Releases Wiki Activity

2018-10-08 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Removed the 'Charset=' and 'Collation=' parameters from the
	'[mySQL]' section of rd.conf(5).
	* Removed support for the --mysql-charset=' and '--mysql-collation='
	switches in rddbmgr(8).
	* Refactored handling of character set and collation attributes
	in rddbmgr(8) to treat them as immutable parts of the DB schema.
This commit is contained in:
Fred Gleason
2018-10-08 18:38:12 -04:00
parent d6a45dbd6d
commit 58d856a726
16 changed files with 499 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
utils/rddbmgr/rddbmgr.h
View File

@@ -78,13 +78,14 @@ class MainObject : public QObject
//
// modify.cpp
//
bool Modify(QString *err_msg,int set_schema) const;
bool Modify(QString *err_msg,int set_schema);
int GetCurrentSchema() const;
bool ModifyCharset(const QString &charset,const QString &collation);
//
// updateschema.cpp
//
bool UpdateSchema(int cur_schema,int set_schema,QString *err_msg) const;
bool UpdateSchema(int cur_schema,int set_schema,QString *err_msg);
void AverageCuts89(unsigned cartnum) const;
void TotalMacros89(unsigned cartnum) const;
void CreateAuxFieldsTable143(const QString &key_name) const;
@@ -96,7 +97,7 @@ class MainObject : public QObject
//
// revertschema.cpp
//
bool RevertSchema(int cur_schema,int set_schema,QString *err_msg) const;
bool RevertSchema(int cur_schema,int set_schema,QString *err_msg);
//
// schemamap.cpp
@@ -120,8 +121,6 @@ class MainObject : public QObject
QString db_mysql_database;
QString db_mysql_driver;
QString db_mysql_engine;
QString db_mysql_charset;
QString db_mysql_collation;
bool db_verbose;
bool db_yes;
bool db_no;