Sapian
/
asterisk
mirror of http://gerrit.asterisk.org/asterisk
3
0
Fork 0
Code Issues Releases Wiki Activity

Quote column names when inserting CDRs into postgres to avoid conflicts

Browse Source 
with reserved words.

(closes issue #12947)
Reported by: panolex


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@126274 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.1
Sean Bright 17 years ago
parent 19830f3359
commit 044a7b945f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
cdr/cdr_pgsql.c
Unescape View File

@ -146,8 +146,8 @@ static int pgsql_log(struct ast_cdr *cdr)
if (!value) { if (!value) {
if (cur->notnull && !cur->hasdefault) { if (cur->notnull && !cur->hasdefault) {
/* Field is NOT NULL (but no default), must include it anyway */ /* Field is NOT NULL (but no default), must include it anyway */
LENGTHEN_BUF1(strlen(cur->name)); LENGTHEN_BUF1(strlen(cur->name) + 2);
lensql += snprintf(sql + lensql, sizesql - lensql, "%s,", cur->name); lensql += snprintf(sql + lensql, sizesql - lensql, "\"%s\",", cur->name);
LENGTHEN_BUF2(3); LENGTHEN_BUF2(3);
strcat(sql2, "'',"); strcat(sql2, "'',");
lensql2 += 3; lensql2 += 3;
@ -155,8 +155,8 @@ static int pgsql_log(struct ast_cdr *cdr)
continue; continue;
} }
LENGTHEN_BUF1(strlen(cur->name)); LENGTHEN_BUF1(strlen(cur->name) + 2);
lensql += snprintf(sql + lensql, sizesql - lensql, "%s,", cur->name); lensql += snprintf(sql + lensql, sizesql - lensql, "\"%s\",", cur->name);
if (strcmp(cur->name, "start") == 0 || strcmp(cur->name, "calldate") == 0) { if (strcmp(cur->name, "start") == 0 || strcmp(cur->name, "calldate") == 0) {
if (strncmp(cur->type, "int", 3) == 0) { if (strncmp(cur->type, "int", 3) == 0) {

Write Preview
Loading…
Cancel
Save