res_pjsip_outbound_registration: Fix leak on vector add failure.
[asterisk/asterisk.git] / res / res_config_sqlite.c
index 3faff62..0f91131 100644 (file)
@@ -36,7 +36,7 @@
  *
  * \section conf_sec Configuration
  *
- * The main configuration file is res_config_sqlite.conf. It must be readable or
+ * The main configuration file is res_config_sqlite.conf.sample It must be readable or
  * res_config_sqlite will fail to start. It is suggested to use the sample file
  * in this package as a starting point. The file has only one section
  * named <code>general</code>. Here are the supported parameters :
  * \brief res_config_sqlite module.
  */
 
+/*! \li \ref res_config_sqlite.c uses the configuration file \ref res_config_sqlite.conf
+ * \addtogroup configuration_file Configuration Files
+ */
+
+/*! 
+ * \page res_config_sqlite.conf res_config_sqlite.conf
+ * \verbinclude res_config_sqlite.conf.sample
+ */
+
 /*** MODULEINFO
        <depend>sqlite</depend>
+       <support_level>extended</support_level>
  ***/
 
 #include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sqlite.h>
 
+#include "asterisk/logger.h"
+#include "asterisk/app.h"
 #include "asterisk/pbx.h"
 #include "asterisk/cdr.h"
 #include "asterisk/cli.h"
@@ -121,9 +132,12 @@ MACRO_BEGIN                                                \
        }                                               \
 MACRO_END
 
+AST_THREADSTORAGE(sql_buf);
+AST_THREADSTORAGE(where_buf);
+
 /*!
  * Maximum number of loops before giving up executing a query. Calls to
- * sqlite_xxx() functions which can return SQLITE_BUSY or SQLITE_LOCKED
+ * sqlite_xxx() functions which can return SQLITE_BUSY
  * are enclosed by RES_CONFIG_SQLITE_BEGIN and RES_CONFIG_SQLITE_END, e.g.
  * <pre>
  * char *errormsg;
@@ -156,7 +170,7 @@ MACRO_BEGIN                                                         \
  * \see RES_CONFIG_SQLITE_MAX_LOOPS.
  */
 #define RES_CONFIG_SQLITE_END(error)                                   \
-               if (error != SQLITE_BUSY && error != SQLITE_LOCKED)     \
+               if (error != SQLITE_BUSY)       \
                        break;                                          \
                usleep(1000);                                           \
        }                                                               \
@@ -267,6 +281,7 @@ static int add_cfg_entry(void *arg, int argc, char **argv, char **columnNames);
  * \param cfg the struct ast_config object to use when storing variables
  * \param flags Optional flags.  Not used.
  * \param suggested_incl suggest include.
+ * \param who_asked
  * \retval cfg object
  * \retval NULL if an error occurred
  * \see add_cfg_entry()
@@ -275,31 +290,6 @@ static struct ast_config * config_handler(const char *database, const char *tabl
        struct ast_config *cfg, struct ast_flags flags, const char *suggested_incl, const char *who_asked);
 
 /*!
- * \brief Helper function to parse a va_list object into 2 dynamic arrays of
- * strings, parameters and values.
- *
- * ap must have the following format : param1 val1 param2 val2 param3 val3 ...
- * arguments will be extracted to create 2 arrays:
- *
- * <ul>
- *     <li>params : param1 param2 param3 ...</li>
- *     <li>vals : val1 val2 val3 ...</li>
- * </ul>
- *
- * The address of these arrays are stored in params_ptr and vals_ptr. It
- * is the responsibility of the caller to release the memory of these arrays.
- * It is considered an error that va_list has a null or odd number of strings.
- *
- * \param ap the va_list object to parse
- * \param params_ptr where the address of the params array is stored
- * \param vals_ptr where the address of the vals array is stored
- * \retval the number of elements in the arrays (which have the same size).
- * \retval 0 if an error occurred.
- */
-static size_t get_params(va_list ap, const char ***params_ptr,
-       const char ***vals_ptr);
-
-/*!
  * \brief SQLite callback function for RealTime configuration.
  *
  * This function is passed to the SQLite engine as a callback function to
@@ -328,14 +318,14 @@ static int add_rt_cfg_entry(void *arg, int argc, char **argv,
  *
  * \param database the database to use (ignored)
  * \param table the table to use
- * \param ap list of parameters and values to match
+ * \param fields list of parameters and values to match
  *
  * \retval a linked list of struct ast_variable objects
  * \retval NULL if an error occurred
  * \see add_rt_cfg_entry()
  */
 static struct ast_variable * realtime_handler(const char *database,
-       const char *table, va_list ap);
+       const char *table, const struct ast_variable *fields);
 
 /*!
  * \brief SQLite callback function for RealTime configuration.
@@ -365,14 +355,14 @@ static int add_rt_multi_cfg_entry(void *arg, int argc, char **argv,
  *
  * \param database the database to use (ignored)
  * \param table the table to use
- * \param ap list of parameters and values to match
+ * \param fields list of parameters and values to match
  * \retval a struct ast_config object storing categories and variables.
  * \retval NULL if an error occurred.
  *
  * \see add_rt_multi_cfg_entry()
  */
 static struct ast_config * realtime_multi_handler(const char *database,
-       const char *table, va_list ap);
+       const char *table, const struct ast_variable *fields);
 
 /*!
  * \brief Asterisk callback function for RealTime configuration (variable
@@ -388,12 +378,14 @@ static struct ast_config * realtime_multi_handler(const char *database,
  * \param table the table to use
  * \param keyfield the column of the matching cell
  * \param entity the value of the matching cell
- * \param ap list of parameters and new values to update in the database
+ * \param fields list of parameters and new values to update in the database
  * \retval the number of affected rows.
  * \retval -1 if an error occurred.
  */
 static int realtime_update_handler(const char *database, const char *table,
-       const char *keyfield, const char *entity, va_list ap);
+       const char *keyfield, const char *entity, const struct ast_variable *fields);
+static int realtime_update2_handler(const char *database, const char *table,
+       const struct ast_variable *lookup_fields, const struct ast_variable *update_fields);
 
 /*!
  * \brief Asterisk callback function for RealTime configuration (variable
@@ -406,12 +398,12 @@ static int realtime_update_handler(const char *database, const char *table,
  *
  * \param database the database to use (ignored)
  * \param table the table to use
- * \param ap list of parameters and new values to insert into the database
+ * \param fields list of parameters and new values to insert into the database
  * \retval the rowid of inserted row.
  * \retval -1 if an error occurred.
  */
 static int realtime_store_handler(const char *database, const char *table,
-       va_list ap);
+       const struct ast_variable *fields);
 
 /*!
  * \brief Asterisk callback function for RealTime configuration (destroys
@@ -427,12 +419,12 @@ static int realtime_store_handler(const char *database, const char *table,
  * \param table the table to use
  * \param keyfield the column of the matching cell
  * \param entity the value of the matching cell
- * \param ap list of additional parameters for cell matching
+ * \param fields list of additional parameters for cell matching
  * \retval the number of affected rows.
  * \retval -1 if an error occurred.
  */
 static int realtime_destroy_handler(const char *database, const char *table,
-       const char *keyfield, const char *entity, va_list ap);
+       const char *keyfield, const char *entity, const struct ast_variable *fields);
 
 /*!
  * \brief Asterisk callback function for the CLI status command.
@@ -443,6 +435,10 @@ static int realtime_destroy_handler(const char *database, const char *table,
  * \return RESULT_SUCCESS
  */
 static char *handle_cli_show_sqlite_status(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
+static char *handle_cli_sqlite_show_tables(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a);
+
+static int realtime_require_handler(const char *database, const char *table, va_list ap);
+static int realtime_unload_handler(const char *unused, const char *tablename);
 
 /*! The SQLite database object. */
 static sqlite *db;
@@ -477,7 +473,10 @@ static struct ast_config_engine sqlite_engine =
        .realtime_multi_func = realtime_multi_handler,
        .store_func = realtime_store_handler,
        .destroy_func = realtime_destroy_handler,
-       .update_func = realtime_update_handler
+       .update_func = realtime_update_handler,
+       .update2_func = realtime_update2_handler,
+       .require_func = realtime_require_handler,
+       .unload_func = realtime_unload_handler,
 };
 
 /*!
@@ -491,8 +490,24 @@ AST_MUTEX_DEFINE_STATIC(mutex);
  */
 static struct ast_cli_entry cli_status[] = {
        AST_CLI_DEFINE(handle_cli_show_sqlite_status, "Show status information about the SQLite 2 driver"),
+       AST_CLI_DEFINE(handle_cli_sqlite_show_tables, "Cached table information about the SQLite 2 driver"),
+};
+
+struct sqlite_cache_columns {
+       char *name;
+       char *type;
+       unsigned char isint;    /*!< By definition, only INTEGER PRIMARY KEY is an integer; everything else is a string. */
+       AST_RWLIST_ENTRY(sqlite_cache_columns) list;
+};
+
+struct sqlite_cache_tables {
+       char *name;
+       AST_RWLIST_HEAD(_columns, sqlite_cache_columns) columns;
+       AST_RWLIST_ENTRY(sqlite_cache_tables) list;
 };
 
