kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[mod_pgsql] Fix autocommit not flipping back to on when a transaction ends in mod_pgsql causing switch_cache_db_test_reactive() to fail.

This commit is contained in:
Andrey Volk 2020-01-24 02:19:46 +04:00
parent 496d39bbd7
commit 3d650f4f69
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mod/databases/mod_pgsql/mod_pgsql.c
View File

@ -853,8 +853,8 @@ switch_status_t database_commit(switch_database_interface_handle_t *dih)
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
result = pgsql_SQLEndTran(handle, SWITCH_TRUE); result = pgsql_SQLEndTran(handle, SWITCH_TRUE);
result = result && pgsql_SQLSetAutoCommitAttr(dih, SWITCH_TRUE); result = pgsql_SQLSetAutoCommitAttr(dih, SWITCH_TRUE) && result;
result = result && pgsql_finish_results(handle); result = pgsql_finish_results(handle) && result;
return result; return result;
} }
@ -862,6 +862,7 @@ switch_status_t database_commit(switch_database_interface_handle_t *dih)
switch_status_t database_rollback(switch_database_interface_handle_t *dih) switch_status_t database_rollback(switch_database_interface_handle_t *dih)
{ {
switch_pgsql_handle_t *handle; switch_pgsql_handle_t *handle;
switch_status_t result;
if (!dih) { if (!dih) {
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
@ -872,10 +873,11 @@ switch_status_t database_rollback(switch_database_interface_handle_t *dih)
if (!handle) if (!handle)
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
pgsql_SQLEndTran(handle, SWITCH_FALSE); result = pgsql_SQLEndTran(handle, SWITCH_FALSE);
// Is that enought? result = pgsql_SQLSetAutoCommitAttr(dih, SWITCH_TRUE) && result;
result = pgsql_finish_results(handle) && result;
return SWITCH_STATUS_SUCCESS; return result;
} }
switch_status_t pgsql_handle_callback_exec_detailed(const char *file, const char *func, int line, switch_status_t pgsql_handle_callback_exec_detailed(const char *file, const char *func, int line,