Merge 1bd596000d into 5cb74797fe

New function, `void pgsql_handle_set_error_if_not_set(switch_pgsql_handle_t *handle, char **err)` has been added to mod_pgsql module. This function is now called at several points where an error occurred but *err was not yet set.

src/mod/applications/mod_dptools/mod_dptools.c

@@ -185,28 +185,32 @@ static switch_status_t digit_action_callback(switch_ivr_dmachine_match_t *match)
 						  switch_channel_get_name(channel), act->string, act->value);
 
 		if (!strncasecmp(string, "exec", 4)) {
-			char *e;
-
+			exec = 1;
 			string += 4;
 			if (*string == ':') {
 				string++;
-				exec = 1;
-			} else if (*string == '[') {
-				flags = string;
-				if ((e = switch_find_end_paren(flags, '[', ']'))) {
-					if (*++e == ':') {
-						flags++;
-						*e++ = '\0';
-						string = e;
-						exec = strchr(flags, 'i') ? 2 : 1;
-					}
-				}
 			}
 		} else if (!strncasecmp(string, "api:", 4)) {
 			string += 4;
 			api = 1;
 		}
 
+		if (*string == '[') {
+			char *e;
+
+			flags = string;
+			if ((e = switch_find_end_paren(flags, '[', ']'))) {
+				if (e && *++e == ':') {
+					flags++;
+					*e++ = '\0';
+					string = e;
+					if (exec) {
+						exec = strchr(flags, 'i') ? 2 : 1;
+					}
+				}
+			}
+		}
+
 		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, string, act->value);
 		switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "digits", match->match_digits);
 

src/mod/databases/mod_pgsql/mod_pgsql.c

@@ -106,6 +106,22 @@ 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;
@@ -553,8 +569,15 @@ switch_status_t pgsql_handle_exec_detailed(const char *file, const char *func, i
 		goto error;
 	}
 
-	return pgsql_finish_results(handle);
+	if (pgsql_finish_results(handle) != SWITCH_STATUS_SUCCESS) {
+		goto error;
+	}
+
+	return SWITCH_STATUS_SUCCESS;
+
 error:
+	pgsql_handle_set_error_if_not_set(handle, err);
+
 	return SWITCH_STATUS_FALSE;
 }
 
@@ -630,6 +653,7 @@ 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;
 	}
 
@@ -638,6 +662,7 @@ done:
 error:
 
 	pgsql_free_result(&result);
+	pgsql_handle_set_error_if_not_set(handle, err);
 
 	return SWITCH_STATUS_FALSE;
 }
@@ -1050,6 +1075,8 @@ 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;
 }