From e4e30b0abe203f790609026d6da0eedbb548b304 Mon Sep 17 00:00:00 2001 From: seanbright Date: Sun, 29 Jun 2008 12:06:46 +0000 Subject: Quote column names when inserting CDRs into postgres to avoid conflicts with reserved words. (closes issue #12947) Reported by: panolex git-svn-id: http://svn.digium.com/svn/asterisk/trunk@126274 f38db490-d61c-443f-a65b-d21fe96a405b --- cdr/cdr_pgsql.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c index ffc520358..e4d9b692c 100644 --- a/cdr/cdr_pgsql.c +++ b/cdr/cdr_pgsql.c @@ -146,8 +146,8 @@ static int pgsql_log(struct ast_cdr *cdr) if (!value) { if (cur->notnull && !cur->hasdefault) { /* Field is NOT NULL (but no default), must include it anyway */ - LENGTHEN_BUF1(strlen(cur->name)); - lensql += snprintf(sql + lensql, sizesql - lensql, "%s,", cur->name); + LENGTHEN_BUF1(strlen(cur->name) + 2); + lensql += snprintf(sql + lensql, sizesql - lensql, "\"%s\",", cur->name); LENGTHEN_BUF2(3); strcat(sql2, "'',"); lensql2 += 3; @@ -155,8 +155,8 @@ static int pgsql_log(struct ast_cdr *cdr) continue; } - LENGTHEN_BUF1(strlen(cur->name)); - lensql += snprintf(sql + lensql, sizesql - lensql, "%s,", cur->name); + LENGTHEN_BUF1(strlen(cur->name) + 2); + lensql += snprintf(sql + lensql, sizesql - lensql, "\"%s\",", cur->name); if (strcmp(cur->name, "start") == 0 || strcmp(cur->name, "calldate") == 0) { if (strncmp(cur->type, "int", 3) == 0) { -- cgit v1.2.3