From 1ad61331613123293b4d422917c8589ddf9032fa Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Thu, 18 Mar 2021 11:21:04 +0100
Subject: [PATCH] Sqlite: Return auto instead of type to symplify test overload

Change-Id: I4b613a93f823f346021118eb532ae660295f3c6b
Reviewed-by: Tapani Mattila <tapani.mattila@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 src/libs/sqlite/sqlitebasestatement.h | 31 ++++++++++-----------------
 1 file changed, 11 insertions(+), 20 deletions(-)

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