mirror/TinyORM
1
0
Fork 0
mirror of https://github.com/silverqx/TinyORM.git synced 2026-02-13 22:09:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

rewritten MySqlConnector::parseConfigOptions()

Browse Source
This commit is contained in:
silverqx
2022-01-18 10:00:40 +01:00
parent f4106a8d38
commit 0442807a51
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/orm/connectors/mysqlconnector.cpp
View File

@@ -61,26 +61,28 @@ MySqlConnector::getConnectorOptions() const
void MySqlConnector::parseConfigOptions(QVariantHash &options) const
{
// This connection options are banned
static const QVariantHash banned {
// We have our own reconnector
{QStringLiteral("MYSQL_OPT_RECONNECT"), 1},
struct BannedValue
{
QVariant value;
QString message;
};
auto itOption = banned.constBegin();
while (itOption != banned.constEnd()) {
const auto &key = itOption.key();
const auto &value = itOption.value();
// This connection options are banned
static const std::unordered_map<QString, BannedValue> bannedMap {
// We have our own reconnector
{QStringLiteral("MYSQL_OPT_RECONNECT"),
{1, QStringLiteral(" TinyORM uses its own reconnector.")}},
};
// BUG rewrite silverqx
if (options.contains(key) && options[key] == value)
for (const auto &banned : bannedMap) {
const auto &key = banned.first;
const auto &value = banned.second;
if (options.contains(key) && options[key] == value.value)
throw Exceptions::RuntimeError(
QStringLiteral(
"The connection option '%1' is not allowed in the TinyORM, "
"TinyORM uses its own reconnector.")
.arg(key));
++itOption;
"The '%1' connection option is not allowed in the TinyORM.%2")
.arg(key, value.message));
}
}

1
src/orm/support/configurationoptionsparser.cpp
View File

@@ -60,6 +60,7 @@ ConfigurationOptionsParser::validateConfigOptions(const QVariant &options) const
QVariantHash
ConfigurationOptionsParser::prepareConfigOptions(const QVariant &options) const
{
// CUR verify, I have qt5/6 macros across whole app for this silverqx
// Input is already validated, so I can be sure that options key is QVariantHash
if (options.userType() != QMetaType::QString)
return options.value<QVariantHash>();