From 26fe3d384743eca638cf739723572f8897da1789 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Fri, 12 Oct 2012 10:54:36 -0500 Subject: [PATCH] normalize db stuff to be pgsql:// odbc:// and sqlite:// in dsn strings --- src/switch_core_sqldb.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c index 7b20e0ec4b..e23d427a1b 100644 --- a/src/switch_core_sqldb.c +++ b/src/switch_core_sqldb.c @@ -318,16 +318,16 @@ SWITCH_DECLARE(switch_status_t) _switch_cache_db_get_db_handle_dsn(switch_cache_ switch_status_t status = SWITCH_STATUS_FALSE; int i; - if (!strncmp(dsn, "pgsql;", 6)) { + if (!strncasecmp(dsn, "pgsql://", 8)) { type = SCDB_TYPE_PGSQL; - connection_options.pgsql_options.dsn = (char *)(dsn + 6); - } else if ((!(i = strncmp(dsn, "odbc;", 6))) || strchr(dsn, ':')) { + connection_options.pgsql_options.dsn = (char *)(dsn + 8); + } else if ((!(i = strncasecmp(dsn, "odbc://", 8))) || strchr(dsn, ':')) { type = SCDB_TYPE_ODBC; if (i) { switch_set_string(tmp, dsn); } else { - switch_set_string(tmp, dsn+6); + switch_set_string(tmp, dsn+8); } connection_options.odbc_options.dsn = tmp; @@ -344,6 +344,10 @@ SWITCH_DECLARE(switch_status_t) _switch_cache_db_get_db_handle_dsn(switch_cache_ } } else { + if (!strncasecmp(dsn, "sqlite://", 9)) { + dsn += 9; + } + type = SCDB_TYPE_CORE_DB; connection_options.core_db_options.db_path = (char *)dsn; }