Merge fa413b35e5 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.

docs/phrase/phrase_zh_CN.xml

@@ -245,7 +245,7 @@
 			<prompt phrase="然后按#号" filename="vm-followed_by_pound.wav"/>
 			<prompt phrase="下一个" filename="vm-next.wav"/>
 			<prompt phrase="听取新留言" filename="vm-listen_new.wav"/>
-			<prompt phrase="听取已保存的留言" filename="vm-listen_saved.vmwav"/>
+			<prompt phrase="听取已保存的留言" filename="vm-listen_saved.wav"/>
 			<prompt phrase="高级选项" filename="vm-advanced.wav"/>
 			<prompt phrase="高级选项" filename="vm-advanced_alt.wav"/>
 			<prompt phrase="退出" filename="vm-to_exit.wav"/>
@@ -421,7 +421,7 @@
 			<prompt phrase="您大约需要的等待时间是..." filename="ivr-estimated_hold_time.wav"/>
 			<prompt phrase="多于..." filename="ivr-more_than.wav"/>
 			<prompt phrase="少于..." filename="ivr-less_than.wav"/>
-			<prompt phrase="开始录音" filename="ivr-begin_recording.wav "/>
+			<prompt phrase="开始录音" filename="ivr-begin_recording.wav"/>
 			<prompt phrase="呼叫前转已取消" filename="ivr-call_forwarding_has_been_cancelled.wav"/>
 			<prompt phrase="呼叫前转已设置" filename="ivr-call_forwarding_has_been_set.wav"/>
 			<prompt phrase="请输入电话号码" filename="ivr-please_enter_the_phone_number.wav"/>

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;
 }