lib-sql, global: Rename sql_init*() to sql_init_legacy*()

diff --git a/src/auth/db-sql.c b/src/auth/db-sql.c
index 8a79ceae5ad8303d1a8d921c74cc1b26d68a065e..7b10fddb4dee99c7b1fbcf56a77ea99ccbda557f 100644 (file)
--- a/src/auth/db-sql.c
+++ b/src/auth/db-sql.c
@@ -110,7 +110,7 @@ struct db_sql_connection *db_sql_init(const char *config_path, bool userdb)
        set.driver = conn->set.driver;
        set.connect_string = conn->set.connect;
        set.event_parent = auth_event;
-       if (sql_init_full(&set, &conn->db, &error) < 0) {
+       if (sql_init_legacy_full(&set, &conn->db, &error) < 0) {
                i_fatal("sql: %s", error);
        }
 

diff --git a/src/lib-sql/sql-api.c b/src/lib-sql/sql-api.c
index d0d333486187bfa675cdf3cd73d1e92580d7ae8d..d87e171a2cfd3680fbcb13a836d6613814a643e5 100644 (file)
--- a/src/lib-sql/sql-api.c
+++ b/src/lib-sql/sql-api.c
@@ -75,7 +75,8 @@ void sql_driver_unregister(const struct sql_db *driver)
        }
 }
 
-struct sql_db *sql_init(const char *db_driver, const char *connect_string)
+struct sql_db *
+sql_init_legacy(const char *db_driver, const char *connect_string)
 {
        const char *error;
        struct sql_db *db;
@@ -84,13 +85,13 @@ struct sql_db *sql_init(const char *db_driver, const char *connect_string)
                .connect_string = connect_string,
        };
 
-       if (sql_init_full(&set, &db, &error) < 0)
+       if (sql_init_legacy_full(&set, &db, &error) < 0)
                i_fatal("%s", error);
        return db;
 }
 
-int sql_init_full(const struct sql_settings *set, struct sql_db **db_r,
-                 const char **error_r)
+int sql_init_legacy_full(const struct sql_settings *set, struct sql_db **db_r,
+                        const char **error_r)
 {
        const struct sql_db *driver;
        struct sql_db *db;

diff --git a/src/lib-sql/sql-api.h b/src/lib-sql/sql-api.h
index f5636180c875dc24e8ec749d2402188b63691c99..2e3b919306bb3763841b8518b882edffe1d1db71 100644 (file)
--- a/src/lib-sql/sql-api.h
+++ b/src/lib-sql/sql-api.h
@@ -94,9 +94,10 @@ void sql_driver_unregister(const struct sql_db *driver);
 
 /* Initialize database connections. db_driver is the database driver name,
    eg. "mysql" or "pgsql". connect_string is driver-specific. */
-struct sql_db *sql_init(const char *db_driver, const char *connect_string);
-int sql_init_full(const struct sql_settings *set, struct sql_db **db_r,
-                 const char **error_r);
+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);
 
 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 b2fb9fb46159a31bd28cff80ffd7d44692098efd..b960c4abcd06c6d8cabc02131c16bf264f04fa52 100644 (file)
--- a/src/lib-sql/sql-db-cache.c
+++ b/src/lib-sql/sql-db-cache.c
@@ -113,7 +113,7 @@ int sql_db_cache_new(struct sql_db_cache *cache, const struct sql_settings *set,
        } else {
                sql_db_cache_drop_oldest(cache);
 
-               if (sql_init_full(set, &db, error_r) < 0) {
+               if (sql_init_legacy_full(set, &db, error_r) < 0) {
                        i_free(key);
                        return -1;
                }

diff --git a/src/lib-sql/test-sql-sqlite.c b/src/lib-sql/test-sql-sqlite.c
index 2923fc779427ad02cc2629f9e227648953330c33..780a8197e7687a77b4d9da25785b1453f7ef3d22 100644 (file)
--- a/src/lib-sql/test-sql-sqlite.c
+++ b/src/lib-sql/test-sql-sqlite.c
@@ -34,7 +34,7 @@ static void test_sql_sqlite(void)
        sql_drivers_init_without_drivers();
        driver_sqlite_init();
 
-       test_assert(sql_init_full(&set, &sql, &error) == 0 &&
+       test_assert(sql_init_legacy_full(&set, &sql, &error) == 0 &&
                    sql != NULL &&
                    error == NULL);
        setup_database(sql);

diff --git a/src/lib-sql/test-sql.c b/src/lib-sql/test-sql.c
index 04db42b44aa0ec0fbe962a31acc2d74abab09332..85ed83cac8e59fae2560366cc0307e8b7d0e1bcf 100644 (file)
--- a/src/lib-sql/test-sql.c
+++ b/src/lib-sql/test-sql.c
@@ -17,7 +17,7 @@ static struct sql_db *setup_sql(void)
        sql_drivers_init_without_drivers();
        sql_driver_test_register();
 
-       test_assert(sql_init_full(&set, &sql, &error) == 0 &&
+       test_assert(sql_init_legacy_full(&set, &sql, &error) == 0 &&
                    sql != NULL &&
                    error == NULL);