[asterisk-commits] seanbright: branch 1.6.0 r126275 - in /branches/1.6.0: ./ cdr/cdr_pgsql.c

[SVN commits to the Asterisk project]

Author: seanbright
Date: Sun Jun 29 07:07:31 2008
New Revision: 126275

URL: http://svn.digium.com/view/asterisk?view=rev&rev=126275
Log:
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

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/cdr/cdr_pgsql.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/cdr/cdr_pgsql.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/cdr/cdr_pgsql.c?view=diff&rev=126275&r1=126274&r2=126275
==============================================================================
--- branches/1.6.0/cdr/cdr_pgsql.c (original)
+++ branches/1.6.0/cdr/cdr_pgsql.c Sun Jun 29 07:07:31 2008
@@ -146,8 +146,8 @@
 			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 @@
 				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) {