Merged revisions 275626 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r275626 | lmadsen | 2010-07-12 10:37:01 -0500 (Mon, 12 Jul 2010) | 11 lines

  cdr_pgsql does not detect when a table is found.

  This change adds an ERROR message to let you know when a failure exists to
  get the columns from the pgsql database, which typically means that the
  table does not exist.

  (closes issue #17478)
  Reported by: kobaz
  Patches:
        cdr_pgsql.patch uploaded by kobaz (license 834)
  Tested by: kobaz, russell, lmadsen
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@275627 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c
index bca0f863db0798b5b868a0dd410df4245be15e46..dc9b188cf205ae11fcab30345f6da31ab7d79345 100644 (file)
--- a/cdr/cdr_pgsql.c
+++ b/cdr/cdr_pgsql.c
@@ -529,6 +529,13 @@ static int config_module(int reload)
                }
 
                rows = PQntuples(result);
+               if (rows == 0) {
+                       ast_log(LOG_ERROR, "cdr_pgsql: Failed to query database columns. No columns found, does the table exist?\n");
+                       PQclear(result);
+                       unload_module();
+                       return AST_MODULE_LOAD_DECLINE;
+               }
+
                for (i = 0; i < rows; i++) {
                        fname = PQgetvalue(result, i, 0);
                        ftype = PQgetvalue(result, i, 1);