+static AST_RWLIST_HEAD_STATIC(sqlite_tables, sqlite_cache_tables);
+
 /*
  * Taken from Asterisk 1.2 cdr_sqlite.so.
  */
@@ -522,47 +537,10 @@ static char *sql_create_cdr_table =
 "      PRIMARY KEY     (id)\n"
 ");";
 
-/*! SQL query format to insert a CDR entry. */
-static char *sql_add_cdr_entry =
-"INSERT INTO '%q' ("
-"      clid,"
-"      src,"
-"      dst,"
-"      dcontext,"
-"      channel,"
-"      dstchannel,"
-"      lastapp,"
-"      lastdata,"
-"      start,"
-"      answer,"
-"      end,"
-"      duration,"
-"      billsec,"
-"      disposition,"
-"      amaflags,"
-"      accountcode,"
-"      uniqueid,"
-"      userfield"
-") VALUES ("
-"      '%q',"
-"      '%q',"
-"      '%q',"
-"      '%q',"
-"      '%q',"
-"      '%q',"
-"      '%q',"
-"      '%q',"
-"      datetime(%d,'unixepoch','localtime'),"
-"      datetime(%d,'unixepoch','localtime'),"
-"      datetime(%d,'unixepoch','localtime'),"
-"      '%ld',"
-"      '%ld',"
-"      '%ld',"
-"      '%ld',"
-"      '%q',"
-"      '%q',"
-"      '%q'"
-");";
+/*!
+ * SQL query format to describe the table structure
+ */
+#define sql_table_structure "SELECT sql FROM sqlite_master WHERE type='table' AND tbl_name='%s'"
 
 /*!
  * SQL query format to fetch the static configuration of a file.
@@ -570,11 +548,149 @@ static char *sql_add_cdr_entry =
  *
  * \see add_cfg_entry()
  */
