Refactor

Author: asfernandes

src/fb-cpp/Attachment.cpp

@@ -97,27 +97,21 @@ void Attachment::dropDatabase()
 	disconnectOrDrop(true);
 }
 
-bool Attachment::execute(Transaction& transaction, std::string_view sql)
-{
-	return execute(transaction, sql, StatementOptions{});
-}
-
 bool Attachment::execute(Transaction& transaction, std::string_view sql, const StatementOptions& options)
 {
 	Statement statement{*this, transaction, sql, options};
 	return statement.execute(transaction);
 }
 
-RowSet Attachment::queryRowSet(Transaction& transaction, std::string_view sql, unsigned maxRows)
-{
-	return queryRowSet(transaction, sql, maxRows, StatementOptions{});
-}
-
 RowSet Attachment::queryRowSet(
 	Transaction& transaction, std::string_view sql, unsigned maxRows, const StatementOptions& options)
 {
 	Statement statement{*this, transaction, sql, options};
+	return queryPreparedRowSet(statement, transaction, maxRows);
+}
 
+RowSet Attachment::queryPreparedRowSet(Statement& statement, Transaction& transaction, unsigned maxRows)
+{
 	switch (statement.getType())
 	{
 		case StatementType::SELECT:

src/fb-cpp/Attachment.h

@@ -26,15 +26,16 @@
 #define FBCPP_ATTACHMENT_H
 
 #include "fb-api.h"
-#include "SmartPtrs.h"
 #include "RowSet.h"
+#include "SmartPtrs.h"
+#include "StatementOptions.h"
+#include <cstddef>
 #include <cstdint>
 #include <memory>
 #include <optional>
 #include <string>
 #include <string_view>
 #include <vector>
-#include <cstddef>
 
 
 ///
@@ -43,7 +44,7 @@
 namespace fbcpp
 {
 	class Client;
-	class StatementOptions;
+	class Statement;
 	class Transaction;
 
 	///
@@ -308,64 +309,101 @@ namespace fbcpp
 		///
 		/// Prepares and executes an SQL statement using the supplied transaction.
 		///
-		bool execute(Transaction& transaction, std::string_view sql);
+		bool execute(Transaction& transaction, std::string_view sql, const StatementOptions& options = {});
 
 		///
-		/// Prepares and executes an SQL statement using the supplied transaction and statement options.
+		/// Prepares, binds parameters, and executes an SQL statement using the supplied transaction.
 		///
-		bool execute(Transaction& transaction, std::string_view sql, const StatementOptions& options);
+		template <typename Params>
+		bool execute(Transaction& transaction, std::string_view sql, const Params& params);
+
+		///
+		/// Prepares, binds parameters, and executes an SQL statement using the supplied transaction and statement
+		/// options.
+		///
+		template <typename Params>
+		bool execute(
+			Transaction& transaction, std::string_view sql, const StatementOptions& options, const Params& params);
 
 		///
 		/// Prepares and executes a query using the supplied transaction and returns up to maxRows rows.
 		///
-		RowSet queryRowSet(Transaction& transaction, std::string_view sql, unsigned maxRows);
+		RowSet queryRowSet(
+			Transaction& transaction, std::string_view sql, unsigned maxRows, const StatementOptions& options = {});
 
 		///
-		/// Prepares and executes a query using the supplied transaction and statement options and returns up to maxRows
+		/// Prepares, binds parameters, and executes a query using the supplied transaction and returns up to maxRows
 		/// rows.
 		///
-		RowSet queryRowSet(
-			Transaction& transaction, std::string_view sql, unsigned maxRows, const StatementOptions& options);
+		template <typename Params>
+		RowSet queryRowSet(Transaction& transaction, std::string_view sql, unsigned maxRows, const Params& params);
+
+		///
+		/// Prepares, binds parameters, and executes a query using the supplied transaction and statement options and
+		/// returns up to maxRows rows.
+		///
+		template <typename Params>
+		RowSet queryRowSet(Transaction& transaction, std::string_view sql, unsigned maxRows,
+			const StatementOptions& options, const Params& params);
 
 		///
 		/// Prepares and executes a query using the supplied transaction and returns the first column of the first row.
 		///
 		template <typename T>
-		std::optional<T> queryScalar(Transaction& transaction, std::string_view sql);
+		std::optional<T> queryScalar(
+			Transaction& transaction, std::string_view sql, const StatementOptions& options = {});
 
 		///
-		/// Prepares and executes a query using the supplied transaction and statement options and returns the first
-		/// column of the first row.
+		/// Prepares, binds parameters, and executes a query using the supplied transaction and returns the first column
+		/// of the first row.
 		///
-		template <typename T>
-		std::optional<T> queryScalar(Transaction& transaction, std::string_view sql, const StatementOptions& options);
+		template <typename T, typename Params>
+		std::optional<T> queryScalar(Transaction& transaction, std::string_view sql, const Params& params);
+
+		///
+		/// Prepares, binds parameters, and executes a query using the supplied transaction and statement options and
+		/// returns the first column of the first row.
+		///
+		template <typename T, typename Params>
+		std::optional<T> queryScalar(
+			Transaction& transaction, std::string_view sql, const StatementOptions& options, const Params& params);
 
 		///
 		/// Prepares and executes a query using the supplied transaction and returns the first row mapped as T.
 		///
 		template <typename T>
-		std::optional<T> queryFirstRowAs(Transaction& transaction, std::string_view sql);
+		std::optional<T> queryFirstRowAs(
+			Transaction& transaction, std::string_view sql, const StatementOptions& options = {});
 
 		///
-		/// Prepares and executes a query using the supplied transaction and statement options and returns the first row
+		/// Prepares, binds parameters, and executes a query using the supplied transaction and returns the first row
 		/// mapped as T.
 		///
-		template <typename T>
+		template <typename T, typename Params>
+		std::optional<T> queryFirstRowAs(Transaction& transaction, std::string_view sql, const Params& params);
+
+		///
+		/// Prepares, binds parameters, and executes a query using the supplied transaction and statement options and
+		/// returns the first row mapped as T.
+		///
+		template <typename T, typename Params>
 		std::optional<T> queryFirstRowAs(
-			Transaction& transaction, std::string_view sql, const StatementOptions& options);
+			Transaction& transaction, std::string_view sql, const StatementOptions& options, const Params& params);
 
 	private:
 		void disconnectOrDrop(bool drop);
+		RowSet queryPreparedRowSet(Statement& statement, Transaction& transaction, unsigned maxRows);
 
 	private:
 		Client* client;
 		FbRef<fb::IAttachment> handle;
 	};
 
 	template <typename T>
-	std::optional<T> Attachment::queryScalar(Transaction& transaction, std::string_view sql)
+	std::optional<T> Attachment::queryScalar(
+		Transaction& transaction, std::string_view sql, const StatementOptions& options)
 	{
-		auto rowSet = queryRowSet(transaction, sql, 1u);
+		auto rowSet = queryRowSet(transaction, sql, 1u, options);
 
 		if (rowSet.getCount() == 0u)
 			return std::nullopt;
@@ -374,40 +412,98 @@ namespace fbcpp
 	}
 
 	template <typename T>
-	std::optional<T> Attachment::queryScalar(
+	std::optional<T> Attachment::queryFirstRowAs(
 		Transaction& transaction, std::string_view sql, const StatementOptions& options)
 	{
 		auto rowSet = queryRowSet(transaction, sql, 1u, options);
 
 		if (rowSet.getCount() == 0u)
 			return std::nullopt;
 
-		return rowSet.getRow(0).get<std::optional<T>>(0);
+		return rowSet.getRow(0).get<T>();
 	}
+}  // namespace fbcpp
 
-	template <typename T>
-	std::optional<T> Attachment::queryFirstRowAs(Transaction& transaction, std::string_view sql)
+#include "Statement.h"
+
+namespace fbcpp
+{
+	template <typename Params>
+	bool Attachment::execute(Transaction& transaction, std::string_view sql, const Params& params)
 	{
-		auto rowSet = queryRowSet(transaction, sql, 1u);
+		return execute(transaction, sql, StatementOptions{}, params);
+	}
+
+	template <typename Params>
+	bool Attachment::execute(
+		Transaction& transaction, std::string_view sql, const StatementOptions& options, const Params& params)
+	{
+		Statement statement{*this, transaction, sql, options};
+		statement.set(params);
+		return statement.execute(transaction);
+	}
+
+	template <typename Params>
+	RowSet Attachment::queryRowSet(
+		Transaction& transaction, std::string_view sql, unsigned maxRows, const Params& params)
+	{
+		return queryRowSet(transaction, sql, maxRows, StatementOptions{}, params);
+	}
+
+	template <typename Params>
+	RowSet Attachment::queryRowSet(Transaction& transaction, std::string_view sql, unsigned maxRows,
+		const StatementOptions& options, const Params& params)
+	{
+		Statement statement{*this, transaction, sql, options};
+		statement.set(params);
+		return queryPreparedRowSet(statement, transaction, maxRows);
+	}
+
+	template <typename T, typename Params>
+	std::optional<T> Attachment::queryScalar(Transaction& transaction, std::string_view sql, const Params& params)
+	{
+		auto rowSet = queryRowSet(transaction, sql, 1u, params);
 
 		if (rowSet.getCount() == 0u)
 			return std::nullopt;
 
-		return rowSet.getRow(0).get<T>();
+		return rowSet.getRow(0).template get<std::optional<T>>(0);
 	}
 
-	template <typename T>
+	template <typename T, typename Params>
+	std::optional<T> Attachment::queryScalar(
+		Transaction& transaction, std::string_view sql, const StatementOptions& options, const Params& params)
+	{
+		auto rowSet = queryRowSet(transaction, sql, 1u, options, params);
+
+		if (rowSet.getCount() == 0u)
+			return std::nullopt;
+
+		return rowSet.getRow(0).template get<std::optional<T>>(0);
+	}
+
+	template <typename T, typename Params>
+	std::optional<T> Attachment::queryFirstRowAs(Transaction& transaction, std::string_view sql, const Params& params)
+	{
+		auto rowSet = queryRowSet(transaction, sql, 1u, params);
+
+		if (rowSet.getCount() == 0u)
+			return std::nullopt;
+
+		return rowSet.getRow(0).template get<T>();
+	}
+
+	template <typename T, typename Params>
 	std::optional<T> Attachment::queryFirstRowAs(
-		Transaction& transaction, std::string_view sql, const StatementOptions& options)
+		Transaction& transaction, std::string_view sql, const StatementOptions& options, const Params& params)
 	{
-		auto rowSet = queryRowSet(transaction, sql, 1u, options);
+		auto rowSet = queryRowSet(transaction, sql, 1u, options, params);
 
 		if (rowSet.getCount() == 0u)
 			return std::nullopt;
 
-		return rowSet.getRow(0).get<T>();
+		return rowSet.getRow(0).template get<T>();
 	}
 }  // namespace fbcpp
 
