- Check for NULL before checking whether argument is an array.

	- Removed stray character from string quoting.
	- Fixed check to report missing varchar pointer implementation.

diff --git a/src/interfaces/ecpg/ecpglib/data.c b/src/interfaces/ecpg/ecpglib/data.c
index 25738796fb2e939ce5ea05a1f928ede2b9421366..b1719ab38d311e20d66ded3c0d9af355e858dc1a 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/data.c
+++ b/src/interfaces/ecpg/ecpglib/data.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/data.c,v 1.27 2004/08/29 05:06:59 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/data.c,v 1.27.4.1 2005/08/24 10:35:12 meskes Exp $ */
 
 #define POSTGRES_ECPG_INTERNAL
 #include "postgres_fe.h"
@@ -50,29 +50,6 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 
    ECPGlog("ECPGget_data line %d: RESULT: %s offset: %ld array: %s\n", lineno, pval ? pval : "", offset, isarray ? "Yes" : "No");
 
-   /* pval is a pointer to the value */
-   /* let's check if it really is an array if it should be one */
-   if (isarray == ECPG_ARRAY_ARRAY)
-   {
-       if (*pval != '{')
-       {
-           ECPGraise(lineno, ECPG_DATA_NOT_ARRAY, ECPG_SQLSTATE_DATATYPE_MISMATCH, NULL);
-           return (false);
-       }
-
-       switch (type)
-       {
-           case ECPGt_char:
-           case ECPGt_unsigned_char:
-           case ECPGt_varchar:
-               break;
-
-           default:
-               pval++;
-               break;
-       }
-   }
-
    /* We will have to decode the value */
 
    /*
@@ -129,6 +106,29 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
    if (value_for_indicator == -1)
        return (true);
 
+   /* pval is a pointer to the value */
+   /* let's check if it really is an array if it should be one */
+   if (isarray == ECPG_ARRAY_ARRAY)
+   {
+       if (*pval != '{')
+       {
+           ECPGraise(lineno, ECPG_DATA_NOT_ARRAY, ECPG_SQLSTATE_DATATYPE_MISMATCH, NULL);
+           return (false);
+       }
+
+       switch (type)
+       {
+           case ECPGt_char:
+           case ECPGt_unsigned_char:
+           case ECPGt_varchar:
+               break;
+
+           default:
+               pval++;
+               break;
+       }
+   }
+
    do
    {
        switch (type)

diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
index c2b4d43ad5b4b383317e459eda9973362374fbbd..4b9b84e839fcb7f0e61feb9fb6b63249e7a49169 100644 (file)
--- a/src/interfaces/ecpg/preproc/preproc.y
+++ b/src/interfaces/ecpg/preproc/preproc.y
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.303.4.3 2005/02/10 08:07:46 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.303.4.4 2005/08/24 10:35:12 meskes Exp $ */
 
 /* Copyright comment */
 %{
@@ -5142,7 +5142,8 @@ variable: opt_pointer ECPGColLabel opt_array_bounds opt_initializer
                            *dim = '\0';
                    else    
                            sprintf(dim, "[%s]", dimension);
-                   if (strcmp(length, "0") == 0)
+                   /* if (strcmp(length, "0") == 0)*/
+                   if (atoi(length) <= 0)
                        mmerror(PARSE_ERROR, ET_ERROR, "pointer to varchar are not implemented");
 
                    if (strcmp(dimension, "0") == 0)