refactor/abstract the core sql stuff more

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15599 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/include/switch_core.h

@@ -1926,25 +1926,71 @@ typedef enum {
 	CDF_INUSE = (1 << 0)
 } cache_db_flag_t;
 
+typedef enum {
+	SCDB_TYPE_CORE_DB,
+	SCDB_TYPE_ODBC
+} switch_cache_db_handle_type_t;
+
+typedef union {
+	switch_core_db_t *core_db_dbh;
+	switch_odbc_handle_t *odbc_dbh;	
+} switch_cache_db_native_handle_t;
+
+typedef struct {
+	char *db_path;
+} switch_cache_db_core_db_options_t;
+
+typedef struct {
+	char *dsn;
+	char *user;
+	char *pass;
+} switch_cache_db_odbc_options_t;
+
+typedef union {
+	switch_cache_db_core_db_options_t core_db_options;
+	switch_cache_db_odbc_options_t odbc_options;
+} switch_cache_db_connection_options_t;
+
 typedef struct {
 	char name[CACHE_DB_LEN];
-	switch_core_db_t *db;
-	switch_odbc_handle_t *odbc_dbh;
+	switch_cache_db_handle_type_t type;
+	switch_cache_db_native_handle_t native_handle;
 	time_t last_used;
 	switch_mutex_t *mutex;
 	switch_memory_pool_t *pool;
 	int32_t flags;
 } switch_cache_db_handle_t;
 
+
+static inline const char *switch_cache_db_type_name(switch_cache_db_handle_type_t type)
+{
+	const char *type_str = "INVALID";
+
+	switch (type) {
+	case SCDB_TYPE_ODBC:
+		{
+			type_str = "ODBC";
+		}
+		break;
+	case SCDB_TYPE_CORE_DB:
+		{
+			type_str = "CORE_DB";
+		}
+		break;
+	}
+
+	return type_str;
+}
+
 SWITCH_DECLARE(void) switch_cache_db_release_db_handle(switch_cache_db_handle_t **dbh);
 SWITCH_DECLARE(void) switch_cache_db_destroy_db_handle(switch_cache_db_handle_t **dbh);
 SWITCH_DECLARE(switch_status_t) _switch_cache_db_get_db_handle(switch_cache_db_handle_t **dbh, 
-															   const char *db_name, 
-															   const char *odbc_user, 
-															   const char *odbc_pass, const char *file, const char *func, int line);
-#define switch_cache_db_get_db_handle(_a, _b, _c, _d) _switch_cache_db_get_db_handle(_a, _b, _c, _d, __FILE__, __SWITCH_FUNC__, __LINE__)
+															   switch_cache_db_handle_type_t type,
+															   switch_cache_db_connection_options_t *connection_options,
+															   const char *file, const char *func, int line);
+#define switch_cache_db_get_db_handle(_a, _b) _switch_cache_db_get_db_handle(_a, _b, __FILE__, __SWITCH_FUNC__, __LINE__)
 
-SWITCH_DECLARE(switch_status_t) switch_cache_db_execute_sql(switch_cache_db_handle_t *dbh, const char *sql, char **err);
+SWITCH_DECLARE(switch_status_t) switch_cache_db_execute_sql(switch_cache_db_handle_t *dbh, char *sql, char **err);
 SWITCH_DECLARE(switch_status_t) switch_cache_db_execute_sql_callback(switch_cache_db_handle_t *dbh, const char *sql, 
 																	 switch_core_db_callback_func_t callback, void *pdata, char **err);
 
@@ -1953,7 +1999,7 @@ SWITCH_DECLARE(switch_status_t) _switch_core_db_handle(switch_cache_db_handle_t
 
 SWITCH_DECLARE(void) 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);
-SWITCH_DECLARE(switch_status_t) switch_cache_db_persistant_execute_trans(switch_cache_db_handle_t *dbh, const char *sql, uint32_t retries);
+SWITCH_DECLARE(switch_status_t) switch_cache_db_persistant_execute_trans(switch_cache_db_handle_t *dbh, char *sql, uint32_t retries);
 SWITCH_DECLARE(void) switch_cache_db_detach(void);
 SWITCH_DECLARE(uint32_t) switch_core_debug_level(void);
 

src/switch_core.c

@@ -1470,10 +1470,17 @@ static void switch_load_core_config(const char *file)
 */
 SWITCH_DECLARE(switch_status_t) _switch_core_db_handle(switch_cache_db_handle_t **dbh, const char *file, const char *func, int line)
 {
+	switch_cache_db_connection_options_t options = { {0} };
+
 	if (runtime.odbc_dsn && runtime.odbc_user && runtime.odbc_pass) {
-		return _switch_cache_db_get_db_handle(dbh, runtime.odbc_dsn, runtime.odbc_user, runtime.odbc_pass, file, func, line);
+		options.odbc_options.dsn = runtime.odbc_dsn;
+		options.odbc_options.user = runtime.odbc_user;
+		options.odbc_options.pass = runtime.odbc_pass;
+
+		return _switch_cache_db_get_db_handle(dbh, SCDB_TYPE_ODBC, &options, file, func, line);
 	} else {
-		return _switch_cache_db_get_db_handle(dbh, SWITCH_CORE_DB, NULL, NULL, file, func, line);
+		options.core_db_options.db_path = SWITCH_CORE_DB;
+		return _switch_cache_db_get_db_handle(dbh, SCDB_TYPE_CORE_DB, &options, file, func, line);
 	}
 }