-
 #endif  // FBCPP_ATTACHMENT_H

src/fb-cpp/RowSet.cpp

@@ -23,6 +23,7 @@
  */
 
 #include "RowSet.h"
+#include "Attachment.h"
 #include "Client.h"
 #include "Statement.h"
 #include <algorithm>

src/fb-cpp/Statement.cpp

@@ -181,6 +181,52 @@ Statement::Statement(
 	outRow = std::make_unique<Row>(attachment.getClient(), outDescriptors, std::span{outMessage});
 }
 
+Statement::Statement(Statement&& o) noexcept
+	: attachment{o.attachment},
+	  statusWrapper{std::move(o.statusWrapper)},
+	  calendarConverter{std::move(o.calendarConverter)},
+	  numericConverter{std::move(o.numericConverter)},
+	  statementHandle{std::move(o.statementHandle)},
+	  resultSetHandle{std::move(o.resultSetHandle)},
+	  inMetadata{std::move(o.inMetadata)},
+	  inDescriptors{std::move(o.inDescriptors)},
+	  inMessage{std::move(o.inMessage)},
+	  outMetadata{std::move(o.outMetadata)},
+	  outDescriptors{std::move(o.outDescriptors)},
+	  outMessage{std::move(o.outMessage)},
+	  outRow{std::make_unique<Row>(attachment->getClient(), outDescriptors, std::span{outMessage})},
+	  type{o.type},
+	  cursorFlags{o.cursorFlags}
+{
+	o.outRow.reset();
+}
+
+Statement& Statement::operator=(Statement&& o) noexcept
+{
+	if (this != &o)
+	{
+		attachment = o.attachment;
+		statusWrapper = std::move(o.statusWrapper);
+		calendarConverter = std::move(o.calendarConverter);
+		numericConverter = std::move(o.numericConverter);
+		statementHandle = std::move(o.statementHandle);
+		resultSetHandle = std::move(o.resultSetHandle);
+		inMetadata = std::move(o.inMetadata);
+		inDescriptors = std::move(o.inDescriptors);
+		inMessage = std::move(o.inMessage);
+		outMetadata = std::move(o.outMetadata);
+		outDescriptors = std::move(o.outDescriptors);
+		outMessage = std::move(o.outMessage);
+		outRow = std::make_unique<Row>(attachment->getClient(), outDescriptors, std::span{outMessage});
+		type = o.type;
+		cursorFlags = o.cursorFlags;
+
+		o.outRow.reset();
+	}
+
+	return *this;
+}
+
 void Statement::free()
 {
 	assert(isValid());
@@ -243,6 +289,11 @@ bool Statement::execute(Transaction& transaction)
 	}
 }
 
+Client& Statement::getClient() noexcept
+{
+	return attachment->getClient();
+}
+
 bool Statement::fetchNext()
 {
 	assert(isValid());