Merged revisions 126274 via svnmerge from

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

........
r126274 | seanbright | 2008-06-29 08:06:46 -0400 (Sun, 29 Jun 2008) | 6 lines

Quote column names when inserting CDRs into postgres to avoid conflicts
with reserved words.

(closes issue #12947)
Reported by: panolex

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@126275 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-06-29 12:07:31 +00:00
parent 8b7210c2ee
commit 18af01717e

View File

@@ -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) {