-static char *sql_get_config_table =
-"SELECT *"
-"      FROM '%q'"
-"      WHERE filename = '%q' AND commented = 0"
-"      ORDER BY cat_metric ASC, var_metric ASC;";
+#define sql_get_config_table \
+       "SELECT *" \
+       "       FROM '%q'" \
+       "       WHERE filename = '%q' AND commented = 0" \
+       "       ORDER BY cat_metric ASC, var_metric ASC;"
+
+static void free_table(struct sqlite_cache_tables *tblptr)
+{
+       struct sqlite_cache_columns *col;
+
+       /* Obtain a write lock to ensure there are no read locks outstanding */
+       AST_RWLIST_WRLOCK(&(tblptr->columns));
+       while ((col = AST_RWLIST_REMOVE_HEAD(&(tblptr->columns), list))) {
+               ast_free(col);
+       }
+       AST_RWLIST_UNLOCK(&(tblptr->columns));
+       AST_RWLIST_HEAD_DESTROY(&(tblptr->columns));
+       ast_free(tblptr);
+}
+
+static int find_table_cb(void *vtblptr, int argc, char **argv, char **columnNames)
+{
+       struct sqlite_cache_tables *tblptr = vtblptr;
+       char *sql = ast_strdupa(argv[0]), *start, *end, *type, *remainder;
+       int i;
+       AST_DECLARE_APP_ARGS(fie,
+               AST_APP_ARG(ld)[100]; /* This means we support up to 100 columns per table */
+       );
+       struct sqlite_cache_columns *col;
+
+       /* This is really fun.  We get to parse an SQL statement to figure out
+        * what columns are in the table.
+        */
+       if ((start = strchr(sql, '(')) && (end = strrchr(sql, ')'))) {
+               start++;
+               *end = '\0';
+       } else {
+               /* Abort */
+               return -1;
+       }
+
+       AST_STANDARD_APP_ARGS(fie, start);
+       for (i = 0; i < fie.argc; i++) {
+               fie.ld[i] = ast_skip_blanks(fie.ld[i]);
+               ast_debug(5, "Found field: %s\n", fie.ld[i]);
+               if (strncasecmp(fie.ld[i], "PRIMARY KEY", 11) == 0 && (start = strchr(fie.ld[i], '(')) && (end = strchr(fie.ld[i], ')'))) {
+                       *end = '\0';
+                       AST_RWLIST_TRAVERSE(&(tblptr->columns), col, list) {
+                               if (strcasecmp(start + 1, col->name) == 0 && strcasestr(col->type, "INTEGER")) {
+                                       col->isint = 1;
+                               }
+                       }
+                       continue;
+               }
+               /* type delimiter could be any space character */
+               for (type = fie.ld[i]; *type > 32; type++);
+               *type++ = '\0';
+               type = ast_skip_blanks(type);
+               for (remainder = type; *remainder > 32; remainder++);
+               *remainder = '\0';
+               if (!(col = ast_calloc(1, sizeof(*col) + strlen(fie.ld[i]) + strlen(type) + 2))) {
+                       return -1;
+               }
+               col->name = (char *)col + sizeof(*col);
+               col->type = (char *)col + sizeof(*col) + strlen(fie.ld[i]) + 1;
+               strcpy(col->name, fie.ld[i]); /* SAFE */
+               strcpy(col->type, type); /* SAFE */
+               if (strcasestr(col->type, "INTEGER") && strcasestr(col->type, "PRIMARY KEY")) {
+                       col->isint = 1;
+               }
+               AST_LIST_INSERT_TAIL(&(tblptr->columns), col, list);
+       }
+       return 0;
+}
+
+static struct sqlite_cache_tables *find_table(const char *tablename)
+{
+       struct sqlite_cache_tables *tblptr;
+       int i, err;
+       char *sql, *errstr = NULL;
+
+       AST_RWLIST_RDLOCK(&sqlite_tables);
+
+       for (i = 0; i < 2; i++) {
+               AST_RWLIST_TRAVERSE(&sqlite_tables, tblptr, list) {
+                       if (strcmp(tblptr->name, tablename) == 0) {
+                               break;
+                       }
+               }
+               if (tblptr) {
+                       AST_RWLIST_RDLOCK(&(tblptr->columns));
+                       AST_RWLIST_UNLOCK(&sqlite_tables);
+                       return tblptr;
+               }
+
+               if (i == 0) {
+                       AST_RWLIST_UNLOCK(&sqlite_tables);
+                       AST_RWLIST_WRLOCK(&sqlite_tables);
+               }
+       }
+
+       /* Table structure not cached; build the structure now */
+       if (ast_asprintf(&sql, sql_table_structure, tablename) < 0) {
+               sql = NULL;
+       }
+       if (!(tblptr = ast_calloc(1, sizeof(*tblptr) + strlen(tablename) + 1))) {
+               AST_RWLIST_UNLOCK(&sqlite_tables);
+               ast_log(LOG_ERROR, "Memory error.  Cannot cache table '%s'\n", tablename);
+               ast_free(sql);
+               return NULL;
+       }
+       tblptr->name = (char *)tblptr + sizeof(*tblptr);
+       strcpy(tblptr->name, tablename); /* SAFE */
+       AST_RWLIST_HEAD_INIT(&(tblptr->columns));
+
+       ast_debug(1, "About to query table structure: %s\n", sql);
+
+       ast_mutex_lock(&mutex);
+       if ((err = sqlite_exec(db, sql, find_table_cb, tblptr, &errstr))) {
+               ast_mutex_unlock(&mutex);
+               ast_log(LOG_WARNING, "SQLite error %d: %s\n", err, errstr);
+               ast_free(errstr);
+               free_table(tblptr);
+               AST_RWLIST_UNLOCK(&sqlite_tables);
+               ast_free(sql);
+               return NULL;
+       }
+       ast_mutex_unlock(&mutex);
+       ast_free(sql);
+
+       if (AST_LIST_EMPTY(&(tblptr->columns))) {
+               free_table(tblptr);
+               AST_RWLIST_UNLOCK(&sqlite_tables);
+               return NULL;
+       }
+
+       AST_RWLIST_INSERT_TAIL(&sqlite_tables, tblptr, list);
+       AST_RWLIST_RDLOCK(&(tblptr->columns));
+       AST_RWLIST_UNLOCK(&sqlite_tables);
+       return tblptr;
+}
+
+#define release_table(a)       AST_RWLIST_UNLOCK(&((a)->columns))
 
 static int set_var(char **var, const char *name, const char *value)
 {
@@ -612,7 +728,7 @@ static int load_config(void)
 
        config = ast_config_load(RES_CONFIG_SQLITE_CONF_FILE, config_flags);
 
-       if (!config) {
+       if (config == CONFIG_STATUS_FILEMISSING || config == CONFIG_STATUS_FILEINVALID) {
                ast_log(LOG_ERROR, "Unable to load " RES_CONFIG_SQLITE_CONF_FILE "\n");
                return 1;
        }
@@ -622,9 +738,9 @@ static int load_config(void)
                        SET_VAR(config, dbfile, var);
                else if (!strcasecmp(var->name, "config_table"))
                        SET_VAR(config, config_table, var);
-               else if (!strcasecmp(var->name, "cdr_table"))
+               else if (!strcasecmp(var->name, "cdr_table")) {
                        SET_VAR(config, cdr_table, var);
-               else
+               } else
                        ast_log(LOG_WARNING, "Unknown parameter : %s\n", var->name);
        }
 
@@ -641,49 +757,90 @@ static int load_config(void)
 
 static void unload_config(void)
 {
+       struct sqlite_cache_tables *tbl;
        ast_free(dbfile);
        dbfile = NULL;
        ast_free(config_table);
        config_table = NULL;
        ast_free(cdr_table);
        cdr_table = NULL;
+       AST_RWLIST_WRLOCK(&sqlite_tables);
+       while ((tbl = AST_RWLIST_REMOVE_HEAD(&sqlite_tables, list))) {
+               free_table(tbl);
+       }
+       AST_RWLIST_UNLOCK(&sqlite_tables);
 }
 
 static int cdr_handler(struct ast_cdr *cdr)
 {
-       char *query, *errormsg;
-       int error;
+       char *errormsg = NULL, *tmp, workspace[500];
+       int error, scannum;
+       struct sqlite_cache_tables *tbl = find_table(cdr_table);
+       struct sqlite_cache_columns *col;
+       struct ast_str *sql1 = ast_str_create(160), *sql2 = ast_str_create(16);
+       int first = 1;
+
+       if (!sql1 || !sql2) {
+               ast_free(sql1);
+               ast_free(sql2);
+               return -1;
+       }
 
-       query = sqlite_mprintf(sql_add_cdr_entry, cdr_table, cdr->clid,
-                       cdr->src, cdr->dst, cdr->dcontext, cdr->channel,
-                       cdr->dstchannel, cdr->lastapp, cdr->lastdata,
-                       cdr->start.tv_sec, cdr->answer.tv_sec,
-                       cdr->end.tv_sec, cdr->duration, cdr->billsec,
-                       cdr->disposition, cdr->amaflags, cdr->accountcode,
-                       cdr->uniqueid, cdr->userfield);
+       if (!tbl) {
+               ast_log(LOG_WARNING, "No such table: %s\n", cdr_table);
+               ast_free(sql1);
+               ast_free(sql2);
+               return -1;
+       }
 
-       if (!query) {
-               ast_log(LOG_WARNING, "Unable to allocate SQL query\n");
-               return 1;
+       ast_str_set(&sql1, 0, "INSERT INTO %s (", cdr_table);
+       ast_str_set(&sql2, 0, ") VALUES (");
+
+       AST_RWLIST_TRAVERSE(&(tbl->columns), col, list) {
+               if (col->isint) {
+                       ast_cdr_format_var(cdr, col->name, &tmp, workspace, sizeof(workspace), 1);
+                       if (!tmp) {
+                               continue;
+                       }
+                       if (sscanf(tmp, "%30d", &scannum) == 1) {
+                               ast_str_append(&sql1, 0, "%s%s", first ? "" : ",", col->name);
+                               ast_str_append(&sql2, 0, "%s%d", first ? "" : ",", scannum);
+                       }
+               } else {
+                       ast_cdr_format_var(cdr, col->name, &tmp, workspace, sizeof(workspace), 0);
+                       if (!tmp) {
+                               continue;
+                       }
+                       ast_str_append(&sql1, 0, "%s%s", first ? "" : ",", col->name);
+                       tmp = sqlite_mprintf("%Q", tmp);
+                       ast_str_append(&sql2, 0, "%s%s", first ? "" : ",", tmp);
+                       sqlite_freemem(tmp);
+               }
+               first = 0;
        }
+       release_table(tbl);
 
-       ast_debug(1, "SQL query: %s\n", query);
+       ast_str_append(&sql1, 0, "%s)", ast_str_buffer(sql2));
+       ast_free(sql2);
+
+       ast_debug(1, "SQL query: %s\n", ast_str_buffer(sql1));
 
        ast_mutex_lock(&mutex);
 
        RES_CONFIG_SQLITE_BEGIN
-               error = sqlite_exec(db, query, NULL, NULL, &errormsg);
+               error = sqlite_exec(db, ast_str_buffer(sql1), NULL, NULL, &errormsg);
        RES_CONFIG_SQLITE_END(error)
 
        ast_mutex_unlock(&mutex);
 
-       sqlite_freemem(query);
+       ast_free(sql1);
 
        if (error) {
-               ast_log(LOG_ERROR, "%s\n", errormsg);
+               ast_log(LOG_ERROR, "%s\n", S_OR(errormsg, sqlite_error_string(error)));
                sqlite_freemem(errormsg);
                return 1;
        }
+       sqlite_freemem(errormsg);
 
        return 0;
 }
@@ -717,10 +874,8 @@ static int add_cfg_entry(void *arg, int argc, char **argv, char **columnNames)
        }
 
        if (!args->cat_name || strcmp(args->cat_name, argv[RES_CONFIG_SQLITE_CONFIG_CATEGORY])) {
-               args->cat = ast_category_new(argv[RES_CONFIG_SQLITE_CONFIG_CATEGORY], "", 99999);
-
+               args->cat = ast_category_new_dynamic(argv[RES_CONFIG_SQLITE_CONFIG_CATEGORY]);
                if (!args->cat) {
-                       ast_log(LOG_WARNING, "Unable to allocate category\n");
                        return 1;
                }
 
@@ -738,7 +893,7 @@ static int add_cfg_entry(void *arg, int argc, char **argv, char **columnNames)
        var = ast_variable_new(argv[RES_CONFIG_SQLITE_CONFIG_VAR_NAME], argv[RES_CONFIG_SQLITE_CONFIG_VAR_VAL], "");
 
        if (!var) {
-               ast_log(LOG_WARNING, "Unable to allocate variable");
+               ast_log(LOG_WARNING, "Unable to allocate variable\n");
                return 1;
        }
 
@@ -751,7 +906,7 @@ static struct ast_config *config_handler(const char *database,      const char *table
        struct ast_config *cfg, struct ast_flags flags, const char *suggested_incl, const char *who_asked)
 {
        struct cfg_entry_args args;
-       char *query, *errormsg;
+       char *query, *errormsg = NULL;
        int error;
 
        if (!config_table) {
@@ -788,52 +943,15 @@ static struct ast_config *config_handler(const char *database,    const char *table
        sqlite_freemem(query);
 
        if (error) {
-               ast_log(LOG_ERROR, "%s\n", errormsg);
+               ast_log(LOG_ERROR, "%s\n", S_OR(errormsg, sqlite_error_string(error)));
                sqlite_freemem(errormsg);
                return NULL;
        }
+       sqlite_freemem(errormsg);
 
        return cfg;
 }
 
-static size_t get_params(va_list ap, const char ***params_ptr, const char ***vals_ptr)
-{
-       const char **tmp, *param, *val, **params, **vals;
-       size_t params_count;
-
-       params = NULL;
-       vals = NULL;
-       params_count = 0;
-
-       while ((param = va_arg(ap, const char *)) && (val = va_arg(ap, const char *))) {
-               if (!(tmp = ast_realloc(params, (params_count + 1) * sizeof(char *)))) {
-                       ast_free(params);
-                       ast_free(vals);
-                       return 0;
-               }
-               params = tmp;
-
-               if (!(tmp = ast_realloc(vals, (params_count + 1) * sizeof(char *)))) {
-                       ast_free(params);
-                       ast_free(vals);
-                       return 0;
-               }
-               vals = tmp;
-
-               params[params_count] = param;
-               vals[params_count] = val;
-               params_count++;
-       }
-
-       if (params_count > 0) {
-               *params_ptr = params;
-               *vals_ptr = vals;
-       } else
-               ast_log(LOG_WARNING, "1 parameter and 1 value at least required\n");
-
-       return params_count;
-}
-
 static int add_rt_cfg_entry(void *arg, int argc, char **argv, char **columnNames)
 {
        struct rt_cfg_entry_args *args;
@@ -863,12 +981,11 @@ static int add_rt_cfg_entry(void *arg, int argc, char **argv, char **columnNames
        return 0;
 }
 
-static struct ast_variable * realtime_handler(const char *database, const char *table, va_list ap)
+static struct ast_variable * realtime_handler(const char *database, const char *table, const struct ast_variable *fields)
 {
-       char *query, *errormsg, *op, *tmp_str;
+       char *query, *errormsg = NULL, *op, *tmp_str;
        struct rt_cfg_entry_args args;
-       const char **params, **vals;
-       size_t params_count;
+       const struct ast_variable *field = fields;
        int error;
 
        if (!table) {
@@ -876,48 +993,36 @@ static struct ast_variable * realtime_handler(const char *database, const char *
                return NULL;
        }
 
-       params_count = get_params(ap, &params, &vals);
-
-       if (params_count == 0)
+       if (!fields) {
                return NULL;
+       }
 
-       op = (strchr(params[0], ' ') == NULL) ? " =" : "";
+       op = (strchr(field->name, ' ') == NULL) ? " =" : "";
 
 /* \cond DOXYGEN_CAN_PARSE_THIS */
 #undef QUERY
-#define QUERY "SELECT * FROM '%q' WHERE commented = 0 AND %q%s '%q'"
+#define QUERY "SELECT * FROM '%q' WHERE%s %q%s '%q'"
 /* \endcond */
 
-       query = sqlite_mprintf(QUERY, table, params[0], op, vals[0]);
+       query = sqlite_mprintf(QUERY, table, (config_table && !strcmp(config_table, table)) ? " commented = 0 AND" : "", field->name, op, field->value);
 
        if (!query) {
                ast_log(LOG_WARNING, "Unable to allocate SQL query\n");
-               ast_free(params);
-               ast_free(vals);
                return NULL;
        }
 
-       if (params_count > 1) {
-               size_t i;
-
-               for (i = 1; i < params_count; i++) {
-                       op = (strchr(params[i], ' ') == NULL) ? " =" : "";
-                       tmp_str = sqlite_mprintf("%s AND %q%s '%q'", query, params[i], op, vals[i]);
-                       sqlite_freemem(query);
-
-                       if (!tmp_str) {
-                               ast_log(LOG_WARNING, "Unable to reallocate SQL query\n");
-                               ast_free(params);
-                               ast_free(vals);
-                               return NULL;
-                       }
+       while ((field = field->next)) {
+               op = (strchr(field->name, ' ') == NULL) ? " =" : "";
+               tmp_str = sqlite_mprintf("%s AND %q%s '%q'", query, field->name, op, field->value);
+               sqlite_freemem(query);
 
-                       query = tmp_str;
+               if (!tmp_str) {
+                       ast_log(LOG_WARNING, "Unable to reallocate SQL query\n");
+                       return NULL;
                }
-       }
 
-       ast_free(params);
-       ast_free(vals);
+               query = tmp_str;
+       }
 
        tmp_str = sqlite_mprintf("%s LIMIT 1;", query);
        sqlite_freemem(query);
@@ -943,11 +1048,12 @@ static struct ast_variable * realtime_handler(const char *database, const char *
        sqlite_freemem(query);
 
        if (error) {
-               ast_log(LOG_WARNING, "%s\n", errormsg);
+               ast_log(LOG_WARNING, "%s\n", S_OR(errormsg, sqlite_error_string(error)));
                sqlite_freemem(errormsg);
                ast_variables_destroy(args.var);
                return NULL;
        }
+       sqlite_freemem(errormsg);
 
        return args.var;
 }
@@ -978,16 +1084,17 @@ static int add_rt_multi_cfg_entry(void *arg, int argc, char **argv, char **colum
                return 1;
        }
 
-       if (!(cat = ast_category_new(cat_name, "", 99999))) {
-               ast_log(LOG_WARNING, "Unable to allocate category\n");
+       cat = ast_category_new_dynamic(cat_name);
+       if (!cat) {
                return 1;
        }
 
        ast_category_append(args->cfg, cat);
 
        for (i = 0; i < argc; i++) {
-               if (!argv[i] || !strcmp(args->initfield, columnNames[i]))
+               if (!argv[i]) {
                        continue;
+               }
 
                if (!(var = ast_variable_new(columnNames[i], argv[i], ""))) {
                        ast_log(LOG_WARNING, "Unable to allocate variable\n");
@@ -1001,13 +1108,12 @@ static int add_rt_multi_cfg_entry(void *arg, int argc, char **argv, char **colum
 }
 
 static struct ast_config *realtime_multi_handler(const char *database,
-       const char *table, va_list ap)
+       const char *table, const struct ast_variable *fields)
 {
-       char *query, *errormsg, *op, *tmp_str, *initfield;
+       char *query, *errormsg = NULL, *op, *tmp_str, *initfield;
        struct rt_multi_cfg_entry_args args;
-       const char **params, **vals;
+       const struct ast_variable *field = fields;
        struct ast_config *cfg;
-       size_t params_count;
        int error;
 
        if (!table) {
@@ -1015,20 +1121,17 @@ static struct ast_config *realtime_multi_handler(const char *database,
                return NULL;
        }
 
-       if (!(cfg = ast_config_new())) {
-               ast_log(LOG_WARNING, "Unable to allocate configuration structure\n");
+       if (!fields) {
                return NULL;
        }
 
-       if (!(params_count = get_params(ap, &params, &vals))) {
-               ast_config_destroy(cfg);
+       if (!(cfg = ast_config_new())) {
+               ast_log(LOG_WARNING, "Unable to allocate configuration structure\n");
                return NULL;
        }
 
-       if (!(initfield = ast_strdup(params[0]))) {
+       if (!(initfield = ast_strdup(field->name))) {
                ast_config_destroy(cfg);
-               ast_free(params);
-               ast_free(vals);
                return NULL;
        }
 
@@ -1037,51 +1140,40 @@ static struct ast_config *realtime_multi_handler(const char *database,
        if (tmp_str)
                *tmp_str = '\0';
 
-       op = (!strchr(params[0], ' ')) ? " =" : "";
+       op = (!strchr(field->name, ' ')) ? " =" : "";
 
        /*
         * Asterisk sends us an already escaped string when searching for
         * "exten LIKE" (uh!). Handle it separately.
         */
-       tmp_str = (!strcmp(vals[0], "\\_%")) ? "_%" : (char *)vals[0];
+       tmp_str = (!strcmp(field->value, "\\_%")) ? "_%" : (char *)field->value;
 
 /* \cond DOXYGEN_CAN_PARSE_THIS */
 #undef QUERY
-#define QUERY "SELECT * FROM '%q' WHERE commented = 0 AND %q%s '%q'"
+#define QUERY "SELECT * FROM '%q' WHERE%s %q%s '%q'"
 /* \endcond */
 
-       if (!(query = sqlite_mprintf(QUERY, table, params[0], op, tmp_str))) {
+       if (!(query = sqlite_mprintf(QUERY, table, (config_table && !strcmp(config_table, table)) ? " commented = 0 AND" : "", field->name, op, tmp_str))) {
                ast_log(LOG_WARNING, "Unable to allocate SQL query\n");
                ast_config_destroy(cfg);
-               ast_free(params);
-               ast_free(vals);
                ast_free(initfield);
                return NULL;
        }
 
-       if (params_count > 1) {
-               size_t i;
-
-               for (i = 1; i < params_count; i++) {
-                       op = (!strchr(params[i], ' ')) ? " =" : "";
-                       tmp_str = sqlite_mprintf("%s AND %q%s '%q'", query, params[i], op, vals[i]);
-                       sqlite_freemem(query);
-
-                       if (!tmp_str) {
-                               ast_log(LOG_WARNING, "Unable to reallocate SQL query\n");
-                               ast_config_destroy(cfg);
-                               ast_free(params);
-                               ast_free(vals);
-                               ast_free(initfield);
-                               return NULL;
-                       }
+       while ((field = field->next)) {
+               op = (!strchr(field->name, ' ')) ? " =" : "";
+               tmp_str = sqlite_mprintf("%s AND %q%s '%q'", query, field->name, op, field->value);
+               sqlite_freemem(query);
 
-                       query = tmp_str;
+               if (!tmp_str) {
+                       ast_log(LOG_WARNING, "Unable to reallocate SQL query\n");
+                       ast_config_destroy(cfg);
+                       ast_free(initfield);
+                       return NULL;
                }
-       }
 
-       ast_free(params);
-       ast_free(vals);
+               query = tmp_str;
+       }
 
        if (!(tmp_str = sqlite_mprintf("%s ORDER BY %q;", query, initfield))) {
                ast_log(LOG_WARNING, "Unable to reallocate SQL query\n");
@@ -1109,21 +1201,21 @@ static struct ast_config *realtime_multi_handler(const char *database,
        ast_free(initfield);
 
        if (error) {
-               ast_log(LOG_WARNING, "%s\n", errormsg);
+               ast_log(LOG_WARNING, "%s\n", S_OR(errormsg, sqlite_error_string(error)));
                sqlite_freemem(errormsg);
                ast_config_destroy(cfg);
                return NULL;
        }
+       sqlite_freemem(errormsg);
 
        return cfg;
 }
 
 static int realtime_update_handler(const char *database, const char *table,
-       const char *keyfield, const char *entity, va_list ap)
+       const char *keyfield, const char *entity, const struct ast_variable *fields)
 {
-       char *query, *errormsg, *tmp_str;
-       const char **params, **vals;
-       size_t params_count;
+       char *query, *errormsg = NULL, *tmp_str;
+       const struct ast_variable *field = fields;
        int error, rows_num;
 
        if (!table) {
@@ -1131,41 +1223,31 @@ static int realtime_update_handler(const char *database, const char *table,
                return -1;
        }
 
-       if (!(params_count = get_params(ap, &params, &vals)))
+       if (!field) {
                return -1;
+       }
 
 /* \cond DOXYGEN_CAN_PARSE_THIS */
 #undef QUERY
 #define QUERY "UPDATE '%q' SET %q = '%q'"
 /* \endcond */
 
-       if (!(query = sqlite_mprintf(QUERY, table, params[0], vals[0]))) {
+       if (!(query = sqlite_mprintf(QUERY, table, field->name, field->value))) {
                ast_log(LOG_WARNING, "Unable to allocate SQL query\n");
-               ast_free(params);
-               ast_free(vals);
                return -1;
        }
 
-       if (params_count > 1) {
-               size_t i;
-
-               for (i = 1; i < params_count; i++) {
-                       tmp_str = sqlite_mprintf("%s, %q = '%q'", query, params[i], vals[i]);
-                       sqlite_freemem(query);
-
-                       if (!tmp_str) {
-                               ast_log(LOG_WARNING, "Unable to reallocate SQL query\n");
-                               ast_free(params);
-                               ast_free(vals);
-                               return -1;
-                       }
+       while ((field = field->next)) {
+               tmp_str = sqlite_mprintf("%s, %q = '%q'", query, field->name, field->value);
+               sqlite_freemem(query);
 
-                       query = tmp_str;
+               if (!tmp_str) {
+                       ast_log(LOG_WARNING, "Unable to reallocate SQL query\n");
+                       return -1;
                }
-       }
 
-       ast_free(params);
-       ast_free(vals);
+               query = tmp_str;
+       }
 
        if (!(tmp_str = sqlite_mprintf("%s WHERE %q = '%q';", query, keyfield, entity))) {
                ast_log(LOG_WARNING, "Unable to reallocate SQL query\n");
@@ -1193,70 +1275,134 @@ static int realtime_update_handler(const char *database, const char *table,
        sqlite_freemem(query);
 
        if (error) {
-               ast_log(LOG_WARNING, "%s\n", errormsg);
-               sqlite_freemem(errormsg);
+               ast_log(LOG_WARNING, "%s\n", S_OR(errormsg, sqlite_error_string(error)));
        }
+       sqlite_freemem(errormsg);
 
        return rows_num;
 }
 
-static int realtime_store_handler(const char *database, const char *table, va_list ap)
+static int realtime_update2_handler(const char *database, const char *table,
+       const struct ast_variable *lookup_fields, const struct ast_variable *update_fields)
 {
-       char *errormsg, *tmp_str, *tmp_keys = NULL, *tmp_keys2 = NULL, *tmp_vals = NULL, *tmp_vals2 = NULL;
-       const char **params, **vals;
-       size_t params_count;
+       char *errormsg = NULL, *tmp1, *tmp2;
+       int error, rows_num, first = 1;
+       struct ast_str *sql = ast_str_thread_get(&sql_buf, 100);
+       struct ast_str *where = ast_str_thread_get(&where_buf, 100);
+       const struct ast_variable *field;
+
+       if (!table) {
+               ast_log(LOG_WARNING, "Table name unspecified\n");
+               return -1;
+       }
+
+       if (!sql) {
+               return -1;
+       }
+
+       ast_str_set(&sql, 0, "UPDATE %s SET", table);
+       ast_str_set(&where, 0, " WHERE");
+
+       for (field = lookup_fields; field; field = field->next) {
+               ast_str_append(&where, 0, "%s %s = %s",
+                       first ? "" : " AND",
+                       tmp1 = sqlite_mprintf("%q", field->name),
+                       tmp2 = sqlite_mprintf("%Q", field->value));
+               sqlite_freemem(tmp1);
+               sqlite_freemem(tmp2);
+               first = 0;
+       }
+
+       if (first) {
+               ast_log(LOG_ERROR, "No criteria specified on update to '%s@%s'!\n", table, database);
+               return -1;
+       }
+
+       first = 1;
+       for (field = update_fields; field; field = field->next) {
+               ast_str_append(&sql, 0, "%s %s = %s",
+                       first ? "" : ",",
+                       tmp1 = sqlite_mprintf("%q", field->name),
+                       tmp2 = sqlite_mprintf("%Q", field->value));
+               sqlite_freemem(tmp1);
+               sqlite_freemem(tmp2);
+               first = 0;
+       }
+
+       ast_str_append(&sql, 0, " %s", ast_str_buffer(where));
+       ast_debug(1, "SQL query: %s\n", ast_str_buffer(sql));
+
+       ast_mutex_lock(&mutex);
+
+       RES_CONFIG_SQLITE_BEGIN
+               error = sqlite_exec(db, ast_str_buffer(sql), NULL, NULL, &errormsg);
+       RES_CONFIG_SQLITE_END(error)
+
+       if (!error) {
+               rows_num = sqlite_changes(db);
+       } else {
+               rows_num = -1;
+       }
+
+       ast_mutex_unlock(&mutex);
+
+       if (error) {
+               ast_log(LOG_WARNING, "%s\n", S_OR(errormsg, sqlite_error_string(error)));
+       }
+       sqlite_freemem(errormsg);
+
+       return rows_num;
+}
+
+static int realtime_store_handler(const char *database, const char *table, const struct ast_variable *fields)
+{
+       char *errormsg = NULL, *tmp_str, *tmp_keys = NULL, *tmp_keys2 = NULL, *tmp_vals = NULL, *tmp_vals2 = NULL;
+       const struct ast_variable *field = fields;
        int error, rows_id;
-       size_t i;
 
        if (!table) {
                ast_log(LOG_WARNING, "Table name unspecified\n");
                return -1;
        }
 
-       if (!(params_count = get_params(ap, &params, &vals)))
+       if (!fields) {
                return -1;
+       }
 
 /* \cond DOXYGEN_CAN_PARSE_THIS */
 #undef QUERY
 #define QUERY "INSERT into '%q' (%s) VALUES (%s);"
 /* \endcond */
 
-       for (i = 0; i < params_count; i++) {
+       do {
                if ( tmp_keys2 ) {
-                       tmp_keys = sqlite_mprintf("%s, %q", tmp_keys2, params[i]);
+                       tmp_keys = sqlite_mprintf("%s, %q", tmp_keys2, field->name);
                        sqlite_freemem(tmp_keys2);
                } else {
-                       tmp_keys = sqlite_mprintf("%q", params[i]);
+                       tmp_keys = sqlite_mprintf("%q", field->name);
                }
                if (!tmp_keys) {
                        ast_log(LOG_WARNING, "Unable to reallocate SQL query\n");
                        sqlite_freemem(tmp_vals);
-                       ast_free(params);
-                       ast_free(vals);
                        return -1;
                }
 
                if ( tmp_vals2 ) {
-                       tmp_vals = sqlite_mprintf("%s, '%q'", tmp_vals2, params[i]);
+                       tmp_vals = sqlite_mprintf("%s, '%q'", tmp_vals2, field->value);
                        sqlite_freemem(tmp_vals2);
                } else {
-                       tmp_vals = sqlite_mprintf("'%q'", params[i]);
+                       tmp_vals = sqlite_mprintf("'%q'", field->value);
                }
                if (!tmp_vals) {
                        ast_log(LOG_WARNING, "Unable to reallocate SQL query\n");
                        sqlite_freemem(tmp_keys);
-                       ast_free(params);
-                       ast_free(vals);
                        return -1;
                }
 
 
                tmp_keys2 = tmp_keys;
                tmp_vals2 = tmp_vals;
-       }
-
-       ast_free(params);
-       ast_free(vals);
+       } while ((field = field->next));
 
        if (!(tmp_str = sqlite_mprintf(QUERY, table, tmp_keys, tmp_vals))) {
                ast_log(LOG_WARNING, "Unable to reallocate SQL query\n");
@@ -1287,30 +1433,25 @@ static int realtime_store_handler(const char *database, const char *table, va_li
        sqlite_freemem(tmp_str);
 
        if (error) {
-               ast_log(LOG_WARNING, "%s\n", errormsg);
-               sqlite_freemem(errormsg);
+               ast_log(LOG_WARNING, "%s\n", S_OR(errormsg, sqlite_error_string(error)));
        }
+       sqlite_freemem(errormsg);
 
        return rows_id;
 }
 
 static int realtime_destroy_handler(const char *database, const char *table,
-       const char *keyfield, const char *entity, va_list ap)
+       const char *keyfield, const char *entity, const struct ast_variable *fields)
 {
-       char *query, *errormsg, *tmp_str;
-       const char **params, **vals;
-       size_t params_count;
+       char *query, *errormsg = NULL, *tmp_str;
+       const struct ast_variable *field;
        int error, rows_num;
-       size_t i;
 
        if (!table) {
                ast_log(LOG_WARNING, "Table name unspecified\n");
                return -1;
        }
 
-       if (!(params_count = get_params(ap, &params, &vals)))
-               return -1;
-
 /* \cond DOXYGEN_CAN_PARSE_THIS */
 #undef QUERY
 #define QUERY "DELETE FROM '%q' WHERE"
@@ -1318,27 +1459,21 @@ static int realtime_destroy_handler(const char *database, const char *table,
 
        if (!(query = sqlite_mprintf(QUERY, table))) {
                ast_log(LOG_WARNING, "Unable to allocate SQL query\n");
-               ast_free(params);
-               ast_free(vals);
                return -1;
        }
 
-       for (i = 0; i < params_count; i++) {
-               tmp_str = sqlite_mprintf("%s %q = '%q' AND", query, params[i], vals[i]);
+       for (field = fields; field; field = field->next) {
+               tmp_str = sqlite_mprintf("%s %q = '%q' AND", query, field->name, field->value);
                sqlite_freemem(query);
 
                if (!tmp_str) {
                        ast_log(LOG_WARNING, "Unable to reallocate SQL query\n");
-                       ast_free(params);
-                       ast_free(vals);
                        return -1;
                }
 
                query = tmp_str;
        }
 
-       ast_free(params);
-       ast_free(vals);
        if (!(tmp_str = sqlite_mprintf("%s %q = '%q';", query, keyfield, entity))) {
                ast_log(LOG_WARNING, "Unable to reallocate SQL query\n");
                sqlite_freemem(query);
@@ -1354,30 +1489,82 @@ static int realtime_destroy_handler(const char *database, const char *table,
                error = sqlite_exec(db, query, NULL, NULL, &errormsg);
        RES_CONFIG_SQLITE_END(error)
 
-       if (!error)
+       if (!error) {
                rows_num = sqlite_changes(db);
-       else
+       } else {
                rows_num = -1;
+       }
 
        ast_mutex_unlock(&mutex);
 
        sqlite_freemem(query);
 
        if (error) {
-               ast_log(LOG_WARNING, "%s\n", errormsg);
-               sqlite_freemem(errormsg);
+               ast_log(LOG_WARNING, "%s\n", S_OR(errormsg, sqlite_error_string(error)));
        }
+       sqlite_freemem(errormsg);
 
        return rows_num;
 }
 
+static int realtime_require_handler(const char *unused, const char *tablename, va_list ap)
+{
+       struct sqlite_cache_tables *tbl = find_table(tablename);
+       struct sqlite_cache_columns *col;
+       char *elm;
+       int type, res = 0;
+
+       if (!tbl) {
+               return -1;
+       }
+
+       while ((elm = va_arg(ap, char *))) {
+               type = va_arg(ap, require_type);
+               va_arg(ap, int);
+               /* Check if the field matches the criteria */
+               AST_RWLIST_TRAVERSE(&tbl->columns, col, list) {
+                       if (strcmp(col->name, elm) == 0) {
+                               /* SQLite only has two types - the 32-bit integer field that
+                                * is the key column, and everything else (everything else
+                                * being a string).
+                                */
+                               if (col->isint && !ast_rq_is_int(type)) {
+                                       ast_log(LOG_WARNING, "Realtime table %s: column '%s' is an integer field, but Asterisk requires that it not be!\n", tablename, col->name);
+                                       res = -1;
+                               }
+                               break;
+                       }
+               }
+               if (!col) {
+                       ast_log(LOG_WARNING, "Realtime table %s requires column '%s', but that column does not exist!\n", tablename, elm);
+               }
+       }
+       AST_RWLIST_UNLOCK(&(tbl->columns));
+       return res;
+}
+
+static int realtime_unload_handler(const char *unused, const char *tablename)
+{
+       struct sqlite_cache_tables *tbl;
+       AST_RWLIST_WRLOCK(&sqlite_tables);
+       AST_RWLIST_TRAVERSE_SAFE_BEGIN(&sqlite_tables, tbl, list) {
+               if (!strcasecmp(tbl->name, tablename)) {
+                       AST_RWLIST_REMOVE_CURRENT(list);
+                       free_table(tbl);
+               }
+       }
+       AST_RWLIST_TRAVERSE_SAFE_END
+       AST_RWLIST_UNLOCK(&sqlite_tables);
+       return 0;
+}
+
 static char *handle_cli_show_sqlite_status(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
        switch (cmd) {
        case CLI_INIT:
-               e->command = "show sqlite status";
+               e->command = "sqlite show status";
                e->usage =
-                       "Usage: show sqlite status\n"
+                       "Usage: sqlite show status\n"
                        "       Show status information about the SQLite 2 driver\n";
                return NULL;
        case CLI_GENERATE:
@@ -1405,13 +1592,53 @@ static char *handle_cli_show_sqlite_status(struct ast_cli_entry *e, int cmd, str
        return CLI_SUCCESS;
 }
 
+static char *handle_cli_sqlite_show_tables(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
+{
+       struct sqlite_cache_tables *tbl;
+       struct sqlite_cache_columns *col;
+       int found = 0;
+
+       switch (cmd) {
+       case CLI_INIT:
+               e->command = "sqlite show tables";
+               e->usage =
+                       "Usage: sqlite show tables\n"
+                       "       Show table information about the SQLite 2 driver\n";
+               return NULL;
+       case CLI_GENERATE:
+               return NULL;
+       }
+
+       if (a->argc != 3)
+               return CLI_SHOWUSAGE;
+
+       AST_RWLIST_RDLOCK(&sqlite_tables);
+       AST_RWLIST_TRAVERSE(&sqlite_tables, tbl, list) {
+               found++;
+               ast_cli(a->fd, "Table %s:\n", tbl->name);
+               AST_RWLIST_TRAVERSE(&(tbl->columns), col, list) {
+                       fprintf(stderr, "%s\n", col->name);
+                       ast_cli(a->fd, "  %20.20s  %-30.30s\n", col->name, col->type);
+               }
+       }
+       AST_RWLIST_UNLOCK(&sqlite_tables);
+
+       if (!found) {
+               ast_cli(a->fd, "No tables currently in cache\n");
+       }
+
+       return CLI_SUCCESS;
+}
+
 static int unload_module(void)
 {
-       if (cli_status_registered)
-               ast_cli_unregister_multiple(cli_status, sizeof(cli_status) / sizeof(struct ast_cli_entry));
+       if (cdr_registered && ast_cdr_unregister(RES_CONFIG_SQLITE_NAME)) {
+               return -1;
+       }
 
-       if (cdr_registered)
-               ast_cdr_unregister(RES_CONFIG_SQLITE_NAME);
+       if (cli_status_registered) {
+               ast_cli_unregister_multiple(cli_status, ARRAY_LEN(cli_status));
+       }
 
        ast_config_engine_deregister(&sqlite_engine);
 
@@ -1423,9 +1650,19 @@ static int unload_module(void)
        return 0;
 }
 
+/*!
+ * \brief Load the module
+ *
+ * Module loading including tests for configuration or dependencies.
+ * This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE,
+ * or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails
+ * tests return AST_MODULE_LOAD_FAILURE. If the module can not load the 
+ * configuration file or other non-critical problem return 
+ * AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS.
+ */
 static int load_module(void)
 {
-       char *errormsg;
+       char *errormsg = NULL;
        int error;
 
        db = NULL;
@@ -1440,12 +1677,14 @@ static int load_module(void)
                return AST_MODULE_LOAD_DECLINE;
 
        if (!(db = sqlite_open(dbfile, 0660, &errormsg))) {
-               ast_log(LOG_ERROR, "%s\n", errormsg);
+               ast_log(LOG_ERROR, "%s\n", S_OR(errormsg, sqlite_error_string(error)));
                sqlite_freemem(errormsg);
                unload_module();
-               return 1;
+               return AST_MODULE_LOAD_DECLINE;
        }
 
+       sqlite_freemem(errormsg);
+       errormsg = NULL;
        ast_config_engine_register(&sqlite_engine);
 
        if (use_cdr) {
@@ -1461,7 +1700,7 @@ static int load_module(void)
                if (!query) {
                        ast_log(LOG_ERROR, "Unable to allocate SQL query\n");
                        unload_module();
-                       return 1;
+                       return AST_MODULE_LOAD_DECLINE;
                }
 
                ast_debug(1, "SQL query: %s\n", query);
@@ -1477,19 +1716,20 @@ static int load_module(void)
                         * Unexpected error.
                         */
                        if (error != SQLITE_ERROR) {
-                               ast_log(LOG_ERROR, "%s\n", errormsg);
+                               ast_log(LOG_ERROR, "%s\n", S_OR(errormsg, sqlite_error_string(error)));
                                sqlite_freemem(errormsg);
                                unload_module();
-                               return 1;
+                               return AST_MODULE_LOAD_DECLINE;
                        }
 
                        sqlite_freemem(errormsg);
+                       errormsg = NULL;
                        query = sqlite_mprintf(sql_create_cdr_table, cdr_table);
 
                        if (!query) {
                                ast_log(LOG_ERROR, "Unable to allocate SQL query\n");
                                unload_module();
-                               return 1;
+                               return AST_MODULE_LOAD_DECLINE;
                        }
 
                        ast_debug(1, "SQL query: %s\n", query);
@@ -1501,36 +1741,40 @@ static int load_module(void)
                        sqlite_freemem(query);
 
                        if (error) {
-                               ast_log(LOG_ERROR, "%s\n", errormsg);
+                               ast_log(LOG_ERROR, "%s\n", S_OR(errormsg, sqlite_error_string(error)));
                                sqlite_freemem(errormsg);
                                unload_module();
-                               return 1;
+                               return AST_MODULE_LOAD_DECLINE;
                        }
                }
+               sqlite_freemem(errormsg);
+               errormsg = NULL;
 
                error = ast_cdr_register(RES_CONFIG_SQLITE_NAME, RES_CONFIG_SQLITE_DESCRIPTION, cdr_handler);
 
                if (error) {
                        unload_module();
-                       return 1;
+                       return AST_MODULE_LOAD_DECLINE;
                }
 
                cdr_registered = 1;
        }
 
-       error = ast_cli_register_multiple(cli_status, sizeof(cli_status) / sizeof(struct ast_cli_entry));
+       error = ast_cli_register_multiple(cli_status, ARRAY_LEN(cli_status));
 
        if (error) {
                unload_module();
-               return 1;
+               return AST_MODULE_LOAD_DECLINE;
        }
 
        cli_status_registered = 1;
 
-       return 0;
+       return AST_MODULE_LOAD_SUCCESS;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Realtime SQLite configuration",
-               .load = load_module,
-               .unload = unload_module,
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Realtime SQLite configuration",
+       .support_level = AST_MODULE_SUPPORT_EXTENDED,
+       .load = load_module,
+       .unload = unload_module,
+       .load_pri = AST_MODPRI_REALTIME_DRIVER,
 );