Made parser check for valid copy to/from stdin/stdout combinations.

Lots of small changes in regression test suite

src/interfaces/ecpg/ChangeLog

@@ -2072,5 +2072,9 @@ Fr Aug  4 10:44:30 CEST 2006
 Mo Aug  7 14:56:44 CEST 2006
 
 	- Joachim fixed some bugs in numeric handling in pgtypeslib.
+
+Tu Aug  8 13:26:25 CEST 2006
+
+	- Made parser check for valid copy to/from stdin/stdout combinations.
 	- Set ecpg library version to 5.2.
 	- Set ecpg version to 4.2.1.

src/interfaces/ecpg/ecpglib/data.c

@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/data.c,v 1.32 2006/06/21 10:24:40 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/data.c,v 1.33 2006/08/08 11:51:24 meskes Exp $ */
 
 #define POSTGRES_ECPG_INTERNAL
 #include "postgres_fe.h"
@@ -16,6 +16,8 @@
 #include "pgtypes_timestamp.h"
 #include "pgtypes_interval.h"
 
+static enum { NOT_CHECKED, REGRESS, NORMAL } ECPG_regression_mode = NOT_CHECKED;
+
 static bool
 garbage_left(enum ARRAY_TYPE isarray, char *scan_length, enum COMPAT_MODE compat)
 {
@@ -49,8 +51,32 @@ ECPGget_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 	int	binary = PQfformat(results, act_field);
 	int 	size = PQgetlength(results, act_tuple, act_field);
 	int	value_for_indicator = 0;
+	long	log_offset;
+
+	/*
+	 * use a global variable to see if the environment variable
+	 * ECPG_REGRESSION is set or not. Remember the state in order to avoid
+	 * subsequent calls to getenv() for this purpose.
+	 */
+	if (ECPG_regression_mode == NOT_CHECKED)
+	{
+		if (getenv("ECPG_REGRESSION"))
+			ECPG_regression_mode = REGRESS;
+		else 
+			ECPG_regression_mode = NORMAL;
+	}
+
+	/*
+	 * If we are running in a regression test, do not log the offset
+	 * variable, it depends on the machine's alignment.
+	 */
+	if (ECPG_regression_mode == REGRESS)
+		log_offset = -1;
+	else
+		log_offset = offset;
+
+	ECPGlog("ECPGget_data line %d: RESULT: %s offset: %ld array: %s\n", lineno, pval ? (binary ? "BINARY" : pval) : "EMPTY", log_offset, isarray ? "Yes" : "No");
 
-	ECPGlog("ECPGget_data line %d: RESULT: %s offset: %ld array: %s\n", lineno, pval ? (binary ? "BINARY" : pval) : "EMPTY", offset, isarray ? "Yes" : "No");
 	/* We will have to decode the value */
 
 	/*

src/interfaces/ecpg/ecpglib/misc.c

@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.29 2006/07/31 13:26:46 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/misc.c,v 1.30 2006/08/08 11:51:24 meskes Exp $ */
 
 #define POSTGRES_ECPG_INTERNAL
 #include "postgres_fe.h"
@@ -262,7 +262,7 @@ ECPGlog(const char *format,...)
 		 * regression tests set this environment variable to get the same
 		 * output for every run.
 		 */
-		if (getenv("ECPG_DONT_LOG_PID"))
+		if (getenv("ECPG_REGRESSION"))
 			snprintf(f, bufsize, "[NO_PID]: %s", format);
 		else
 			snprintf(f, bufsize, "[%d]: %s", (int) getpid(), format);
@@ -272,7 +272,7 @@ ECPGlog(const char *format,...)
 		va_end(ap);
 
 		/* dump out internal sqlca variables */
-		if (getenv("ECPG_DONT_LOG_PID"))
+		if (getenv("ECPG_REGRESSION"))
 			fprintf(debugstream, "[NO_PID]: sqlca: code: %ld, state: %s\n",
 					sqlca->sqlcode, sqlca->sqlstate);
 

src/interfaces/ecpg/preproc/preproc.y

@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.327 2006/08/02 13:43:23 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.328 2006/08/08 11:51:24 meskes Exp $ */
 
 /* Copyright comment */
 %{
@@ -1379,19 +1379,23 @@ ClosePortalStmt:  CLOSE name
 
 CopyStmt:  COPY opt_binary qualified_name opt_oids copy_from
 		copy_file_name copy_delimiter opt_with copy_opt_list
-			{ $$ = cat_str(9, make_str("copy"), $2, $3, $4, $5, $6, $7, $8, $9); }
+			{
+				if (strcmp($5, "to") == 0 && strcmp($6, "stdin") == 0)
+					mmerror(PARSE_ERROR, ET_ERROR, "copy to stdin not possible.\n");
+				else if (strcmp($5, "from") == 0 && strcmp($6, "stdout") == 0)
+					mmerror(PARSE_ERROR, ET_ERROR, "copy from stdout not possible.\n");
+				else if (strcmp($5, "from") == 0 && strcmp($6, "stdin") == 0)
+					mmerror(PARSE_ERROR, ET_WARNING, "copy from stdin not implemented.\n");
+				
+				$$ = cat_str(9, make_str("copy"), $2, $3, $4, $5, $6, $7, $8, $9);
+			}
 		;
 
 copy_from:	TO					{ $$ = make_str("to"); }
 		| FROM					{ $$ = make_str("from"); }
 		;
 
-/*
+copy_file_name:  StringConst				{ $$ = $1; }
- * copy_file_name NULL indicates stdio is used. Whether stdin or stdout is
- * used depends on the direction. (It really doesn't make sense to copy from
- * stdout. We silently correct the "typo".		 - AY 9/94
- */
-copy_file_name:  StringConst	{ $$ = $1; }
 		| STDIN					{ $$ = make_str("stdin"); }
 		| STDOUT				{ $$ = make_str("stdout"); }
 		;

src/interfaces/ecpg/test/errors/init.pgc

@@ -69,7 +69,6 @@ int main(void)
 		int c=10>>2;
 		bool h=2||1; 
 		long iay /* = 1L */ ;
-		long long iax /* = 40000000000LL */ ;
 	exec sql end declare section;
 
 	int f=fa();
@@ -83,8 +82,8 @@ int main(void)
 	ECPGdebug(1, stderr);
 
 	printf("%d %d %d %d %d %d %d %d %d %d %d\n", a, b, b2, c, d, e, f, g, h, i, j);
-	iax = iay = 0;
+	iay = 0;
-	printf("%ld %lld\n", iay, iax);
+	printf("%ld\n", iay);
 	exec sql whenever sqlerror do fa();
 	exec sql select now();
 	exec sql whenever sqlerror do fb(20);

src/interfaces/ecpg/test/expected/compat_informix-test_informix.stderr

@@ -46,17 +46,17 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 54: Correctly got 1 tuples with 2 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 54: RESULT: 7 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 54: RESULT: 7 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 54: RESULT: 0 offset: 52 array: Yes
+[NO_PID]: ECPGget_data line 54: RESULT: 0 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 54: QUERY: fetch forward from c on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 54: Correctly got 1 tuples with 2 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 54: RESULT: 14 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 54: RESULT: 14 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 54: RESULT: 1 offset: 52 array: Yes
+[NO_PID]: ECPGget_data line 54: RESULT: 1 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 54: QUERY: fetch forward from c on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/compat_informix-test_informix2.stderr

@@ -14,15 +14,15 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 78: Correctly got 1 tuples with 1 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 78: RESULT: Wed May 07 13:28:34 2003 offset: 8 array: Yes
+[NO_PID]: ECPGget_data line 78: RESULT: Wed May 07 13:28:34 2003 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 89: QUERY: select  customerid , timestamp  from history where timestamp =  timestamp '2003-05-07 13:28:34'    limit 1  on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 89: Correctly got 1 tuples with 2 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 89: RESULT: 1 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 89: RESULT: 1 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 89: RESULT: Wed May 07 13:28:34 2003 offset: 8 array: Yes
+[NO_PID]: ECPGget_data line 89: RESULT: Wed May 07 13:28:34 2003 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 103: QUERY: insert into history ( customerid  , timestamp  , action_taken  , narrative  ) values(  2 ,  timestamp '2003-05-08 15:53:39' , 'test' , 'test' ) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/complex-test1.stderr

@@ -48,29 +48,29 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 118: Correctly got 4 tuples with 3 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 118: RESULT: db: 'r1' offset: 8 array: Yes
+[NO_PID]: ECPGget_data line 118: RESULT: db: 'r1' offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 118: RESULT: db: 'r1' offset: 8 array: Yes
+[NO_PID]: ECPGget_data line 118: RESULT: db: 'r1' offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 118: RESULT: db: 'r1' offset: 8 array: Yes
+[NO_PID]: ECPGget_data line 118: RESULT: db: 'r1' offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 118: RESULT: db: 'r1' offset: 8 array: Yes
+[NO_PID]: ECPGget_data line 118: RESULT: db: 'r1' offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 118: RESULT: 1 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 118: RESULT: 1 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 118: RESULT: 2 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 118: RESULT: 2 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 118: RESULT: 11 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 118: RESULT: 11 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 118: RESULT: 12 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 118: RESULT: 12 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 118: RESULT: f offset: 1 array: Yes
+[NO_PID]: ECPGget_data line 118: RESULT: f offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 118: RESULT: t offset: 1 array: Yes
+[NO_PID]: ECPGget_data line 118: RESULT: t offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 118: RESULT: f offset: 1 array: Yes
+[NO_PID]: ECPGget_data line 118: RESULT: f offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 118: RESULT: t offset: 1 array: Yes
+[NO_PID]: ECPGget_data line 118: RESULT: t offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 133: QUERY: insert into "Test" ( name  , amount  , letter  ) values(  'db: ''r1''' ,  1001 ,  'f' ) on connection pm
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -100,29 +100,29 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 148: Correctly got 4 tuples with 3 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 148: RESULT: db: 'r1' offset: 8 array: Yes
+[NO_PID]: ECPGget_data line 148: RESULT: db: 'r1' offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 148: RESULT: db: 'r1' offset: 8 array: Yes
+[NO_PID]: ECPGget_data line 148: RESULT: db: 'r1' offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 148: RESULT: db: 'r1' offset: 8 array: Yes
+[NO_PID]: ECPGget_data line 148: RESULT: db: 'r1' offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 148: RESULT: db: 'r1' offset: 8 array: Yes
+[NO_PID]: ECPGget_data line 148: RESULT: db: 'r1' offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 148: RESULT: 1 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 148: RESULT: 1 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 148: RESULT: 2 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 148: RESULT: 2 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 148: RESULT: 11 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 148: RESULT: 11 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 148: RESULT: 12 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 148: RESULT: 12 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 148: RESULT: f offset: 1 array: Yes
+[NO_PID]: ECPGget_data line 148: RESULT: f offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 148: RESULT: t offset: 1 array: Yes
+[NO_PID]: ECPGget_data line 148: RESULT: t offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 148: RESULT: f offset: 1 array: Yes
+[NO_PID]: ECPGget_data line 148: RESULT: f offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 148: RESULT: t offset: 1 array: Yes
+[NO_PID]: ECPGget_data line 148: RESULT: t offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 162: QUERY: close CUR on connection main
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -132,41 +132,41 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 165: Correctly got 6 tuples with 3 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 165: RESULT: db: 'pm' offset: 8 array: Yes
+[NO_PID]: ECPGget_data line 165: RESULT: db: 'pm' offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 165: RESULT: db: 'pm' offset: 8 array: Yes
+[NO_PID]: ECPGget_data line 165: RESULT: db: 'pm' offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 165: RESULT: db: 'r1' offset: 8 array: Yes
+[NO_PID]: ECPGget_data line 165: RESULT: db: 'r1' offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 165: RESULT: db: 'r1' offset: 8 array: Yes
+[NO_PID]: ECPGget_data line 165: RESULT: db: 'r1' offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 165: RESULT: db: 'r1' offset: 8 array: Yes
+[NO_PID]: ECPGget_data line 165: RESULT: db: 'r1' offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 165: RESULT: db: 'r1' offset: 8 array: Yes
+[NO_PID]: ECPGget_data line 165: RESULT: db: 'r1' offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 165: RESULT: 1 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 165: RESULT: 1 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 165: RESULT: 101 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 165: RESULT: 101 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 165: RESULT: 1001 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 165: RESULT: 1001 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 165: RESULT: 1002 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 165: RESULT: 1002 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 165: RESULT: 1011 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 165: RESULT: 1011 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 165: RESULT: 1012 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 165: RESULT: 1012 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 165: RESULT: f offset: 1 array: Yes
+[NO_PID]: ECPGget_data line 165: RESULT: f offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 165: RESULT: f offset: 1 array: Yes
+[NO_PID]: ECPGget_data line 165: RESULT: f offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 165: RESULT: f offset: 1 array: Yes
+[NO_PID]: ECPGget_data line 165: RESULT: f offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 165: RESULT: t offset: 1 array: Yes
+[NO_PID]: ECPGget_data line 165: RESULT: t offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 165: RESULT: f offset: 1 array: Yes
+[NO_PID]: ECPGget_data line 165: RESULT: f offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 165: RESULT: t offset: 1 array: Yes
+[NO_PID]: ECPGget_data line 165: RESULT: t offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGtrans line 172 action = commit connection = main
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -174,41 +174,41 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 175: Correctly got 6 tuples with 3 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 175: RESULT: db: 'pm' offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 175: RESULT: db: 'pm' offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 175: RESULT: db: 'pm' offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 175: RESULT: db: 'pm' offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 175: RESULT: db: 'r1' offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 175: RESULT: db: 'r1' offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 175: RESULT: db: 'r1' offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 175: RESULT: db: 'r1' offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 175: RESULT: db: 'r1' offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 175: RESULT: db: 'r1' offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 175: RESULT: db: 'r1' offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 175: RESULT: db: 'r1' offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 175: RESULT: 1 offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 175: RESULT: 1 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 175: RESULT: 101 offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 175: RESULT: 101 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 175: RESULT: 1001 offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 175: RESULT: 1001 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 175: RESULT: 1002 offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 175: RESULT: 1002 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 175: RESULT: 1011 offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 175: RESULT: 1011 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 175: RESULT: 1012 offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 175: RESULT: 1012 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 175: RESULT: f offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 175: RESULT: f offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 175: RESULT: f offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 175: RESULT: f offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 175: RESULT: f offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 175: RESULT: f offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 175: RESULT: t offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 175: RESULT: t offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 175: RESULT: f offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 175: RESULT: f offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 175: RESULT: t offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 175: RESULT: t offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 183: QUERY: insert into "Test" ( name  , amount  , letter  ) values(  'db: ''r1''' ,  1407 ,  'f' ) on connection main
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -218,11 +218,11 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 186: Correctly got 1 tuples with 3 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 186: RESULT: db: 'r1' offset: 8 array: Yes
+[NO_PID]: ECPGget_data line 186: RESULT: db: 'r1' offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 186: RESULT: 1407 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 186: RESULT: 1407 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 186: RESULT: f offset: 1 array: Yes
+[NO_PID]: ECPGget_data line 186: RESULT: f offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGsetcommit line 192 action = on connection = main
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/complex-test2.stderr

@@ -36,71 +36,71 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 70: Correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT: Petra    offset: 12 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT: Petra    offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT:  offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT:  offset: 2 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT: 04-04-1990 offset: 11 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT: 04-04-1990 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT: 3 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT: 3 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 70: QUERY: fetch cur on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 70: Correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT: Michael  offset: 12 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT: Michael  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT: 19660117 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT: 19660117 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT: 35 offset: 2 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT: 35 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT: 04-04-1990 offset: 11 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT: 04-04-1990 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT: 3 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT: 3 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 70: QUERY: fetch cur on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 70: Correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT: Carsten  offset: 12 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT: Carsten  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT: 19910103 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT: 19910103 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT: 10 offset: 2 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT: 10 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT:  offset: 1 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT:  offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 70: QUERY: fetch cur on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 70: Correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT: Marc     offset: 12 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT: Marc     offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT: 19930907 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT: 19930907 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT: 8 offset: 2 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT: 8 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT:  offset: 1 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT:  offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 70: QUERY: fetch cur on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 70: Correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT: Chris    offset: 12 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT: Chris    offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT: 19970923 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT: 19970923 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT: 4 offset: 2 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT: 4 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT:  offset: 1 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 70: RESULT:  offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 70: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 70: QUERY: fetch cur on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -122,15 +122,15 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 100: Correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 100: RESULT: Petra    offset: 12 array: Yes
+[NO_PID]: ECPGget_data line 100: RESULT: Petra    offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 100: RESULT:  offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 100: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 100: RESULT:  offset: 2 array: Yes
+[NO_PID]: ECPGget_data line 100: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 100: RESULT: 04-04-1990 offset: 11 array: Yes
+[NO_PID]: ECPGget_data line 100: RESULT: 04-04-1990 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 100: RESULT: 3 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 100: RESULT: 3 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 100: QUERY: fetch in prep on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/complex-test3.stderr

@@ -40,43 +40,43 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 64: Correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 64: RESULT: Carsten  offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 64: RESULT: Carsten  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 64: RESULT: 19910103 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 64: RESULT: 19910103 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 64: RESULT: 10 offset: 2 array: Yes
+[NO_PID]: ECPGget_data line 64: RESULT: 10 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 64: RESULT:  offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 64: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 64: RESULT:  offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 64: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 64: QUERY: fetch from cur on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 64: Correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 64: RESULT: Marc     offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 64: RESULT: Marc     offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 64: RESULT: 19930907 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 64: RESULT: 19930907 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 64: RESULT: 8 offset: 2 array: Yes
+[NO_PID]: ECPGget_data line 64: RESULT: 8 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 64: RESULT:  offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 64: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 64: RESULT:  offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 64: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 64: QUERY: fetch from cur on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 64: Correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 64: RESULT: Chris    offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 64: RESULT: Chris    offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 64: RESULT: 19970923 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 64: RESULT: 19970923 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 64: RESULT: 4 offset: 2 array: Yes
+[NO_PID]: ECPGget_data line 64: RESULT: 4 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 64: RESULT:  offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 64: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 64: RESULT:  offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 64: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 64: QUERY: fetch from cur on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -98,15 +98,15 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 94: Correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 94: RESULT: Petra    offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 94: RESULT: Petra    offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 94: RESULT:  offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 94: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 94: RESULT:  offset: 2 array: Yes
+[NO_PID]: ECPGget_data line 94: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 94: RESULT: 04-04-1990 offset: 16 array: Yes
+[NO_PID]: ECPGget_data line 94: RESULT: 04-04-1990 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 94: RESULT: 3 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 94: RESULT: 3 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 94: QUERY: fetch in prep on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/complex-test4.stderr

@@ -30,11 +30,11 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 63: Correctly got 1 tuples with 3 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 63: RESULT: 14.07 offset: 8 array: Yes
+[NO_PID]: ECPGget_data line 63: RESULT: 14.07 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 63: RESULT: 0123456789 offset: 25 array: Yes
+[NO_PID]: ECPGget_data line 63: RESULT: 0123456789 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 63: RESULT: t offset: 1 array: Yes
+[NO_PID]: ECPGget_data line 63: RESULT: t offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 71: QUERY: select  a , text  from test where f =  140787   on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -42,15 +42,15 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGis_type_an_array line 71: TYPE database: 1007 C: 5 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 71: RESULT: {9,8,7,6,5,4,3,2,1,0} offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 71: RESULT: {9,8,7,6,5,4,3,2,1,0} offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 71: RESULT: klmnopqrst offset: 1 array: Yes
+[NO_PID]: ECPGget_data line 71: RESULT: klmnopqrst offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 81: QUERY: select  a  from test where f =  140787   on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 81: Correctly got 1 tuples with 1 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 81: RESULT: {9,8,7,6,5,4,3,2,1,0} offset: 25 array: Yes
+[NO_PID]: ECPGget_data line 81: RESULT: {9,8,7,6,5,4,3,2,1,0} offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 88: QUERY: drop table test  on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/complex-test5.stderr

@@ -14,11 +14,11 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 59: Correctly got 1 tuples with 3 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 59: RESULT: first user           offset: 21 array: Yes
+[NO_PID]: ECPGget_data line 59: RESULT: first user           offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 59: RESULT: 320 offset: 2 array: Yes
+[NO_PID]: ECPGget_data line 59: RESULT: 320 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 59: RESULT: \001m\000\212 offset: 20 array: Yes
+[NO_PID]: ECPGget_data line 59: RESULT: \001m\000\212 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 71: QUERY: declare C  cursor  for select  name , accs , byte  from empl where idnum =  1   on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -28,11 +28,11 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 72: Correctly got 1 tuples with 3 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 72: RESULT: first user           offset: 21 array: Yes
+[NO_PID]: ECPGget_data line 72: RESULT: first user           offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 72: RESULT: 320 offset: 2 array: Yes
+[NO_PID]: ECPGget_data line 72: RESULT: 320 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 72: RESULT: \001m\000\212 offset: 20 array: Yes
+[NO_PID]: ECPGget_data line 72: RESULT: \001m\000\212 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 84: QUERY: declare B  binary cursor  for select  name , accs , byte  from empl where idnum =  1   on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -42,11 +42,11 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 85: Correctly got 1 tuples with 3 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 85: RESULT: BINARY offset: 21 array: Yes
+[NO_PID]: ECPGget_data line 85: RESULT: BINARY offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 85: RESULT: BINARY offset: 2 array: Yes
+[NO_PID]: ECPGget_data line 85: RESULT: BINARY offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 85: RESULT: BINARY offset: 20 array: Yes
+[NO_PID]: ECPGget_data line 85: RESULT: BINARY offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 92: QUERY: close B on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/connect-test2.stderr

@@ -8,25 +8,25 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 28: Correctly got 1 tuples with 1 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 28: RESULT: regress1 offset: 200 array: Yes
+[NO_PID]: ECPGget_data line 28: RESULT: regress1 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 29: QUERY: select  current_database ()      on connection first
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 29: Correctly got 1 tuples with 1 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 29: RESULT: connectdb offset: 200 array: Yes
+[NO_PID]: ECPGget_data line 29: RESULT: connectdb offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 30: QUERY: select  current_database ()      on connection second
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 30: Correctly got 1 tuples with 1 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 30: RESULT: regress1 offset: 200 array: Yes
+[NO_PID]: ECPGget_data line 30: RESULT: regress1 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 33: QUERY: select  current_database ()      on connection first
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 33: Correctly got 1 tuples with 1 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 33: RESULT: connectdb offset: 200 array: Yes
+[NO_PID]: ECPGget_data line 33: RESULT: connectdb offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_finish: Connection first closed.
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -34,7 +34,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 37: Correctly got 1 tuples with 1 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 37: RESULT: regress1 offset: 200 array: Yes
+[NO_PID]: ECPGget_data line 37: RESULT: regress1 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: raising sqlcode -220 in line 40, 'No such connection first in line 40.'.
 [NO_PID]: sqlca: code: -220, state: 08003

src/interfaces/ecpg/test/expected/connect-test3.stderr

@@ -8,7 +8,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 27: Correctly got 1 tuples with 1 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 27: RESULT: regress1 offset: 200 array: Yes
+[NO_PID]: ECPGget_data line 27: RESULT: regress1 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_finish: Connection second closed.
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -16,7 +16,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 31: Correctly got 1 tuples with 1 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 31: RESULT: connectdb offset: 200 array: Yes
+[NO_PID]: ECPGget_data line 31: RESULT: connectdb offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGconnect: opening database regress1 on <DEFAULT> port <DEFAULT> 
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/errors-init.c

@@ -148,7 +148,6 @@ int main(void)
 		 
 		  
 		  /* = 1L */ 
-		   /* = 40000000000LL */ 
 	
 #line 60 "init.pgc"
  int  a   = ( int ) 2 ;
@@ -182,11 +181,8 @@ int main(void)
  
 #line 71 "init.pgc"
  long  iay    ;
- 
-#line 72 "init.pgc"
- long long  iax    ;
 /* exec sql end declare section */
-#line 73 "init.pgc"
+#line 72 "init.pgc"
 
 
 	int f=fa();
@@ -195,71 +191,71 @@ int main(void)
 	/* exec sql begin declare section */
 	  /* compile error */
 	
-#line 79 "init.pgc"
+#line 78 "init.pgc"
  int  k   = N : : i ;
 /* exec sql end declare section */
-#line 80 "init.pgc"
+#line 79 "init.pgc"
 
 #endif
 
 	ECPGdebug(1, stderr);
 
 	printf("%d %d %d %d %d %d %d %d %d %d %d\n", a, b, b2, c, d, e, f, g, h, i, j);
-	iax = iay = 0;
+	iay = 0;
-	printf("%ld %lld\n", iay, iax);
+	printf("%ld\n", iay);
 	/* exec sql whenever sqlerror  do fa (  ) ; */
+#line 87 "init.pgc"
+
+	{ ECPGdo(__LINE__, 0, 1, NULL, "select  now ()     ", ECPGt_EOIT, ECPGt_EORT);
 #line 88 "init.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, "select  now ()     ", ECPGt_EOIT, ECPGt_EORT);
-#line 89 "init.pgc"
-
 if (sqlca.sqlcode < 0) fa (  );}
-#line 89 "init.pgc"
+#line 88 "init.pgc"
 
 	/* exec sql whenever sqlerror  do fb ( 20 ) ; */
+#line 89 "init.pgc"
+
+	{ ECPGdo(__LINE__, 0, 1, NULL, "select  now ()     ", ECPGt_EOIT, ECPGt_EORT);
 #line 90 "init.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, "select  now ()     ", ECPGt_EOIT, ECPGt_EORT);
-#line 91 "init.pgc"
-
 if (sqlca.sqlcode < 0) fb ( 20 );}
-#line 91 "init.pgc"
+#line 90 "init.pgc"
 
 	/* exec sql whenever sqlerror  do fc ( \"50\" ) ; */
+#line 91 "init.pgc"
+
+	{ ECPGdo(__LINE__, 0, 1, NULL, "select  now ()     ", ECPGt_EOIT, ECPGt_EORT);
 #line 92 "init.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, "select  now ()     ", ECPGt_EOIT, ECPGt_EORT);
-#line 93 "init.pgc"
-
 if (sqlca.sqlcode < 0) fc ( "50" );}
-#line 93 "init.pgc"
+#line 92 "init.pgc"
 
 	/* exec sql whenever sqlerror  do fd ( \"50\" , 1 ) ; */
+#line 93 "init.pgc"
+
+	{ ECPGdo(__LINE__, 0, 1, NULL, "select  now ()     ", ECPGt_EOIT, ECPGt_EORT);
 #line 94 "init.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, "select  now ()     ", ECPGt_EOIT, ECPGt_EORT);
-#line 95 "init.pgc"
-
 if (sqlca.sqlcode < 0) fd ( "50" , 1 );}
-#line 95 "init.pgc"
+#line 94 "init.pgc"
 
 	/* exec sql whenever sqlerror  do fe ( ENUM0 ) ; */
+#line 95 "init.pgc"
+
+	{ ECPGdo(__LINE__, 0, 1, NULL, "select  now ()     ", ECPGt_EOIT, ECPGt_EORT);
 #line 96 "init.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, "select  now ()     ", ECPGt_EOIT, ECPGt_EORT);
-#line 97 "init.pgc"
-
 if (sqlca.sqlcode < 0) fe ( ENUM0 );}
-#line 97 "init.pgc"
+#line 96 "init.pgc"
 
 	/* exec sql whenever sqlerror  do sqlnotice ( NULL , 0 ) ; */
-#line 98 "init.pgc"
+#line 97 "init.pgc"
  
 	{ ECPGdo(__LINE__, 0, 1, NULL, "select  now ()     ", ECPGt_EOIT, ECPGt_EORT);
-#line 99 "init.pgc"
+#line 98 "init.pgc"
 
 if (sqlca.sqlcode < 0) sqlnotice ( NULL , 0 );}
-#line 99 "init.pgc"
+#line 98 "init.pgc"
 
 	return 0;
 }

src/interfaces/ecpg/test/expected/errors-init.stderr

@@ -1,14 +1,14 @@
 [NO_PID]: ECPGdebug: set to 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: raising sqlcode -220 in line 89, 'No such connection NULL in line 89.'.
+[NO_PID]: raising sqlcode -220 in line 88, 'No such connection NULL in line 88.'.
 [NO_PID]: sqlca: code: -220, state: 08003
-[NO_PID]: raising sqlcode -220 in line 91, 'No such connection NULL in line 91.'.
+[NO_PID]: raising sqlcode -220 in line 90, 'No such connection NULL in line 90.'.
 [NO_PID]: sqlca: code: -220, state: 08003
-[NO_PID]: raising sqlcode -220 in line 93, 'No such connection NULL in line 93.'.
+[NO_PID]: raising sqlcode -220 in line 92, 'No such connection NULL in line 92.'.
 [NO_PID]: sqlca: code: -220, state: 08003
-[NO_PID]: raising sqlcode -220 in line 95, 'No such connection NULL in line 95.'.
+[NO_PID]: raising sqlcode -220 in line 94, 'No such connection NULL in line 94.'.
 [NO_PID]: sqlca: code: -220, state: 08003
-[NO_PID]: raising sqlcode -220 in line 97, 'No such connection NULL in line 97.'.
+[NO_PID]: raising sqlcode -220 in line 96, 'No such connection NULL in line 96.'.
 [NO_PID]: sqlca: code: -220, state: 08003
-[NO_PID]: raising sqlcode -220 in line 99, 'No such connection NULL in line 99.'.
+[NO_PID]: raising sqlcode -220 in line 98, 'No such connection NULL in line 98.'.
 [NO_PID]: sqlca: code: -220, state: 08003

src/interfaces/ecpg/test/expected/errors-init.stdout

@@ -1,7 +1,7 @@
 in fb (2)
 in fa
 2 4 98 2 14 14 2 2 1 2 1
-0 0
+0
 in fa
 in fb (20)
 in fc (50)

src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.stderr

@@ -18,9 +18,9 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 37: Correctly got 1 tuples with 2 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 37: RESULT: 1966-01-17 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 37: RESULT: 1966-01-17 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 37: RESULT: 2000-07-12 17:34:29 offset: 8 array: Yes
+[NO_PID]: ECPGget_data line 37: RESULT: 2000-07-12 17:34:29 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGtrans line 351 action = rollback connection = regress1
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/pgtypeslib-num_test.stderr

@@ -16,7 +16,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 58: Correctly got 1 tuples with 1 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 58: RESULT: 2369.7000000 offset: 28 array: Yes
+[NO_PID]: ECPGget_data line 58: RESULT: 2369.7000000 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGtrans line 82 action = rollback connection = regress1
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/sql-define.stderr

@@ -22,9 +22,9 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 36: Correctly got 1 tuples with 2 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 36: RESULT: 1 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 36: RESULT: 1 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 36: RESULT: 29-abcdef offset: 200 array: Yes
+[NO_PID]: ECPGget_data line 36: RESULT: 29-abcdef offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 42: QUERY: insert into test values( 29 , 'no string' ) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/sql-desc.stderr

@@ -38,7 +38,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 52: Correctly got 1 tuples with 2 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 52: RESULT: 1 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 52: RESULT: 1 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 52: RESULT: 'one' offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -54,7 +54,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 64: Correctly got 1 tuples with 2 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 64: RESULT: 2 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 64: RESULT: 2 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 64: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -66,7 +66,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 69: Correctly got 1 tuples with 2 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 69: RESULT: 2 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 69: RESULT: 2 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_data line 69: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/sql-dynalloc.stderr

@@ -22,57 +22,57 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 41: RESULT: 1 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 41: RESULT: 1 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 41: RESULT: 2 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 41: RESULT: 2 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 2
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 42: RESULT: 23.456 offset: 8 array: Yes
+[NO_PID]: ECPGget_data line 42: RESULT: 23.456 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 42: RESULT: 2.446 offset: 8 array: Yes
+[NO_PID]: ECPGget_data line 42: RESULT: 2.446 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 3
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGstore_result: line 43: allocating 21 bytes for 2 tuples (char**=0)[NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 43: RESULT: varchar offset: 0 array: Yes
+[NO_PID]: ECPGget_data line 43: RESULT: varchar offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 43: RESULT:  offset: 0 array: Yes
+[NO_PID]: ECPGget_data line 43: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 4
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGstore_result: line 44: allocating 16 bytes for 2 tuples (char**=0)[NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 44: RESULT: v offset: 0 array: Yes
+[NO_PID]: ECPGget_data line 44: RESULT: v offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 44: RESULT: v offset: 0 array: Yes
+[NO_PID]: ECPGget_data line 44: RESULT: v offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 5
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGstore_result: line 45: allocating 22 bytes for 2 tuples (char**=0)[NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 45: RESULT: c    offset: 0 array: Yes
+[NO_PID]: ECPGget_data line 45: RESULT: c    offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 45: RESULT: c    offset: 0 array: Yes
+[NO_PID]: ECPGget_data line 45: RESULT: c    offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 6
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGstore_result: line 46: allocating 70 bytes for 2 tuples (char**=0)[NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 46: RESULT: Mon Mar 03 11:33:07 2003 PST offset: 0 array: Yes
+[NO_PID]: ECPGget_data line 46: RESULT: Mon Mar 03 11:33:07 2003 PST offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 46: RESULT: Mon Mar 03 11:33:07 2003 PST offset: 0 array: Yes
+[NO_PID]: ECPGget_data line 46: RESULT: Mon Mar 03 11:33:07 2003 PST offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 7
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGstore_result: line 47: allocating 16 bytes for 2 tuples (char**=0)[NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 47: RESULT: t offset: 0 array: Yes
+[NO_PID]: ECPGget_data line 47: RESULT: t offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 47: RESULT: f offset: 0 array: Yes
+[NO_PID]: ECPGget_data line 47: RESULT: f offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 9
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGstore_result: line 50: allocating 46 bytes for 2 tuples (char**=0)[NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 50: RESULT: 2001:4f8:3:ba:2e0:81ff:fe22:d1f1 offset: 0 array: Yes
+[NO_PID]: ECPGget_data line 50: RESULT: 2001:4f8:3:ba:2e0:81ff:fe22:d1f1 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 50: RESULT:  offset: 0 array: Yes
+[NO_PID]: ECPGget_data line 50: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_finish: Connection regress1 closed.
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/sql-dynalloc2.stderr

@@ -40,32 +40,32 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 33: RESULT: 1 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 33: RESULT: 1 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 33: RESULT: 2 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 33: RESULT: 2 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 33: RESULT:  offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 33: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 33: RESULT: 4 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 33: RESULT: 4 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 33: RESULT: 5 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 33: RESULT: 5 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 33: RESULT:  offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 33: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 2
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGstore_result: line 34: allocating 49 bytes for 6 tuples (char**=0)[NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 34: RESULT: one offset: 0 array: Yes
+[NO_PID]: ECPGget_data line 34: RESULT: one offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 34: RESULT: two offset: 0 array: Yes
+[NO_PID]: ECPGget_data line 34: RESULT: two offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 34: RESULT: three offset: 0 array: Yes
+[NO_PID]: ECPGget_data line 34: RESULT: three offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 34: RESULT: four offset: 0 array: Yes
+[NO_PID]: ECPGget_data line 34: RESULT: four offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 34: RESULT:  offset: 0 array: Yes
+[NO_PID]: ECPGget_data line 34: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 34: RESULT:  offset: 0 array: Yes
+[NO_PID]: ECPGget_data line 34: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGtrans line 50 action = rollback connection = regress1
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/sql-dyntest2.c

@@ -153,21 +153,21 @@ int main(int argc,char **argv)
 {
 /* exec sql begin declare section */
    
+   
+   
+   
+   
+   
     
    
    
    
-   
-   
-   
-   
-   
 
 #line 20 "dyntest2.pgc"
  int  COUNT    ;
  
 #line 21 "dyntest2.pgc"
- int  INTVAR    ,  BOOLVAR    ;
+ int  INTVAR    ;
  
 #line 22 "dyntest2.pgc"
  int  INDEX    ;
@@ -182,7 +182,7 @@ int main(int argc,char **argv)
  int  DATETIME_INTERVAL_CODE    ;
  
 #line 26 "dyntest2.pgc"
- char  NAME [ 120 ]    ;
+ char  NAME [ 120 ]    ,  BOOLVAR    ;
  
 #line 27 "dyntest2.pgc"
  char  STRINGVAR [ 1024 ]    ;

src/interfaces/ecpg/test/expected/sql-dyntest2.stderr

@@ -48,7 +48,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 103: RESULT: first entry    offset: 1024 array: Yes
+[NO_PID]: ECPGget_data line 103: RESULT: first entry    offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 2
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -70,7 +70,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 2
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 92: RESULT: 14.7 offset: 8 array: Yes
+[NO_PID]: ECPGget_data line 92: RESULT: 14.7 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 3
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -92,7 +92,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 3
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 88: RESULT: 14 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 88: RESULT: 14 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 4
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -114,7 +114,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 4
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 107: RESULT: 123045607890 offset: 1024 array: Yes
+[NO_PID]: ECPGget_data line 107: RESULT: 123045607890 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 5
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -136,7 +136,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 5
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 83: RESULT: t offset: 1 array: Yes
+[NO_PID]: ECPGget_data line 83: RESULT: t offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 6
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -158,7 +158,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 6
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 103: RESULT: The world's most advanced open source database. offset: 1024 array: Yes
+[NO_PID]: ECPGget_data line 103: RESULT: The world's most advanced open source database. offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 7
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -182,7 +182,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: TYPE = 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 96: RESULT: 07-14-1987 offset: 1024 array: Yes
+[NO_PID]: ECPGget_data line 96: RESULT: 07-14-1987 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 56: QUERY: fetch in MYCURS on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -212,7 +212,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 103: RESULT: second entry   offset: 1024 array: Yes
+[NO_PID]: ECPGget_data line 103: RESULT: second entry   offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 2
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -234,7 +234,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 2
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 92: RESULT: 1407.87 offset: 8 array: Yes
+[NO_PID]: ECPGget_data line 92: RESULT: 1407.87 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 3
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -256,7 +256,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 3
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 88: RESULT: 1407 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 88: RESULT: 1407 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 4
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -278,7 +278,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 4
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 107: RESULT: 987065403210 offset: 1024 array: Yes
+[NO_PID]: ECPGget_data line 107: RESULT: 987065403210 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 5
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -300,7 +300,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 5
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 83: RESULT: f offset: 1 array: Yes
+[NO_PID]: ECPGget_data line 83: RESULT: f offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 6
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -322,7 +322,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 6
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 103: RESULT: The elephant never forgets. offset: 1024 array: Yes
+[NO_PID]: ECPGget_data line 103: RESULT: The elephant never forgets. offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: reading items for tuple 7
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -346,7 +346,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGget_desc: TYPE = 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 96: RESULT: 11-05-1999 offset: 1024 array: Yes
+[NO_PID]: ECPGget_data line 96: RESULT: 11-05-1999 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 56: QUERY: fetch in MYCURS on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/sql-dyntest2.stdout

@@ -34,7 +34,7 @@ Count 7
 	= <"987065403210">
  5	b (type: 16 length: -5 precision: -1 scale: 65531
 	octet_length: 1 returned_octet_length: 1)
-	= true
+	= false
  6	comment (type: 1 length: -5 precision: -1 scale: 65531
 	octet_length: -1 returned_octet_length: 27)
 	= "The elephant never forgets."

src/interfaces/ecpg/test/expected/sql-indicators.stderr

@@ -28,19 +28,19 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 34: Correctly got 1 tuples with 1 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 34: RESULT: 0 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 34: RESULT: 0 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 35: QUERY: select  val  from test where id = 2   on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 35: Correctly got 1 tuples with 1 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 35: RESULT:  offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 35: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 37: QUERY: select  val  from test where id = 3   on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 37: Correctly got 1 tuples with 1 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 37: RESULT: 5 offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 37: RESULT: 5 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 42: QUERY: update test set val  =  null  where id = 1 on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -50,7 +50,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 43: Correctly got 1 tuples with 1 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 43: RESULT:  offset: 4 array: Yes
+[NO_PID]: ECPGget_data line 43: RESULT:  offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 46: QUERY: drop table test  on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/sql-quote.stderr

@@ -12,7 +12,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 21: Correctly got 1 tuples with 1 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 21: RESULT: off offset: 25 array: Yes
+[NO_PID]: ECPGget_data line 21: RESULT: off offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 25: QUERY: insert into My_Table values( 1 , 'a\\b' ) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/sql-show.stderr

@@ -6,31 +6,31 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 18: Correctly got 1 tuples with 1 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 18: RESULT: "$user",public offset: 25 array: Yes
+[NO_PID]: ECPGget_data line 18: RESULT: "$user",public offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 21: QUERY: show wal_buffers on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 21: Correctly got 1 tuples with 1 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 21: RESULT: 8 offset: 25 array: Yes
+[NO_PID]: ECPGget_data line 21: RESULT: 8 offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 24: QUERY: show standard_conforming_strings on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 24: Correctly got 1 tuples with 1 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 24: RESULT: off offset: 25 array: Yes
+[NO_PID]: ECPGget_data line 24: RESULT: off offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 27: QUERY: show time zone on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 27: Correctly got 1 tuples with 1 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 27: RESULT: PST8PDT offset: 25 array: Yes
+[NO_PID]: ECPGget_data line 27: RESULT: PST8PDT offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 30: QUERY: show transaction isolation level on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGexecute line 30: Correctly got 1 tuples with 1 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGget_data line 30: RESULT: read committed offset: 25 array: Yes
+[NO_PID]: ECPGget_data line 30: RESULT: read committed offset: -1 array: Yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_finish: Connection regress1 closed.
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/pg_regress.inc.sh.in

@@ -461,7 +461,8 @@ dont_temp_install(){
 }
 
 setup_client_environment_variables(){
-	export PGDATESTYLE=Postgres
+	PGDATESTYLE='Postgres'
+	export PGDATESTYLE
 }
 
 # ----------

src/interfaces/ecpg/test/pg_regress.sh

@@ -1,9 +1,9 @@
 #! /bin/sh
-# $PostgreSQL: pgsql/src/interfaces/ecpg/test/pg_regress.sh,v 1.4 2006/08/04 08:52:17 meskes Exp $
+# $PostgreSQL: pgsql/src/interfaces/ecpg/test/pg_regress.sh,v 1.5 2006/08/08 11:51:24 meskes Exp $
 
 me=`basename $0`
 
-. pg_regress.inc.sh
+. ./pg_regress.inc.sh
 
 additional_regress_options=""
 
@@ -82,12 +82,14 @@ if [ $? -ne 0 ]; then
 fi
 
 # this variable prevents that the PID gets included in the logfiles
-export ECPG_DONT_LOG_PID=1
+ECPG_REGRESSION=1; export ECPG_REGRESSION
-export PGPORT=$temp_port
+PGPORT=$temp_port; export PGPORT
-export LD_LIBRARY_PATH=$libdir
+LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH; export LD_LIBRARY_PATH
 
 DIFFFLAGS="$DIFFFLAGS -C3"
-FAILNUM=0
+FAILNUM=""
+
+rm -f regression.diffs
 
 for i in \
          connect/*.pgc \
@@ -108,13 +110,13 @@ for i in \
 		continue;
 	fi
 
-	runprg=${i%.pgc}
+	runprg=`echo $i | sed -e 's,\.pgc$,,'`
 	outprg=`echo $runprg | sed -e's/\//-/'`
 	outfile_stderr="$outputdir/$outprg.stderr"
 	outfile_stdout="$outputdir/$outprg.stdout"
 	outfile_source="$outputdir/$outprg.c"
 	cp $runprg.c "$outfile_source"
-#	echo "$runprg > $outfile_stdout 2> $outfile_stderr"
+	# echo "$runprg > $outfile_stdout 2> $outfile_stderr"
 	$runprg > "$outfile_stdout" 2> "$outfile_stderr"
 
 	# If we don't run on the default port we'll get different output
@@ -134,25 +136,27 @@ for i in \
 	fi
 
 	DIFFER=""
-	diff $DIFFFLAGS expected/$outprg.stderr "$outfile_stderr" >> regression.diff 2>&1 || DIFFER="$DIFFER, log"
+	diff $DIFFFLAGS expected/$outprg.stderr "$outfile_stderr" >> regression.diffs 2>&1 || DIFFER="$DIFFER, log"
-	diff $DIFFFLAGS expected/$outprg.stdout "$outfile_stdout" >> regression.diff 2>&1 || DIFFER="$DIFFER, output"
+	diff $DIFFFLAGS expected/$outprg.stdout "$outfile_stdout" >> regression.diffs 2>&1 || DIFFER="$DIFFER, output"
-	diff $DIFFFLAGS expected/$outprg.c "$outputdir"/$outprg.c >> regression.diff 2>&1 || DIFFER="$DIFFER, source"
+	diff $DIFFFLAGS expected/$outprg.c "$outputdir"/$outprg.c >> regression.diffs 2>&1 || DIFFER="$DIFFER, source"
 
-	DIFFER=${DIFFER#, }
+	DIFFER=`echo $DIFFER | sed -e 's/^, //'`
 	if [ "x$DIFFER" = "x" ]; then
 		echo ok
 	else
 		echo "FAILED ($DIFFER)"
-		FAILNUM=$((FAILNUM+1))
+		# some sh's don't know about $((x+1))
+		FAILNUM=x$FAILNUM
 	fi
 done
 
-if [ $FAILNUM -eq 0 ]; then
+if [ "x$FAILNUM" = x"" ]; then
-	rm regression.diff
+	rm regression.diffs
 fi
 
 postmaster_shutdown
 
-[ $FAILNUM -eq 0 ] && exit
+# FAILNUM is empty if no test has failed
-[ $FAILNUM -ne 0 ] && (exit 1); exit
+[ x"$FAILNUM" = x"" ] && exit 0
+(exit 1); exit
 

src/interfaces/ecpg/test/sql/dyntest2.pgc

@@ -18,12 +18,12 @@ int main(int argc,char **argv)
 {
 exec sql begin declare section;
   int COUNT;
-  int INTVAR, BOOLVAR;
+  int INTVAR;
   int INDEX;
   int INDICATOR;
   int TYPE,LENGTH,OCTET_LENGTH,PRECISION,SCALE,RETURNED_OCTET_LENGTH;
   int DATETIME_INTERVAL_CODE;
-  char NAME[120];
+  char NAME[120], BOOLVAR;
   char STRINGVAR[1024];
   double DOUBLEVAR;
   char *QUERY;