From ea34816880066c82e382fdd09db920cb30e0162e Mon Sep 17 00:00:00 2001 From: tilghman Date: Mon, 15 Dec 2008 18:26:46 +0000 Subject: Merged revisions 164349 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r164349 | tilghman | 2008-12-15 12:09:58 -0600 (Mon, 15 Dec 2008) | 4 lines When querying for the structure of the CDR table, remove the schema, if it exists. (Closes issue #14058) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@164354 f38db490-d61c-443f-a65b-d21fe96a405b --- cdr/cdr_pgsql.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'cdr') diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c index af191b778..11823406e 100644 --- a/cdr/cdr_pgsql.c +++ b/cdr/cdr_pgsql.c @@ -475,12 +475,20 @@ static int config_module(int reload) if (PQstatus(conn) != CONNECTION_BAD) { char sqlcmd[512]; char *fname, *ftype, *flen, *fnotnull, *fdef; + char *tableptr; int i, rows; ast_debug(1, "Successfully connected to PostgreSQL database.\n"); connected = 1; + /* Remove any schema name from the table */ + if ((tableptr = strrchr(table, '.'))) { + tableptr++; + } else { + tableptr = table; + } + /* Query the columns */ - snprintf(sqlcmd, sizeof(sqlcmd), "select a.attname, t.typname, a.attlen, a.attnotnull, d.adsrc from pg_class c, pg_type t, pg_attribute a left outer join pg_attrdef d on a.atthasdef and d.adrelid = a.attrelid and d.adnum = a.attnum where c.oid = a.attrelid and a.atttypid = t.oid and (a.attnum > 0) and c.relname = '%s' order by c.relname, attnum", table); + snprintf(sqlcmd, sizeof(sqlcmd), "select a.attname, t.typname, a.attlen, a.attnotnull, d.adsrc from pg_class c, pg_type t, pg_attribute a left outer join pg_attrdef d on a.atthasdef and d.adrelid = a.attrelid and d.adnum = a.attnum where c.oid = a.attrelid and a.atttypid = t.oid and (a.attnum > 0) and c.relname = '%s' order by c.relname, attnum", tableptr); result = PQexec(conn, sqlcmd); if (PQresultStatus(result) != PGRES_TUPLES_OK) { pgerror = PQresultErrorMessage(result); -- cgit v1.2.3