lib-sql: Remove sql_init_legacy*()

diff --git a/src/lib-sql/sql-api-private.h b/src/lib-sql/sql-api-private.h
index 296d5f802473c81787102565cff1fb0414d15973..00b1d8bb633c545d1c22f0e2fa189e73c521d4b9 100644 (file)
--- a/src/lib-sql/sql-api-private.h
+++ b/src/lib-sql/sql-api-private.h
@@ -73,9 +73,6 @@ struct sql_transaction_query {
 struct sql_db_vfuncs {
        int (*init)(struct event *event, struct sql_db **db_r,
                    const char **error_r);
-       struct sql_db *(*init_legacy)(const char *connect_string);
-       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);
        void (*wait) (struct sql_db *db);

diff --git a/src/lib-sql/sql-api.c b/src/lib-sql/sql-api.c
index 51ff4df4051922815a419f8fd87b51b63299f3d5..1bdc5599e5b8173e51a01cbe9f50767c0a1dd369 100644 (file)
--- a/src/lib-sql/sql-api.c
+++ b/src/lib-sql/sql-api.c
@@ -128,14 +128,6 @@ int sql_init_auto(struct event *event, struct sql_db **db_r,
                return -1;
        }
 
-       if (driver->v.init == NULL) {
-               *error_r = t_strdup_printf(
-                       "Database driver '%s' only supports legacy init() API",
-                       sql_set->sql_driver);
-               settings_free(sql_set);
-               return -1;
-       }
-
        if (driver->v.init(event, &db, &error) < 0) {
                *error_r = t_strdup_printf("sql %s: %s",
                                           sql_set->sql_driver, error);
@@ -149,52 +141,6 @@ int sql_init_auto(struct event *event, struct sql_db **db_r,
 }
 
 
-struct sql_db *
-sql_init_legacy(const char *db_driver, const char *connect_string)
-{
-       const char *error;
-       struct sql_db *db;
-       struct sql_legacy_settings set = {
-               .driver = db_driver,
-               .connect_string = connect_string,
-       };
-
-       if (sql_init_legacy_full(&set, &db, &error) < 0)
-               i_fatal("%s", error);
-       return db;
-}
-
-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;
-       struct sql_db *db;
-       int ret = 0;
-
-       i_assert(set->connect_string != NULL);
-
-       driver = sql_driver_lookup(set->driver);
-       if (driver == NULL) {
-               *error_r = t_strdup_printf("Unknown database driver '%s'", set->driver);
-               return -1;
-       }
-
-       if ((driver->flags & SQL_DB_FLAG_POOLED) == 0) {
-               if (driver->v.init_legacy_full == NULL) {
-                       db = driver->v.init_legacy(set->connect_string);
-               } else
-                       ret = driver->v.init_legacy_full(set, &db, error_r);
-       }
-
-       if (ret < 0)
-               return -1;
-
-       sql_init_common(db);
-       *db_r = db;
-       return 0;
-}
-
 void sql_init_common(struct sql_db *db)
 {
        db->refcount = 1;

diff --git a/src/lib-sql/sql-api.h b/src/lib-sql/sql-api.h
index 3f24d50e23ba9b8551051c254ecf02c8afab2144..f0333768bf50d4ab4578c2e1169053f9fa5c3bf6 100644 (file)
--- a/src/lib-sql/sql-api.h
+++ b/src/lib-sql/sql-api.h
@@ -82,12 +82,6 @@ struct sql_settings {
        const char *sql_driver;
 };
 
-struct sql_legacy_settings {
-       const char *driver;
-       const char *connect_string;
-       struct event *event_parent;
-};
-
 extern const struct setting_parser_info sql_setting_parser_info;
 
 typedef void sql_query_callback_t(struct sql_result *result, void *context);
@@ -106,13 +100,6 @@ void sql_driver_unregister(const struct sql_db *driver);
 int sql_init_auto(struct event *event, struct sql_db **db_r,
                  const char **error_r);
 
-/* Initialize database connections. db_driver is the database driver name,
-   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_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);