Revert ""no more rows" isn't an ERROR"

This reverts commit 9cd2d57c6f3594ae8c4d74f34fdc7770361d3bdb.

Better fix is coming

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 07a0e68..b6fbf37 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -180,11 +180,7 @@ static ssize_t sql_xlat(void *instance, REQUEST *request, char const *query, cha
                rcode = rlm_sql_query(inst, request, &handle, query);
                if (rcode != RLM_SQL_OK) {
                query_error:
-                       if (rcode != RLM_SQL_NO_MORE_ROWS) {
-                               RERROR("SQL query failed: %s", fr_int2str(sql_rcode_table, rcode, "<INVALID>"));
-                       } else {
-                               RDEBUG("No rows were returned.");
-                       }
+                       RERROR("SQL query failed: %s", fr_int2str(sql_rcode_table, rcode, "<INVALID>"));
 
                        ret = -1;
                        goto finish;

diff --git a/src/modules/rlm_sql/sql.c b/src/modules/rlm_sql/sql.c
index 8a5de73..51ba11d 100644 (file)
--- a/src/modules/rlm_sql/sql.c
+++ b/src/modules/rlm_sql/sql.c
@@ -240,11 +240,7 @@ sql_rcode_t rlm_sql_fetch_row(rlm_sql_t *inst, REQUEST *request, rlm_sql_handle_
         */
        ret = (inst->module->sql_fetch_row)(*handle, inst->config);
        if (ret < 0) {
-               if (ret != RLM_SQL_NO_MORE_ROWS) {
-                       MOD_ROPTIONAL(RERROR, ERROR, "Error fetching row");
-               } else {
-                       MOD_ROPTIONAL(RDEBUG, DEBUG, "No rows were returned.");
-               }
+               MOD_ROPTIONAL(RERROR, ERROR, "Error fetching row");
 
                rlm_sql_print_error(inst, request, *handle, false);
        }