revert

diff --git a/src/include/switch_core.h b/src/include/switch_core.h
index efd983ded879449f359d855e8103f2b5b670598a..540de6e5371f61906660cfa724dccaf346d7ba0b 100644 (file)
--- a/src/include/switch_core.h
+++ b/src/include/switch_core.h
@@ -2303,9 +2303,6 @@ SWITCH_DECLARE(switch_status_t) _switch_core_db_handle(switch_cache_db_handle_t
 SWITCH_DECLARE(switch_status_t) _switch_core_recovery_db_handle(switch_cache_db_handle_t ** dbh, const char *file, const char *func, int line);
 #define switch_core_recovery_db_handle(_a) _switch_core_recovery_db_handle(_a, __FILE__, __SWITCH_FUNC__, __LINE__)
 
-SWITCH_DECLARE(switch_status_t) _switch_core_persist_db_handle(switch_cache_db_handle_t ** dbh, const char *file, const char *func, int line);
-#define switch_core_persist_db_handle(_a) _switch_core_persist_db_handle(_a, __FILE__, __SWITCH_FUNC__, __LINE__)
-
 SWITCH_DECLARE(switch_bool_t) switch_cache_db_test_reactive(switch_cache_db_handle_t *db,
                                                                                                                        const char *test_sql, const char *drop_sql, const char *reactive_sql);
 SWITCH_DECLARE(switch_status_t) switch_cache_db_persistant_execute(switch_cache_db_handle_t *dbh, const char *sql, uint32_t retries);

diff --git a/src/switch_console.c b/src/switch_console.c
index d461333860e707092c47f6af8e9912acd4deefa4..059ff79d596f28188f8864ec67557f751c33dbc9 100644 (file)
--- a/src/switch_console.c
+++ b/src/switch_console.c
@@ -248,7 +248,7 @@ SWITCH_DECLARE(char *) switch_console_expand_alias(char *cmd, char *arg)
                return NULL;
        }
 
-       if (switch_core_persist_db_handle(&db) != SWITCH_STATUS_SUCCESS) {
+       if (switch_core_db_handle(&db) != SWITCH_STATUS_SUCCESS) {
                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database Error\n");
                return NULL;
        }
@@ -1859,7 +1859,7 @@ SWITCH_DECLARE(switch_status_t) switch_console_set_alias(const char *string)
                        switch_cache_db_handle_t *db = NULL;
                        char *sql = NULL;
 
-                       if (switch_core_persist_db_handle(&db) != SWITCH_STATUS_SUCCESS) {
+                       if (switch_core_db_handle(&db) != SWITCH_STATUS_SUCCESS) {
                                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Database Error\n");
                                free(mydata);
                                return SWITCH_STATUS_FALSE;

diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c
index 556e3abab23022c70af9cfb004ce1d6ff5d0cf32..b4a58bbd9d99b25dca376036b545912758b09c40 100644 (file)
--- a/src/switch_core_sqldb.c
+++ b/src/switch_core_sqldb.c
@@ -176,7 +176,7 @@ static switch_cache_db_handle_t *get_handle(const char *db_str, const char *user
 }
 
 
-#define SWITCH_CORE_DB "file:scoreboard?mode=memory&cache=shared"
+#define SWITCH_CORE_DB "core"
 /*!
   \brief Open the default system database
 */
@@ -218,49 +218,6 @@ SWITCH_DECLARE(switch_status_t) _switch_core_db_handle(switch_cache_db_handle_t
        return r;
 }
 
-#define SWITCH_CORE_PERSIST_DB "core"
-/*!
-  \brief Open the default system database
-*/
-SWITCH_DECLARE(switch_status_t) _switch_core_persist_db_handle(switch_cache_db_handle_t **dbh, const char *file, const char *func, int line)
-{
-       switch_cache_db_connection_options_t options = { {0} };
-       switch_status_t r;
-       
-       if (!sql_manager.manage) {
-               return SWITCH_STATUS_FALSE;
-       }
-
-       if (zstr(runtime.odbc_dsn)) {
-               if (switch_test_flag((&runtime), SCF_CORE_ODBC_REQ)) {
-                       return SWITCH_STATUS_FALSE;
-               }
-
-               if (runtime.dbname) {
-                       options.core_db_options.db_path = runtime.dbname;
-               } else {
-                       options.core_db_options.db_path = SWITCH_CORE_PERSIST_DB;
-               }
-               r = _switch_cache_db_get_db_handle(dbh, SCDB_TYPE_CORE_DB, &options, file, func, line);
-               
-       } else {
-               options.odbc_options.dsn = runtime.odbc_dsn;
-               options.odbc_options.user = runtime.odbc_user;
-               options.odbc_options.pass = runtime.odbc_pass;
-
-               r = _switch_cache_db_get_db_handle(dbh, SCDB_TYPE_ODBC, &options, file, func, line);
-       }
-
-       /* I *think* we can do without this now, if not let me know 
-          if (r == SWITCH_STATUS_SUCCESS && !(*dbh)->io_mutex) {
-          (*dbh)->io_mutex = sql_manager.io_mutex;
-          }
-       */
-
-       return r;
-}
-
-
 #define SWITCH_CORE_RECOVERY_DB "core_recovery"
 SWITCH_DECLARE(switch_status_t) _switch_core_recovery_db_handle(switch_cache_db_handle_t **dbh, const char *file, const char *func, int line)
 {
@@ -2409,13 +2366,7 @@ switch_status_t switch_core_sqldb_start(switch_memory_pool_t *pool, switch_bool_
                break;
        }
 
-       {
-               switch_cache_db_handle_t *db = NULL;
-               switch_core_persist_db_handle(&db);
-               switch_cache_db_test_reactive(db, "select hostname from aliases", "DROP TABLE aliases", create_alias_sql);
-               switch_cache_db_release_db_handle(&db);
-       }
-
+       switch_cache_db_test_reactive(sql_manager.dbh, "select hostname from aliases", "DROP TABLE aliases", create_alias_sql);
        switch_cache_db_test_reactive(sql_manager.dbh, "select hostname from complete", "DROP TABLE complete", create_complete_sql);
        switch_cache_db_test_reactive(sql_manager.dbh, "select hostname from nat", "DROP TABLE nat", create_nat_sql);
        switch_cache_db_test_reactive(sql_manager.dbh, "delete from registrations where reg_user='' or network_proto='tcp' or network_proto='tls'",