From: Andrey Volk Date: Sat, 10 Aug 2019 16:39:57 +0000 (+0400) Subject: FS-11991: [Core] Fix bug in the database module interface preventing tables from... X-Git-Tag: v1.10.1^2~9^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9520f8e1115dee31c0221967191079a3b01d02c6;p=thirdparty%2Ffreeswitch.git FS-11991: [Core] Fix bug in the database module interface preventing tables from being created when no drop_sql --- diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c index bda1dd22fd..3752a06b23 100644 --- a/src/switch_core_sqldb.c +++ b/src/switch_core_sqldb.c @@ -1488,20 +1488,20 @@ SWITCH_DECLARE(switch_bool_t) switch_cache_db_test_reactive_ex(switch_cache_db_h char tmp[100]; switch_snprintfv(tmp, sizeof(tmp), "%q-%i", "Unable to test_reactive with drop_sql", result); } + } - if ((result = database_interface_handle_exec(database_interface, dbh->native_handle.database_interface_dbh, reactive_sql, NULL)) != SWITCH_STATUS_SUCCESS) { - char tmp[100]; - switch_snprintfv(tmp, sizeof(tmp), "%q-%i", "Unable to test_reactive with reactive_sql", result); + if ((result = database_interface_handle_exec(database_interface, dbh->native_handle.database_interface_dbh, reactive_sql, NULL)) != SWITCH_STATUS_SUCCESS) { + char tmp[100]; + switch_snprintfv(tmp, sizeof(tmp), "%q-%i", "Unable to test_reactive with reactive_sql", result); - if (row_size_limited_reactive_sql && switch_test_flag(database_interface, SWITCH_DATABASE_FLAG_ROW_SIZE_LIMIT)) { - if ((result = database_interface_handle_exec(database_interface, dbh->native_handle.database_interface_dbh, row_size_limited_reactive_sql, NULL)) != SWITCH_STATUS_SUCCESS) { - switch_snprintfv(tmp, sizeof(tmp), "%q-%i", "Unable to test_reactive with row_size_limited_reactive_sql", result); - } + if (row_size_limited_reactive_sql && switch_test_flag(database_interface, SWITCH_DATABASE_FLAG_ROW_SIZE_LIMIT)) { + if ((result = database_interface_handle_exec(database_interface, dbh->native_handle.database_interface_dbh, row_size_limited_reactive_sql, NULL)) != SWITCH_STATUS_SUCCESS) { + switch_snprintfv(tmp, sizeof(tmp), "%q-%i", "Unable to test_reactive with row_size_limited_reactive_sql", result); } } - - r = (result == SWITCH_STATUS_SUCCESS); } + + r = (result == SWITCH_STATUS_SUCCESS); } } break;