From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 8 Mar 2024 12:49:05 +0000 (+0200)
Subject: lib-sql: sql_init_auto() - Require drivers to call sql_init_common() explicitly
X-Git-Tag: 2.4.1~966
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2adf5ecfa61f304794422026bf0534c1d5cf7148;p=thirdparty%2Fdovecot%2Fcore.git

lib-sql: sql_init_auto() - Require drivers to call sql_init_common() explicitly

This will be needed by following changes.
---

diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c
index 6a430bfcfa..f1d513a000 100644
--- a/src/lib-sql/driver-cassandra.c
+++ b/src/lib-sql/driver-cassandra.c
@@ -1382,7 +1382,10 @@ driver_cassandra_init_v(struct event *event, struct sql_db **db_r,
 		}
 	}
 
-	return driver_cassandra_init_common(event, set, ssl_set, db_r, error_r);
+	if (driver_cassandra_init_common(event, set, ssl_set, db_r, error_r) < 0)
+		return -1;
+	sql_init_common(*db_r);
+	return 0;
 }
 
 static int
diff --git a/src/lib-sql/driver-mysql.c b/src/lib-sql/driver-mysql.c
index f727f93855..231d7b4e42 100644
--- a/src/lib-sql/driver-mysql.c
+++ b/src/lib-sql/driver-mysql.c
@@ -442,6 +442,7 @@ driver_mysql_init_v(struct event *event, struct sql_db **db_r,
 
 	pool_t pool = pool_alloconly_create("mysql driver", 1024);
 	*db_r = driver_mysql_init_common(pool, event, set, ssl_set);
+	sql_init_common(*db_r);
 	return 0;
 }
 
diff --git a/src/lib-sql/driver-pgsql.c b/src/lib-sql/driver-pgsql.c
index dbba2284bc..c323a3e35f 100644
--- a/src/lib-sql/driver-pgsql.c
+++ b/src/lib-sql/driver-pgsql.c
@@ -418,6 +418,7 @@ driver_pgsql_init_v(struct event *event, struct sql_db **db_r,
 		return -1;
 
 	struct pgsql_db *db = driver_pgsql_init_common(event, set);
+	sql_init_common(&db->api);
 	*db_r = &db->api;
 	return 0;
 }
diff --git a/src/lib-sql/driver-sqlite.c b/src/lib-sql/driver-sqlite.c
index 40d06155b6..d4c955e2b2 100644
--- a/src/lib-sql/driver-sqlite.c
+++ b/src/lib-sql/driver-sqlite.c
@@ -172,6 +172,7 @@ driver_sqlite_init_v(struct event *event, struct sql_db **db_r,
 			 &set, error_r) < 0)
 		return -1;
 	*db_r = driver_sqlite_init_common(event, set);
+	sql_init_common(*db_r);
 	return 0;
 }
 
diff --git a/src/lib-sql/sql-api.c b/src/lib-sql/sql-api.c
index 7df8ca0416..a3d7d519cd 100644
--- a/src/lib-sql/sql-api.c
+++ b/src/lib-sql/sql-api.c
@@ -140,7 +140,6 @@ int sql_init_auto(struct event *event, struct sql_db **db_r,
 		return -1;
 	}
 
-	sql_init_common(db);
 	settings_free(sql_set);
 	*db_r = db;
 	return 1;