When creating a varchar struct name braces must be discarded.

diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index 3d8d6ab25f6e5da8c48465177aa72dadbeaa80aa..939b2e5914b8b1babc1c235be356df7597fd34d8 100644 (file)
--- a/src/interfaces/ecpg/ChangeLog
+++ b/src/interfaces/ecpg/ChangeLog
@@ -2390,6 +2390,10 @@ Tue, 14 Oct 2008 11:25:51 +0200
 Sat, 25 Oct 2008 16:34:28 +0200
 
        - Free allocated memory even if the next alloc failed with ENOMEM.
+
+Wed, 26 Nov 2008 14:09:08 +0100
+
+       - When creating a varchar struct name braces must be discarded.
        - Set pgtypes library version to 3.1.
        - Set compat library version to 3.1.
        - Set ecpg library version to 6.2.

diff --git a/src/interfaces/ecpg/preproc/type.c b/src/interfaces/ecpg/preproc/type.c
index facf3a510058cc113558099c291fbeb5b8920b57..bea5a88e79c5aff067bc80a099f2681c4c7aa6b3 100644 (file)
--- a/src/interfaces/ecpg/preproc/type.c
+++ b/src/interfaces/ecpg/preproc/type.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/type.c,v 1.79 2008/05/16 15:20:04 petere Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/type.c,v 1.80 2008/11/26 13:18:22 meskes Exp $ */
 
 #include "postgres_fe.h"
 
@@ -327,8 +327,9 @@ ECPGdump_a_simple(FILE *o, const char *name, enum ECPGttype type,
                fprintf(o, "\n\tECPGt_descriptor, %s, 0L, 0L, 0L, ", name);
        else
        {
-               char       *variable = (char *) mm_alloc(strlen(name) + ((prefix == NULL) ? 0 : strlen(prefix)) + 4);
-               char       *offset = (char *) mm_alloc(strlen(name) + strlen("sizeof(struct varchar_)") + 1 + strlen(varcharsize) + sizeof(int) * CHAR_BIT * 10 / 3);
+               char *variable = (char *) mm_alloc(strlen(name) + ((prefix == NULL) ? 0 : strlen(prefix)) + 4);
+               char *offset = (char *) mm_alloc(strlen(name) + strlen("sizeof(struct varchar_)") + 1 + strlen(varcharsize) + sizeof(int) * CHAR_BIT * 10 / 3);
+               char *var_name; 
 
                switch (type)
                {
@@ -350,10 +351,14 @@ ECPGdump_a_simple(FILE *o, const char *name, enum ECPGttype type,
                                else
                                        sprintf(variable, "&(%s%s)", prefix ? prefix : "", name);
 
+                               /* remove trailing [] is name is array element */
+                               var_name = strdup(name);
+                               *(strchrnul(var_name, '[')) = '\0';
                                if (lineno)
-                                       sprintf(offset, "sizeof(struct varchar_%s_%d)", name, lineno);
+                                       sprintf(offset, "sizeof(struct varchar_%s_%d)", var_name, lineno);
                                else
-                                       sprintf(offset, "sizeof(struct varchar_%s)", name);
+                                       sprintf(offset, "sizeof(struct varchar_%s)", var_name);
+                               free(var_name);
                                break;
                        case ECPGt_char:
                        case ECPGt_unsigned_char: