Merge ddb8018041 into 96de8fd377

src/mod/databases/mod_pgsql/mod_pgsql.c

@@ -106,22 +106,6 @@ char * pgsql_handle_get_error(switch_pgsql_handle_t *handle)
 	return err_str;
 }
 
-void pgsql_handle_set_error_if_not_set(switch_pgsql_handle_t *handle, char **err)
-{
-	char *err_str;
-
-	if (err && !(*err)) {
-		err_str = pgsql_handle_get_error(handle);
-
-		if (zstr(err_str)) {
-			switch_safe_free(err_str);
-			err_str = strdup((char *)"SQL ERROR!");
-		}
-
-		*err = err_str;
-	}
-}
-
 static int db_is_up(switch_pgsql_handle_t *handle)
 {
 	int ret = 0;
@@ -569,15 +553,8 @@ switch_status_t pgsql_handle_exec_detailed(const char *file, const char *func, i
 		goto error;
 	}
 
-	if (pgsql_finish_results(handle) != SWITCH_STATUS_SUCCESS) {
+	return pgsql_finish_results(handle);
-		goto error;
-	}
-
-	return SWITCH_STATUS_SUCCESS;
-
 error:
-	pgsql_handle_set_error_if_not_set(handle, err);
-
 	return SWITCH_STATUS_FALSE;
 }
 
@@ -653,7 +630,6 @@ done:
 
 	pgsql_free_result(&result);
 	if (pgsql_finish_results(handle) != SWITCH_STATUS_SUCCESS) {
-		pgsql_handle_set_error_if_not_set(handle, err);
 		sstatus = SWITCH_STATUS_FALSE;
 	}
 
@@ -662,7 +638,6 @@ done:
 error:
 
 	pgsql_free_result(&result);
-	pgsql_handle_set_error_if_not_set(handle, err);
 
 	return SWITCH_STATUS_FALSE;
 }
@@ -1075,8 +1050,6 @@ switch_status_t pgsql_handle_callback_exec_detailed(const char *file, const char
 	return SWITCH_STATUS_SUCCESS;
 error:
 
-	pgsql_handle_set_error_if_not_set(handle, err);
-
 	return SWITCH_STATUS_FALSE;
 }