Skip to content
Snippets Groups Projects
Commit 044a7b94 authored by Sean Bright's avatar Sean Bright
Browse files

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/trunk@126274 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 19830f33
Branches
Tags
No related merge requests found
...@@ -146,8 +146,8 @@ static int pgsql_log(struct ast_cdr *cdr) ...@@ -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) ...@@ -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) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment