kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 18:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 164349 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@164355 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-12-15 18:27:28 +00:00
parent d303ab8bee
commit 59a6c8021f
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cdr/cdr_pgsql.c
View File

@@ -476,12 +476,20 @@ static int config_module(int reload)
if (PQstatus(conn) != CONNECTION_BAD) { if (PQstatus(conn) != CONNECTION_BAD) {
char sqlcmd[512]; char sqlcmd[512];
char *fname, *ftype, *flen, *fnotnull, *fdef; char *fname, *ftype, *flen, *fnotnull, *fdef;
char *tableptr;
int i, rows; int i, rows;
ast_debug(1, "Successfully connected to PostgreSQL database.\n"); ast_debug(1, "Successfully connected to PostgreSQL database.\n");
connected = 1; connected = 1;
/* Remove any schema name from the table */
if ((tableptr = strrchr(table, '.'))) {
tableptr++;
} else {
tableptr = table;
}
/* Query the columns */ /* 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); result = PQexec(conn, sqlcmd);
if (PQresultStatus(result) != PGRES_TUPLES_OK) { if (PQresultStatus(result) != PGRES_TUPLES_OK) {
pgerror = PQresultErrorMessage(result); pgerror = PQresultErrorMessage(result);