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

Lots of small changes in regression test suite

Made parser check for valid copy to/from stdin/stdout combinations.
6e11202d · Michael Meskes · d42cb5d8 · 6e11202d · 6e11202d · 6e11202d
Commit 6e11202d authored 19 years ago by Michael Meskes
--- a/src/interfaces/ecpg/test/expected/sql-desc.stderr
+++ b/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

--- a/src/interfaces/ecpg/test/expected/sql-dynalloc.stderr
+++ b/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
--- a/src/interfaces/ecpg/test/expected/sql-dynalloc2.stderr
+++ b/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

--- a/src/interfaces/ecpg/test/expected/sql-dyntest.stderr
+++ b/src/interfaces/ecpg/test/expected/sql-dyntest.stderr
--- a/src/interfaces/ecpg/test/expected/sql-dyntest2.c
+++ b/src/interfaces/ecpg/test/expected/sql-dyntest2.c
@@ -167,7 +167,7 @@ int main(int argc,char **argv)
 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 ]    ;

--- a/src/interfaces/ecpg/test/expected/sql-dyntest2.stderr
+++ b/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

--- a/src/interfaces/ecpg/test/expected/sql-dyntest2.stdout
+++ b/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."

--- a/src/interfaces/ecpg/test/expected/sql-indicators.stderr
+++ b/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

--- a/src/interfaces/ecpg/test/expected/sql-quote.stderr
+++ b/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

--- a/src/interfaces/ecpg/test/expected/sql-show.stderr
+++ b/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
--- a/src/interfaces/ecpg/test/pg_regress.inc.sh.in
+++ b/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
 }
 # ----------

--- a/src/interfaces/ecpg/test/pg_regress.sh
+++ b/src/interfaces/ecpg/test/pg_regress.sh
 #! /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,7 +110,7 @@ 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"
@@ -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
--- a/src/interfaces/ecpg/test/sql/dyntest2.pgc
+++ b/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;