Remove legacy functions from sql driver data

diff --git a/src/modules/rlm_sql/rlm_sql.h b/src/modules/rlm_sql/rlm_sql.h
index 089c2a9b1de919c1a1b17c32867f818b48c8e3fb..30fa8c92e66aa877271972cae4a7dfb3b75128dc 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.h
+++ b/src/modules/rlm_sql/rlm_sql.h
@@ -203,12 +203,6 @@ typedef struct {
 
        int             flags;
 
-       sql_rcode_t     (*sql_socket_init)(rlm_sql_handle_t *handle, rlm_sql_config_t const *config,
-                                          fr_time_delta_t timeout);
-
-       unlang_function_t       sql_query;                      //!< Run an SQL query on a pool connection.
-       unlang_function_t       sql_select_query;               //!< Run an SQL select query on a pool connection.
-
        unlang_function_t       sql_query_resume;               //!< Callback run after an SQL trunk query is run.
        unlang_function_t       sql_select_query_resume;        //!< Callback run after an SQL select trunk query is run.
 

diff --git a/src/modules/rlm_sql/sql.c b/src/modules/rlm_sql/sql.c
index 6e5d5d3a0fb4079b454f7c4447a79773def7125c..a63be357d0c0a934b1d595242bbd8886b9a1c0e7 100644 (file)
--- a/src/modules/rlm_sql/sql.c
+++ b/src/modules/rlm_sql/sql.c
@@ -416,7 +416,6 @@ unlang_action_t rlm_sql_query(rlm_rcode_t *p_result, UNUSED int *priority, reque
        for (i = 0; i < (count + 1); i++) {
                ROPTIONAL(RDEBUG2, DEBUG2, "Executing query: %s", query_ctx->query_str);
 
-               (inst->driver->sql_query)(p_result, NULL, request, query_ctx);
                query_ctx->status = SQL_QUERY_SUBMITTED;
                switch (query_ctx->rcode) {
                case RLM_SQL_OK:
@@ -608,7 +607,6 @@ unlang_action_t rlm_sql_select_query(rlm_rcode_t *p_result, UNUSED int *priority
        for (i = 0; i < (count + 1); i++) {
                ROPTIONAL(RDEBUG2, DEBUG2, "Executing select query: %s", query_ctx->query_str);
 
-               (inst->driver->sql_select_query)(p_result, NULL, request, query_ctx);
                query_ctx->status = SQL_QUERY_SUBMITTED;
                switch (query_ctx->rcode) {
                case RLM_SQL_OK: