feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Sqlite: Return auto instead of type to symplify test overload

Browse Source 
Change-Id: I4b613a93f823f346021118eb532ae660295f3c6b
Reviewed-by: Tapani Mattila <tapani.mattila@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Marco Bubke
2021-03-18 11:21:04 +01:00
parent f777ab0f0a
commit 1ad6133161
1 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/libs/sqlite/sqlitebasestatement.h
View File

@@ -212,10 +212,8 @@ public:
return resultValues; return resultValues;
} }
template <typename ResultType, template<typename ResultType, int ResultTypeCount = 1, typename... QueryTypes>
int ResultTypeCount = 1, auto values(std::size_t reserveSize, const QueryTypes &...queryValues)
typename... QueryTypes>
std::vector<ResultType> values(std::size_t reserveSize, const QueryTypes&... queryValues)
{ {
BaseStatement::checkColumnCount(ResultTypeCount); BaseStatement::checkColumnCount(ResultTypeCount);
@@ -235,11 +233,8 @@ public:
return resultValues; return resultValues;
} }
template <typename ResultType, template<typename ResultType, int ResultTypeCount = 1, typename QueryElementType>
int ResultTypeCount = 1, auto values(std::size_t reserveSize, const std::vector<QueryElementType> &queryValues)
typename QueryElementType>
std::vector<ResultType> values(std::size_t reserveSize,
const std::vector<QueryElementType> &queryValues)
{ {
BaseStatement::checkColumnCount(ResultTypeCount); BaseStatement::checkColumnCount(ResultTypeCount);
@@ -261,11 +256,9 @@ public:
return resultValues; return resultValues;
} }
template <typename ResultType, template<typename ResultType, int ResultTypeCount = 1, typename... QueryElementTypes>
int ResultTypeCount = 1, auto values(std::size_t reserveSize,
typename... QueryElementTypes> const std::vector<std::tuple<QueryElementTypes...>> &queryTuples)
std::vector<ResultType> values(std::size_t reserveSize,
const std::vector<std::tuple<QueryElementTypes...>> &queryTuples)
{ {
BaseStatement::checkColumnCount(ResultTypeCount); BaseStatement::checkColumnCount(ResultTypeCount);
@@ -288,10 +281,8 @@ public:
return resultValues; return resultValues;
} }
template <typename ResultType, template<typename ResultType, int ResultTypeCount = 1, typename... QueryTypes>
int ResultTypeCount = 1, auto value(const QueryTypes &...queryValues)
typename... QueryTypes>
Utils::optional<ResultType> value(const QueryTypes&... queryValues)
{ {
BaseStatement::checkColumnCount(ResultTypeCount); BaseStatement::checkColumnCount(ResultTypeCount);
@@ -308,8 +299,8 @@ public:
return resultValue; return resultValue;
} }
template <typename Type> template<typename Type>
static Type toValue(Utils::SmallStringView sqlStatement, Database &database) static auto toValue(Utils::SmallStringView sqlStatement, Database &database)
{ {
StatementImplementation statement(sqlStatement, database); StatementImplementation statement(sqlStatement, database);