mirror/TinyORM
1
0
Fork 0
mirror of https://github.com/silverqx/TinyORM.git synced 2026-01-07 11:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

enhanced TinyUtils library

Browse Source
This commit is contained in:
silverqx
2023-03-31 16:36:53 +02:00
parent c4b70ff337
commit edb33acf31
2 changed files with 10 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
tests/TinyUtils/src/databases.cpp
View File

@@ -130,7 +130,7 @@ Databases::createConnectionTemp(
const auto driver = configuration[driver_].value<QString>().toUpper();
if (!isDriverAvailable(driver) ||
allEnvVariablesEmpty(envVariables(driver, connection))
!envVariablesDefined(envVariables(driver, connection))
)
return std::nullopt;
@@ -203,12 +203,12 @@ bool Databases::removeConnection(const QString &connection)
return m_dm->removeConnection(connection);
}
bool Databases::allEnvVariablesEmpty(const std::vector<const char *> &envVariables)
bool Databases::envVariablesDefined(const std::vector<const char *> &envVariables)
{
return std::all_of(envVariables.cbegin(), envVariables.cend(),
return std::any_of(envVariables.cbegin(), envVariables.cend(),
[](const char *envVariable)
{
return qEnvironmentVariableIsEmpty(envVariable);
return !qEnvironmentVariableIsEmpty(envVariable);
});
}
@@ -295,12 +295,7 @@ Databases::mysqlConfiguration()
// {"MYSQL_OPT_READ_TIMEOUT", 10}}},
};
// All Environment variables are empty
if (allEnvVariablesEmpty(mysqlEnvVariables()))
return {std::move(config), false};
// Environment variables are defined
return {std::move(config), true};
return {std::move(config), envVariablesDefined(mysqlEnvVariables())};
}
std::pair<QVariantHash, bool>
@@ -336,12 +331,7 @@ Databases::mariaConfiguration()
// {"MYSQL_OPT_READ_TIMEOUT", 10}}},
};
// All Environment variables are empty
if (allEnvVariablesEmpty(mariaEnvVariables()))
return {std::move(config), false};
// Environment variables are defined
return {std::move(config), true};
return {std::move(config), envVariablesDefined(mariaEnvVariables())};
}
std::pair<QVariantHash, bool>
@@ -363,12 +353,7 @@ Databases::sqliteConfiguration()
{prefix_indexes, false},
};
// All Environment variables are empty
if (allEnvVariablesEmpty(sqliteEnvVariables()))
return {std::move(config), false};
// Environment variables are defined
return {std::move(config), true};
return {std::move(config), envVariablesDefined(sqliteEnvVariables())};
}
std::pair<QVariantHash, bool>
@@ -396,12 +381,7 @@ Databases::postgresConfiguration()
{options_, ConfigUtils::postgresSslOptions()},
};
// All Environment variables are empty
if (allEnvVariablesEmpty(postgresEnvVariables()))
return {std::move(config), false};
// Environment variables are defined
return {std::move(config), true};
return {std::move(config), envVariablesDefined(postgresEnvVariables())};
}
const std::vector<const char *> &

4
tests/TinyUtils/src/databases.hpp
View File

@@ -97,8 +97,8 @@ namespace TestUtils
/*! Remove a database connection. */
static bool removeConnection(const QString &connection);
/*! Check whether all environment variables are empty. */
static bool allEnvVariablesEmpty(const std::vector<const char *> &envVariables);
/*! Check whether environment variables are correctly set. */
static bool envVariablesDefined(const std::vector<const char *> &envVariables);
/*! Get a reference to the database manager. */
static const std::shared_ptr<Orm::DatabaseManager> &manager();