From 6e726340e23a97480b17065a633c36a9ba53cf14 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Thu, 3 Jun 2021 00:17:28 +0100
Subject: Determine parameter mode at point of call by DB type property

It's still constexpr, so that's all good.
---
 lib/dbStmt.h | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'lib/dbStmt.h')

diff --git a/lib/dbStmt.h b/lib/dbStmt.h
index 81621de..80dbd71 100644
--- a/lib/dbStmt.h
+++ b/lib/dbStmt.h
@@ -9,17 +9,16 @@
 #include <type_traits>
 
 namespace MyGrate {
-	class DbConn;
-	enum class ParamMode { None, DollarNum, QMark };
-
-	template<Support::basic_fixed_string S, ParamMode pm = ParamMode::None> class DbStmt {
+	template<Support::basic_fixed_string S> class DbStmt {
 	public:
 		// This don't account for common table expressions, hopefully won't need those :)
 		static constexpr auto isSelect {S.v().starts_with("SELECT") || S.v().starts_with("SHOW")
 				|| S.v().find("RETURNING") != std::string_view::npos};
 
 		// These don't account for string literals, which we'd prefer to avoid anyway :)
-		static constexpr auto paramCount {[]() -> std::size_t {
+		static constexpr std::size_t
+		paramCount(ParamMode pm)
+		{
 			switch (pm) {
 				case ParamMode::None:
 					return 0LU;
@@ -42,15 +41,15 @@ namespace MyGrate {
 						return c == '?';
 					});
 			}
-		}()};
+		}
 
 		using Return = std::conditional_t<isSelect, RecordSetPtr, std::size_t>;
 
-		template<typename... P>
+		template<typename ConnType, typename... P>
 		static Return
-		execute(DbConn * c, P &&... p)
+		execute(ConnType * c, P &&... p)
 		{
-			static_assert(sizeof...(P) == paramCount);
+			static_assert(sizeof...(P) == paramCount(ConnType::paramMode));
 			auto stmt {c->prepare(S, sizeof...(P))};
 			stmt->execute({std::forward<P...>(p)...});
 			if constexpr (isSelect) {
-- 
cgit v1.2.3