Add AttachmentOptions::sqlDialect

Author: asfernandes

src/fb-cpp/Attachment.cpp

@@ -54,6 +54,9 @@ Attachment::Attachment(Client& client, const std::string& uri, const AttachmentO
 	if (const auto role = options.getRole())
 		dpbBuilder->insertString(&statusWrapper, isc_dpb_sql_role_name, role->c_str());
 
+	if (const auto sqlDialect = options.getSqlDialect())
+		dpbBuilder->insertInt(&statusWrapper, isc_dpb_sql_dialect, static_cast<int>(*sqlDialect));
+
 	auto dispatcher = fbRef(master->getDispatcher());
 	const auto dpbBuffer = dpbBuilder->getBuffer(&statusWrapper);
 	const auto dpbBufferLen = dpbBuilder->getBufferLength(&statusWrapper);

src/fb-cpp/Attachment.h

@@ -116,6 +116,23 @@ namespace fbcpp
 			return *this;
 		}
 
+		///
+		/// Returns the SQL dialect which will be used to connect to the database.
+		///
+		const std::optional<std::uint32_t>& getSqlDialect() const
+		{
+			return sqlDialect;
+		}
+
+		///
+		/// Sets the SQL dialect which will be used to connect to the database.
+		///
+		AttachmentOptions& setSqlDialect(std::uint32_t value)
+		{
+			sqlDialect = value;
+			return *this;
+		}
+
 		///
 		/// Returns the DPB (Database Parameter Block) which will be used to connect to the database.
 		///
@@ -164,6 +181,7 @@ namespace fbcpp
 		std::optional<std::string> userName;
 		std::optional<std::string> password;
 		std::optional<std::string> role;
+		std::optional<std::uint32_t> sqlDialect;
 		std::vector<std::uint8_t> dpb;
 		bool createDatabase = false;
 	};

src/test/Attachment.cpp

@@ -59,6 +59,16 @@ BOOST_AUTO_TEST_CASE(dropDatabase)
 	BOOST_CHECK_THROW(Attachment(CLIENT, database), DatabaseException);
 }
 
+BOOST_AUTO_TEST_CASE(sqlDialectSetterGetter)
+{
+	AttachmentOptions options;
+	BOOST_CHECK(!options.getSqlDialect().has_value());
+
+	options.setSqlDialect(1u);
+	BOOST_REQUIRE(options.getSqlDialect().has_value());
+	BOOST_CHECK_EQUAL(*options.getSqlDialect(), 1u);
+}
+
 BOOST_AUTO_TEST_CASE(isNotValidAfterMove)
 {
 	const auto database = getTempFile("Attachment-isNotValidAfterMove.fdb");

src/test/Statement.cpp

@@ -175,19 +175,8 @@ BOOST_AUTO_TEST_CASE(constructorWithExplicitDialect)
 {
 	const auto database = getTempFile("Statement-constructorWithExplicitDialect.fdb");
 
-	// Firebird 5 requires that statement dialect matches the database dialect, so
-	// the test database must be created with dialect 1.
-	const std::vector<std::uint8_t> dialect1Dpb = {
-		isc_dpb_version1,
-		isc_dpb_sql_dialect,
-		4,
-		1,
-		0,
-		0,
-		0,
-	};
-
-	Attachment attachment{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setDpb(dialect1Dpb)};
+	// Connect using dialect 1.
+	Attachment attachment{CLIENT, database, AttachmentOptions().setCreateDatabase(true).setSqlDialect(1u)};
 	FbDropDatabase attachmentDrop{attachment};
 
 	Transaction transaction{attachment};