lib-sql, global: Rename struct sql_settings to sql_legacy_settings

diff --git a/src/auth/db-sql.c b/src/auth/db-sql.c
index 7b10fddb4dee99c7b1fbcf56a77ea99ccbda557f..e8c92050155e991dbab8ef2f53fc66d0950e02ae 100644 (file)
--- a/src/auth/db-sql.c
+++ b/src/auth/db-sql.c
@@ -62,7 +62,7 @@ static const char *parse_setting(const char *key, const char *value,
 struct db_sql_connection *db_sql_init(const char *config_path, bool userdb)
 {
        struct db_sql_connection *conn;
-       struct sql_settings set;
+       struct sql_legacy_settings set;
        const char *error;
        pool_t pool;
 

diff --git a/src/lib-dict-backend/dict-sql.c b/src/lib-dict-backend/dict-sql.c
index 7d3d5c41459869dcf35db7cb0035286bc283b094..fc6b3b58537f2efdf37097508f15ad62917f42ea 100644 (file)
--- a/src/lib-dict-backend/dict-sql.c
+++ b/src/lib-dict-backend/dict-sql.c
@@ -100,7 +100,7 @@ sql_dict_init_legacy(struct dict *driver, const char *uri,
                     const struct dict_legacy_settings *set,
                     struct dict **dict_r, const char **error_r)
 {
-       struct sql_settings sql_set;
+       struct sql_legacy_settings sql_set;
        struct sql_dict *dict;
        pool_t pool;
 

diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c
index 9de35f4b4d371d65e3f237eae85532e392b9b93f..259d23eec11fc98c0d1579b49bf33ad27adc1e9b 100644 (file)
--- a/src/lib-sql/driver-cassandra.c
+++ b/src/lib-sql/driver-cassandra.c
@@ -1045,7 +1045,7 @@ static int driver_cassandra_init_ssl(struct cassandra_db *db, const char **error
        return 0;
 }
 
-static int driver_cassandra_init_full_v(const struct sql_settings *set,
+static int driver_cassandra_init_full_v(const struct sql_legacy_settings *set,
                                        struct sql_db **db_r,
                                        const char **error_r)
 {

diff --git a/src/lib-sql/driver-mysql.c b/src/lib-sql/driver-mysql.c
index b226405c7593f9f91feebb5e0818b0335fce05dd..9aff15fabd9983ac4d24038f67587339fb8b2e73 100644 (file)
--- a/src/lib-sql/driver-mysql.c
+++ b/src/lib-sql/driver-mysql.c
@@ -281,7 +281,7 @@ static int driver_mysql_parse_connect_string(struct mysql_db *db,
        return 0;
 }
 
-static int driver_mysql_init_full_v(const struct sql_settings *set,
+static int driver_mysql_init_full_v(const struct sql_legacy_settings *set,
                                    struct sql_db **db_r, const char **error_r)
 {
        struct mysql_db *db;

diff --git a/src/lib-sql/driver-pgsql.c b/src/lib-sql/driver-pgsql.c
index 35a4bdb10d7dddee8229808390a67d9a5b8c1349..dd6beeca1095adf584ec74d0f9ba18f6decdd28f 100644 (file)
--- a/src/lib-sql/driver-pgsql.c
+++ b/src/lib-sql/driver-pgsql.c
@@ -331,7 +331,7 @@ static enum sql_db_flags driver_pgsql_get_flags(struct sql_db *db)
        return db->flags;
 }
 
-static int driver_pgsql_init_full_v(const struct sql_settings *set,
+static int driver_pgsql_init_full_v(const struct sql_legacy_settings *set,
                                    struct sql_db **db_r, const char **error_r ATTR_UNUSED)
 {
        struct pgsql_db *db;

diff --git a/src/lib-sql/driver-sqlite.c b/src/lib-sql/driver-sqlite.c
index de53b977d964b03d9a757e683efa7a591718de9e..54ee5f1bc2eaf385b488f47d1c44f14cafc59f4c 100644 (file)
--- a/src/lib-sql/driver-sqlite.c
+++ b/src/lib-sql/driver-sqlite.c
@@ -156,8 +156,8 @@ static int driver_sqlite_parse_connect_string(struct sqlite_db *db,
        return 0;
 }
 
-static int driver_sqlite_init_full_v(const struct sql_settings *set, struct sql_db **db_r,
-                                    const char **error_r)
+static int driver_sqlite_init_full_v(const struct sql_legacy_settings *set,
+                                    struct sql_db **db_r, const char **error_r)
 {
        struct sqlite_db *db;
        pool_t pool;

diff --git a/src/lib-sql/driver-sqlpool.c b/src/lib-sql/driver-sqlpool.c
index 85456b2c0b6f5cd6997ed3e38410cf0075e674da..65f23b4dbc7cd7fdbc4886ccbb68c591a324c3be 100644 (file)
--- a/src/lib-sql/driver-sqlpool.c
+++ b/src/lib-sql/driver-sqlpool.c
@@ -285,7 +285,7 @@ sqlpool_add_connection(struct sqlpool_db *db, struct sqlpool_host *host,
        if (db->driver->v.init_legacy_full == NULL) {
                conndb = db->driver->v.init_legacy(host->connect_string);
        } else {
-               struct sql_settings set = {
+               struct sql_legacy_settings set = {
                        .connect_string = host->connect_string,
                        .event_parent = event_get_parent(db->api.event),
                };
@@ -524,7 +524,8 @@ static void sqlpool_add_all_once(struct sqlpool_db *db)
        }
 }
 
-int driver_sqlpool_init_full(const struct sql_settings *set, const struct sql_db *driver,
+int driver_sqlpool_init_full(const struct sql_legacy_settings *set,
+                            const struct sql_db *driver,
                             struct sql_db **db_r, const char **error_r)
 {
        struct sqlpool_db *db;

diff --git a/src/lib-sql/sql-api-private.h b/src/lib-sql/sql-api-private.h
index 13263817750592229a49a669785397bc5cd12b03..b93727fcd93b9838453d11753a2e356b4a930152 100644 (file)
--- a/src/lib-sql/sql-api-private.h
+++ b/src/lib-sql/sql-api-private.h
@@ -66,7 +66,7 @@ struct sql_transaction_query {
 
 struct sql_db_vfuncs {
        struct sql_db *(*init_legacy)(const char *connect_string);
-       int (*init_legacy_full)(const struct sql_settings *set,
+       int (*init_legacy_full)(const struct sql_legacy_settings *set,
                                struct sql_db **db_r, const char **error);
        void (*deinit)(struct sql_db *db);
        void (*unref)(struct sql_db *db);
@@ -251,7 +251,8 @@ extern struct sql_result sql_not_connected_result;
 void sql_init_common(struct sql_db *db);
 struct sql_db *
 driver_sqlpool_init(const char *connect_string, const struct sql_db *driver);
-int driver_sqlpool_init_full(const struct sql_settings *set, const struct sql_db *driver,
+int driver_sqlpool_init_full(const struct sql_legacy_settings *set,
+                            const struct sql_db *driver,
                             struct sql_db **db_r, const char **error_r);
 
 void sql_db_set_state(struct sql_db *db, enum sql_db_state state);

diff --git a/src/lib-sql/sql-api.c b/src/lib-sql/sql-api.c
index 241bf61de1b31604eb7d7d610d5a9fe7c506c053..acc3186b43a1db3aea18dab6ebcd173bc36b4392 100644 (file)
--- a/src/lib-sql/sql-api.c
+++ b/src/lib-sql/sql-api.c
@@ -80,7 +80,7 @@ sql_init_legacy(const char *db_driver, const char *connect_string)
 {
        const char *error;
        struct sql_db *db;
-       struct sql_settings set = {
+       struct sql_legacy_settings set = {
                .driver = db_driver,
                .connect_string = connect_string,
        };
@@ -90,7 +90,8 @@ sql_init_legacy(const char *db_driver, const char *connect_string)
        return db;
 }
 
-int sql_init_legacy_full(const struct sql_settings *set, struct sql_db **db_r,
+int sql_init_legacy_full(const struct sql_legacy_settings *set,
+                        struct sql_db **db_r,
                         const char **error_r)
 {
        const struct sql_db *driver;

diff --git a/src/lib-sql/sql-api.h b/src/lib-sql/sql-api.h
index 2e3b919306bb3763841b8518b882edffe1d1db71..6ec6d0fb5947a098103c5faa82e1c8001513873a 100644 (file)
--- a/src/lib-sql/sql-api.h
+++ b/src/lib-sql/sql-api.h
@@ -77,7 +77,7 @@ struct sql_commit_result {
        enum sql_result_error_type error_type;
 };
 
-struct sql_settings {
+struct sql_legacy_settings {
        const char *driver;
        const char *connect_string;
        struct event *event_parent;
@@ -96,8 +96,8 @@ void sql_driver_unregister(const struct sql_db *driver);
    eg. "mysql" or "pgsql". connect_string is driver-specific. */
 struct sql_db *
 sql_init_legacy(const char *db_driver, const char *connect_string);
-int sql_init_legacy_full(const struct sql_settings *set, struct sql_db **db_r,
-                        const char **error_r);
+int sql_init_legacy_full(const struct sql_legacy_settings *set,
+                        struct sql_db **db_r, const char **error_r);
 
 void sql_ref(struct sql_db *db);
 void sql_unref(struct sql_db **db);

diff --git a/src/lib-sql/sql-db-cache.c b/src/lib-sql/sql-db-cache.c
index b960c4abcd06c6d8cabc02131c16bf264f04fa52..b1351cf5e7b0e941dd43f217c6db6c0c77a10cef 100644 (file)
--- a/src/lib-sql/sql-db-cache.c
+++ b/src/lib-sql/sql-db-cache.c
@@ -94,7 +94,8 @@ static void sql_db_cache_drop_oldest(struct sql_db_cache *cache)
                sql_db_cache_free_tail(cache);
 }
 
-int sql_db_cache_new(struct sql_db_cache *cache, const struct sql_settings *set,
+int sql_db_cache_new(struct sql_db_cache *cache,
+                    const struct sql_legacy_settings *set,
                     struct sql_db **db_r, const char **error_r)
 {
        struct sql_db_cache_context *ctx;

diff --git a/src/lib-sql/sql-db-cache.h b/src/lib-sql/sql-db-cache.h
index 1517f5f5da959479c0d1e59b6f4a00e95e6ef73e..9cdea739116adfcba146e0308d25a368b195c3d6 100644 (file)
--- a/src/lib-sql/sql-db-cache.h
+++ b/src/lib-sql/sql-db-cache.h
@@ -4,7 +4,8 @@
 struct sql_db_cache;
 
 /* Like sql_init(), but use a connection pool. */
-int sql_db_cache_new(struct sql_db_cache *cache, const struct sql_settings *set,
+int sql_db_cache_new(struct sql_db_cache *cache,
+                    const struct sql_legacy_settings *set,
                      struct sql_db **db_r, const char **error_r);
 
 struct sql_db_cache *sql_db_cache_init(unsigned int max_unused_connections);

diff --git a/src/lib-sql/test-sql-sqlite.c b/src/lib-sql/test-sql-sqlite.c
index 780a8197e7687a77b4d9da25785b1453f7ef3d22..c47180c144f73bb76104961fd174e3fa549497cf 100644 (file)
--- a/src/lib-sql/test-sql-sqlite.c
+++ b/src/lib-sql/test-sql-sqlite.c
@@ -24,7 +24,7 @@ static void test_sql_sqlite(void)
 {
        test_begin("test sql api");
 
-       const struct sql_settings set = {
+       const struct sql_legacy_settings set = {
                .driver = "sqlite",
                .connect_string = "test-database.db journal_mode=wal",
        };

diff --git a/src/lib-sql/test-sql.c b/src/lib-sql/test-sql.c
index 85ed83cac8e59fae2560366cc0307e8b7d0e1bcf..cbb4d3893a36751f35be24eac2c8b314a873c366 100644 (file)
--- a/src/lib-sql/test-sql.c
+++ b/src/lib-sql/test-sql.c
@@ -7,7 +7,7 @@
 
 static struct sql_db *setup_sql(void)
 {
-       const struct sql_settings set = {
+       const struct sql_legacy_settings set = {
                .driver = "sqlite",
                .connect_string = "",
        };