Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-11 09:03:40 +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

33
lib/rdconfig.cpp
View File

@@ -188,18 +188,6 @@ QString RDConfig::mysqlEngine() const
}
QString RDConfig::mysqlCharset() const
{
return conf_mysql_charset;
}
QString RDConfig::mysqlCollation() const
{
return conf_mysql_collation;
}
QString RDConfig::createTablePostfix() const
{
return conf_create_table_postfix;
@@ -590,18 +578,8 @@ void RDConfig::load()
DEFAULT_MYSQL_HEARTBEAT_INTERVAL);
conf_mysql_engine=
profile->stringValue("mySQL","Engine",DEFAULT_MYSQL_ENGINE);
conf_mysql_charset=
profile->stringValue("mySQL","Charset",DEFAULT_MYSQL_CHARSET);
conf_mysql_collation=
profile->stringValue("mySQL","Collation",DEFAULT_MYSQL_COLLATION);
/*
conf_create_table_postfix=QString(" engine ")+conf_mysql_engine+" "+
"character set "+conf_mysql_charset+" "+
"collate "+conf_mysql_collation;
*/
conf_create_table_postfix=
RDConfig::createTablePostfix(conf_mysql_engine,conf_mysql_charset,
conf_mysql_collation);
RDConfig::createTablePostfix(conf_mysql_engine);
facility=profile->stringValue("Logs","Facility",DEFAULT_LOG_FACILITY).lower();
if(facility=="syslog") {
@@ -709,8 +687,6 @@ void RDConfig::clear()
conf_mysql_driver="";
conf_mysql_heartbeat_interval=DEFAULT_MYSQL_HEARTBEAT_INTERVAL;
conf_mysql_engine=DEFAULT_MYSQL_ENGINE;
conf_mysql_charset=DEFAULT_MYSQL_CHARSET;
conf_mysql_collation=DEFAULT_MYSQL_COLLATION;
conf_create_table_postfix="";
conf_log_facility=RDConfig::LogSyslog;
conf_log_directory="";
@@ -775,10 +751,7 @@ QString RDConfig::userAgent(const QString &modname)
}
QString RDConfig::createTablePostfix(const QString &engine,
const QString &charset,
const QString &collation)
QString RDConfig::createTablePostfix(const QString &engine)
{
return QString(" engine ")+engine+" "+"character set "+charset+" "+
"collate "+collation;
return QString(" engine ")+engine+" ";
}

8
lib/rdconfig.h
View File

@@ -61,8 +61,6 @@ class RDConfig
QString mysqlDriver() const;
int mysqlHeartbeatInterval() const;
QString mysqlEngine() const;
QString mysqlCharset() const;
QString mysqlCollation() const;
QString createTablePostfix() const;
RDConfig::LogFacility logFacility() const;
QString logDirectory() const;
@@ -120,9 +118,7 @@ class RDConfig
void load();
void clear();
static QString userAgent(const QString &modname);
static QString createTablePostfix(const QString &engine,
const QString &charset,
const QString &collation);
static QString createTablePostfix(const QString &engine);
private:
QString conf_filename;
@@ -133,8 +129,6 @@ class RDConfig
QString conf_mysql_password;
QString conf_mysql_driver;
QString conf_mysql_engine;
QString conf_mysql_charset;
QString conf_mysql_collation;
QString conf_create_table_postfix;
int conf_mysql_heartbeat_interval;
RDConfig::LogFacility conf_log_facility;

3
lib/rddb.cpp
View File

@@ -163,8 +163,7 @@ bool RDOpenDb (int *schema,QString *err_str,RDConfig *config)
}
}
new RDDbHeartbeat(config->mysqlHeartbeatInterval());
sql=QString("set NAMES '")+config->mysqlCharset()+"'"+
"COLLATE '"+config->mysqlCollation()+"'";
sql=QString("set NAMES utf8mb4 collate utf8mb4_general_ci");
q=new QSqlQuery(sql);
delete q;