From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 6 Sep 2024 09:55:42 +0000 (+0300)
Subject: lib-dict-backend: test-dict-sql - Fix to work when using built-in sql drivers
X-Git-Tag: 2.4.1~698
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc8adcc5c49b100fb4b56825dc913130e12522f1;p=thirdparty%2Fdovecot%2Fcore.git

lib-dict-backend: test-dict-sql - Fix to work when using built-in sql drivers

The test worked when configuring --with-sql=plugin, but not --with-sql.

Fixes: Fatal: sql_driver_register(mysql): Already registered
---

diff --git a/src/lib-dict-backend/test-dict-sql.c b/src/lib-dict-backend/test-dict-sql.c
index cae6aeb59a..1fbc5df7bf 100644
--- a/src/lib-dict-backend/test-dict-sql.c
+++ b/src/lib-dict-backend/test-dict-sql.c
@@ -2,7 +2,7 @@
 
 #include "lib.h"
 #include "test-lib.h"
-#include "sql-api.h"
+#include "sql-api-private.h"
 #include "dict.h"
 #include "dict-private.h"
 #include "dict-sql.h"
@@ -291,7 +291,7 @@ static void test_iterate(void)
 }
 
 int main(void) {
-	sql_drivers_init();
+	sql_drivers_init_without_drivers();
 	sql_driver_test_register();
 	dict_sql_register();
 
@@ -308,7 +308,7 @@ int main(void) {
 
 	dict_sql_unregister();
 	sql_driver_test_unregister();
-	sql_drivers_deinit();
+	sql_drivers_deinit_without_drivers();
 
 	return ret;
 }