Module: sip-router Branch: master Commit: 09a79d78300c5f510278b5417da45a3999d27b9b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=09a79d78...

Author: Peter Dunkley peter.dunkley@crocodile-rcs.com Committer: Peter Dunkley peter.dunkley@crocodile-rcs.com Date: Fri Apr 20 17:20:17 2012 +0100

modules/db_mysql, modules_k/db_oracle, modules_k/db_sqlite, modules_k/db_unixodbc: Updated to work with latest lib/srdb1

- db_do_init() in lib/srdb1 has an extra parameter to allow a unique (non-pooled) connection to be created. - These DB modules do not yet support non-pooled connections so the init functions in the modules just call db_do_init() with the new parameter set to 0.

---

modules/db_mysql/km_dbase.c | 2 +- modules_k/db_oracle/dbase.c | 2 +- modules_k/db_sqlite/dbase.c | 2 +- modules_k/db_unixodbc/dbase.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index 208f64e..14d4ce5 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -133,7 +133,7 @@ static int db_mysql_submit_query(const db1_con_t* _h, const str* _s) */ db1_con_t* db_mysql_init(const str* _url) { - return db_do_init(_url, (void *)db_mysql_new_connection); + return db_do_init(_url, (void *)db_mysql_new_connection, 0); }

diff --git a/modules_k/db_oracle/dbase.c b/modules_k/db_oracle/dbase.c index 619cc4d..dfa9cde 100644 --- a/modules_k/db_oracle/dbase.c +++ b/modules_k/db_oracle/dbase.c @@ -163,7 +163,7 @@ const char* db_oracle_error(ora_con_t* con, sword status) */ db1_con_t* db_oracle_init(const str* _url) { - return db_do_init(_url, (void *)db_oracle_new_connection); + return db_do_init(_url, (void *)db_oracle_new_connection, 0); }

diff --git a/modules_k/db_sqlite/dbase.c b/modules_k/db_sqlite/dbase.c index 67db13b..c529a7c 100644 --- a/modules_k/db_sqlite/dbase.c +++ b/modules_k/db_sqlite/dbase.c @@ -73,7 +73,7 @@ static struct sqlite_connection * db_sqlite_new_connection(const struct db_id* i

db1_con_t* db_sqlite_init(const str* _url) { - return db_do_init(_url, (void *) db_sqlite_new_connection); + return db_do_init(_url, (void *) db_sqlite_new_connection, 0); }

diff --git a/modules_k/db_unixodbc/dbase.c b/modules_k/db_unixodbc/dbase.c index 72edf1e..97b9194 100644 --- a/modules_k/db_unixodbc/dbase.c +++ b/modules_k/db_unixodbc/dbase.c @@ -172,7 +172,7 @@ static int db_unixodbc_submit_query(const db1_con_t* _h, const str* _s) */ db1_con_t* db_unixodbc_init(const str* _url) { - return db_do_init(_url, (void*)db_unixodbc_new_connection); + return db_do_init(_url, (void*)db_unixodbc_new_connection, 0); }

/*