Removed more inttypes.h stuff.

16 years ago · 858dc6dc6f
parent ee0b602425
commit 858dc6dc6f
6 changed files with 390 additions and 412 deletions
--- a/src/interfaces/ecpg/test/compat_informix/sqlda.pgc
+++ b/src/interfaces/ecpg/test/compat_informix/sqlda.pgc
@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
-#include <inttypes.h>
+#include <limits.h>

 exec sql include ../regression;

@ -36,9 +36,6 @@ dump_sqlda(sqlda_t *sqlda)
 		case SQLINT:
 			printf("name sqlda descriptor: '%s' value %d\n", sqlda->sqlvar[i].sqlname, *(int *)sqlda->sqlvar[i].sqldata);
 			break;
-		case SQLINT8:
-			printf("name sqlda descriptor: '%s' value %" PRId64 "\n", sqlda->sqlvar[i].sqlname, *(int64_t *)sqlda->sqlvar[i].sqldata);
-			break;
 		case SQLFLOAT:
 			printf("name sqlda descriptor: '%s' value %lf\n", sqlda->sqlvar[i].sqlname, *(double *)sqlda->sqlvar[i].sqldata);
 			break;
--- a/src/interfaces/ecpg/test/expected/compat_informix-sqlda.c
+++ b/src/interfaces/ecpg/test/expected/compat_informix-sqlda.c
@ -11,7 +11,7 @@
 #line 1 "sqlda.pgc"
 #include <stdlib.h>
 #include <string.h>
-#include <inttypes.h>
+#include <limits.h>


 #line 1 "regression.h"
@ -141,9 +141,6 @@ dump_sqlda(sqlda_t *sqlda)
 		case SQLINT:
 			printf("name sqlda descriptor: '%s' value %d\n", sqlda->sqlvar[i].sqlname, *(int *)sqlda->sqlvar[i].sqldata);
 			break;
-		case SQLINT8:
-			printf("name sqlda descriptor: '%s' value %" PRId64 "\n", sqlda->sqlvar[i].sqlname, *(int64_t *)sqlda->sqlvar[i].sqldata);
-			break;
 		case SQLFLOAT:
 			printf("name sqlda descriptor: '%s' value %lf\n", sqlda->sqlvar[i].sqlname, *(double *)sqlda->sqlvar[i].sqldata);
 			break;
@ -167,19 +164,19 @@ main (void)
 		
 		

-#line 60 "sqlda.pgc"
+#line 57 "sqlda.pgc"
 char * stmt1 = "SELECT * FROM t1" ;
 
-#line 61 "sqlda.pgc"
+#line 58 "sqlda.pgc"
 char * stmt2 = "SELECT * FROM t1 WHERE id = ?" ;
 
-#line 62 "sqlda.pgc"
+#line 59 "sqlda.pgc"
 int rec ;
 
-#line 63 "sqlda.pgc"
+#line 60 "sqlda.pgc"
 int id ;
 /* exec sql end declare section */
-#line 64 "sqlda.pgc"
+#line 61 "sqlda.pgc"


 	char msg[128];
@ -188,42 +185,42 @@ main (void)

 	strcpy(msg, "connect");
 	{ ECPGconnect(__LINE__, 1, "regress1" , NULL, NULL , "regress1", 0); 
-#line 71 "sqlda.pgc"
+#line 68 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 71 "sqlda.pgc"
+#line 68 "sqlda.pgc"


 	strcpy(msg, "set");
 	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "set datestyle to iso", ECPGt_EOIT, ECPGt_EORT);
-#line 74 "sqlda.pgc"
+#line 71 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 74 "sqlda.pgc"
+#line 71 "sqlda.pgc"


 	strcpy(msg, "create");
 	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "create table t1 ( id integer , t text , d1 numeric , d2 float8 , c char ( 10 ) )", ECPGt_EOIT, ECPGt_EORT);
-#line 82 "sqlda.pgc"
+#line 79 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 82 "sqlda.pgc"
+#line 79 "sqlda.pgc"


 	strcpy(msg, "insert");
 	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "insert into t1 values ( 1 , 'a' , 1.0 , 1 , 'a' ) , ( 2 , null , null , null , null ) , ( 3 , '\"c\"' , - 3 , 'nan' :: float8 , 'c' ) , ( 4 , 'd' , 4.0 , 4 , 'd' )", ECPGt_EOIT, ECPGt_EORT);
-#line 89 "sqlda.pgc"
+#line 86 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 89 "sqlda.pgc"
+#line 86 "sqlda.pgc"


 	strcpy(msg, "commit");
 	{ ECPGtrans(__LINE__, NULL, "commit");
-#line 92 "sqlda.pgc"
+#line 89 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 92 "sqlda.pgc"
+#line 89 "sqlda.pgc"


 	/* SQLDA test for getting all records from a table */
@ -232,29 +229,29 @@ if (sqlca.sqlcode < 0) exit (1);}

 	strcpy(msg, "prepare");
 	{ ECPGprepare(__LINE__, NULL, 0, "st_id1", stmt1);
-#line 99 "sqlda.pgc"
+#line 96 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 99 "sqlda.pgc"
+#line 96 "sqlda.pgc"


 	strcpy(msg, "declare");
 	ECPG_informix_reset_sqlca(); /* declare mycur1 cursor for $1 */
-#line 102 "sqlda.pgc"
+#line 99 "sqlda.pgc"


 	strcpy(msg, "open");
 	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "declare mycur1 cursor for $1", 
 	ECPGt_char_variable,(ECPGprepared_statement(NULL, "st_id1", __LINE__)),(long)1,(long)1,(1)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
-#line 105 "sqlda.pgc"
+#line 102 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 105 "sqlda.pgc"
+#line 102 "sqlda.pgc"


 	/* exec sql whenever not found  break ; */
-#line 107 "sqlda.pgc"
+#line 104 "sqlda.pgc"


 	rec = 0;
@ -264,13 +261,13 @@ if (sqlca.sqlcode < 0) exit (1);}
 		{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "fetch 1 from mycur1", ECPGt_EOIT, 
 	ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L, 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
-#line 113 "sqlda.pgc"
+#line 110 "sqlda.pgc"

 if (sqlca.sqlcode == ECPG_NOT_FOUND) break;
-#line 113 "sqlda.pgc"
+#line 110 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 113 "sqlda.pgc"
+#line 110 "sqlda.pgc"
 

 		printf("FETCH RECORD %d\n", ++rec);
@ -278,23 +275,23 @@ if (sqlca.sqlcode < 0) exit (1);}
 	}

 	/* exec sql whenever not found  continue ; */
-#line 119 "sqlda.pgc"
+#line 116 "sqlda.pgc"


 	strcpy(msg, "close");
 	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "close mycur1", ECPGt_EOIT, ECPGt_EORT);
-#line 122 "sqlda.pgc"
+#line 119 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 122 "sqlda.pgc"
+#line 119 "sqlda.pgc"


 	strcpy(msg, "deallocate");
 	{ ECPGdeallocate(__LINE__, 1, NULL, "st_id1");
-#line 125 "sqlda.pgc"
+#line 122 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 125 "sqlda.pgc"
+#line 122 "sqlda.pgc"


 	free(outp_sqlda);
@ -307,29 +304,29 @@ if (sqlca.sqlcode < 0) exit (1);}

 	strcpy(msg, "prepare");
 	{ ECPGprepare(__LINE__, NULL, 0, "st_id2", stmt1);
-#line 136 "sqlda.pgc"
+#line 133 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 136 "sqlda.pgc"
+#line 133 "sqlda.pgc"


 	strcpy(msg, "declare");
 	ECPG_informix_reset_sqlca(); /* declare mycur2 cursor for $1 */
-#line 139 "sqlda.pgc"
+#line 136 "sqlda.pgc"


 	strcpy(msg, "open");
 	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "declare mycur2 cursor for $1", 
 	ECPGt_char_variable,(ECPGprepared_statement(NULL, "st_id2", __LINE__)),(long)1,(long)1,(1)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
-#line 142 "sqlda.pgc"
+#line 139 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 142 "sqlda.pgc"
+#line 139 "sqlda.pgc"


 	/* exec sql whenever not found  break ; */
-#line 144 "sqlda.pgc"
+#line 141 "sqlda.pgc"


 	rec = 0;
@ -339,13 +336,13 @@ if (sqlca.sqlcode < 0) exit (1);}
 		{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "fetch from mycur2", ECPGt_EOIT, 
 	ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L, 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
-#line 150 "sqlda.pgc"
+#line 147 "sqlda.pgc"

 if (sqlca.sqlcode == ECPG_NOT_FOUND) break;
-#line 150 "sqlda.pgc"
+#line 147 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 150 "sqlda.pgc"
+#line 147 "sqlda.pgc"


 		printf("FETCH RECORD %d\n", ++rec);
@ -353,23 +350,23 @@ if (sqlca.sqlcode < 0) exit (1);}
 	}

 	/* exec sql whenever not found  continue ; */
-#line 156 "sqlda.pgc"
+#line 153 "sqlda.pgc"


 	strcpy(msg, "close");
 	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "close mycur2", ECPGt_EOIT, ECPGt_EORT);
-#line 159 "sqlda.pgc"
+#line 156 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 159 "sqlda.pgc"
+#line 156 "sqlda.pgc"


 	strcpy(msg, "deallocate");
 	{ ECPGdeallocate(__LINE__, 1, NULL, "st_id2");
-#line 162 "sqlda.pgc"
+#line 159 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 162 "sqlda.pgc"
+#line 159 "sqlda.pgc"


 	free(outp_sqlda);
@ -394,10 +391,10 @@ if (sqlca.sqlcode < 0) exit (1);}

 	strcpy(msg, "prepare");
 	{ ECPGprepare(__LINE__, NULL, 0, "st_id3", stmt2);
-#line 185 "sqlda.pgc"
+#line 182 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 185 "sqlda.pgc"
+#line 182 "sqlda.pgc"


 	strcpy(msg, "execute");
@ -406,20 +403,20 @@ if (sqlca.sqlcode < 0) exit (1);}
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, 
 	ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L, 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
-#line 188 "sqlda.pgc"
+#line 185 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 188 "sqlda.pgc"
+#line 185 "sqlda.pgc"


 	dump_sqlda(outp_sqlda);

 	strcpy(msg, "deallocate");
 	{ ECPGdeallocate(__LINE__, 1, NULL, "st_id3");
-#line 193 "sqlda.pgc"
+#line 190 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 193 "sqlda.pgc"
+#line 190 "sqlda.pgc"


 	free(inp_sqlda->sqlvar);
@ -431,10 +428,10 @@ if (sqlca.sqlcode < 0) exit (1);}
 	 */

 	{ ECPGconnect(__LINE__, 1, "regress1" , NULL, NULL , "con2", 0); 
-#line 203 "sqlda.pgc"
+#line 200 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 203 "sqlda.pgc"
+#line 200 "sqlda.pgc"


 	/* Input sqlda has to be built manually */
@ -455,10 +452,10 @@ if (sqlca.sqlcode < 0) exit (1);}

 	strcpy(msg, "prepare");
 	{ ECPGprepare(__LINE__, "con2", 0, "st_id4", stmt2);
-#line 222 "sqlda.pgc"
+#line 219 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 222 "sqlda.pgc"
+#line 219 "sqlda.pgc"


 	strcpy(msg, "execute");
@ -467,28 +464,28 @@ if (sqlca.sqlcode < 0) exit (1);}
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, 
 	ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L, 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
-#line 225 "sqlda.pgc"
+#line 222 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 225 "sqlda.pgc"
+#line 222 "sqlda.pgc"


 	dump_sqlda(outp_sqlda);

 	strcpy(msg, "commit");
 	{ ECPGtrans(__LINE__, "con2", "commit");
-#line 230 "sqlda.pgc"
+#line 227 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 230 "sqlda.pgc"
+#line 227 "sqlda.pgc"


 	strcpy(msg, "deallocate");
 	{ ECPGdeallocate(__LINE__, 1, NULL, "st_id4");
-#line 233 "sqlda.pgc"
+#line 230 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 233 "sqlda.pgc"
+#line 230 "sqlda.pgc"


 	free(inp_sqlda->sqlvar);
@ -497,36 +494,36 @@ if (sqlca.sqlcode < 0) exit (1);}

 	strcpy(msg, "disconnect");
 	{ ECPGdisconnect(__LINE__, "con2");
-#line 240 "sqlda.pgc"
+#line 237 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 240 "sqlda.pgc"
+#line 237 "sqlda.pgc"


 	/* End test */

 	strcpy(msg, "drop");
 	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "drop table t1", ECPGt_EOIT, ECPGt_EORT);
-#line 245 "sqlda.pgc"
+#line 242 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 245 "sqlda.pgc"
+#line 242 "sqlda.pgc"


 	strcpy(msg, "commit");
 	{ ECPGtrans(__LINE__, NULL, "commit");
-#line 248 "sqlda.pgc"
+#line 245 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 248 "sqlda.pgc"
+#line 245 "sqlda.pgc"


 	strcpy(msg, "disconnect");
 	{ ECPGdisconnect(__LINE__, "CURRENT");
-#line 251 "sqlda.pgc"
+#line 248 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 251 "sqlda.pgc"
+#line 248 "sqlda.pgc"


 	return (0);
--- a/src/interfaces/ecpg/test/expected/compat_informix-sqlda.stderr
+++ b/src/interfaces/ecpg/test/expected/compat_informix-sqlda.stderr
@ -2,79 +2,79 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGconnect: opening database regress1 on <DEFAULT> port <DEFAULT>  
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 74: query: set datestyle to iso; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 71: query: set datestyle to iso; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 74: using PQexec
+[NO_PID]: ecpg_execute on line 71: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 74: OK: SET
+[NO_PID]: ecpg_execute on line 71: OK: SET
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 77: query: create table t1 ( id integer , t text , d1 numeric , d2 float8 , c char ( 10 ) ); with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 74: query: create table t1 ( id integer , t text , d1 numeric , d2 float8 , c char ( 10 ) ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 77: using PQexec
+[NO_PID]: ecpg_execute on line 74: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 77: OK: CREATE TABLE
+[NO_PID]: ecpg_execute on line 74: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 85: query: insert into t1 values ( 1 , 'a' , 1.0 , 1 , 'a' ) , ( 2 , null , null , null , null ) , ( 3 , '"c"' , - 3 , 'nan' :: float8 , 'c' ) , ( 4 , 'd' , 4.0 , 4 , 'd' ); with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 82: query: insert into t1 values ( 1 , 'a' , 1.0 , 1 , 'a' ) , ( 2 , null , null , null , null ) , ( 3 , '"c"' , - 3 , 'nan' :: float8 , 'c' ) , ( 4 , 'd' , 4.0 , 4 , 'd' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 85: using PQexec
+[NO_PID]: ecpg_execute on line 82: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 85: OK: INSERT 0 4
+[NO_PID]: ecpg_execute on line 82: OK: INSERT 0 4
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 92: action "commit"; connection "regress1"
+[NO_PID]: ECPGtrans on line 89: action "commit"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGprepare on line 99: name st_id1; query: "SELECT * FROM t1"
+[NO_PID]: ECPGprepare on line 96: name st_id1; query: "SELECT * FROM t1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 105: query: declare mycur1 cursor for SELECT * FROM t1; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 102: query: declare mycur1 cursor for SELECT * FROM t1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 105: using PQexec
+[NO_PID]: ecpg_execute on line 102: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 105: OK: DECLARE CURSOR
+[NO_PID]: ecpg_execute on line 102: OK: DECLARE CURSOR
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 113: query: fetch 1 from mycur1; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 110: query: fetch 1 from mycur1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 113: using PQexec
+[NO_PID]: ecpg_execute on line 110: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 113: correctly got 1 tuples with 5 fields
+[NO_PID]: ecpg_execute on line 110: correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_build_compat_sqlda sqld = 5
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 113: new sqlda was built
+[NO_PID]: ecpg_execute on line 110: new sqlda was built
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 0 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 113: RESULT: 1 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 110: RESULT: 1 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 1 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 113: RESULT: a offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 110: RESULT: a offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 2 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 113: RESULT: 1.0 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 110: RESULT: 1.0 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 3 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 113: RESULT: 1 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 110: RESULT: 1 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 4 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 113: RESULT: a          offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 110: RESULT: a          offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 113: putting result (1 tuple 5 fields) into sqlda descriptor
+[NO_PID]: ecpg_execute on line 110: putting result (1 tuple 5 fields) into sqlda descriptor
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 113: query: fetch 1 from mycur1; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 110: query: fetch 1 from mycur1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 113: using PQexec
+[NO_PID]: ecpg_execute on line 110: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 113: correctly got 1 tuples with 5 fields
+[NO_PID]: ecpg_execute on line 110: correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_build_compat_sqlda sqld = 5
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 113: new sqlda was built
+[NO_PID]: ecpg_execute on line 110: new sqlda was built
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 0 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 113: RESULT: 2 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 110: RESULT: 2 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 1 IS NULL
 [NO_PID]: sqlca: code: 0, state: 00000
@ -84,141 +84,141 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 4 IS NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 113: putting result (1 tuple 5 fields) into sqlda descriptor
+[NO_PID]: ecpg_execute on line 110: putting result (1 tuple 5 fields) into sqlda descriptor
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 113: query: fetch 1 from mycur1; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 110: query: fetch 1 from mycur1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 113: using PQexec
+[NO_PID]: ecpg_execute on line 110: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 113: correctly got 1 tuples with 5 fields
+[NO_PID]: ecpg_execute on line 110: correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_build_compat_sqlda sqld = 5
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 113: new sqlda was built
+[NO_PID]: ecpg_execute on line 110: new sqlda was built
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 0 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 113: RESULT: 3 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 110: RESULT: 3 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 1 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 113: RESULT: "c" offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 110: RESULT: "c" offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 2 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 113: RESULT: -3 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 110: RESULT: -3 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 3 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 113: RESULT: NaN offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 110: RESULT: NaN offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 4 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 113: RESULT: c          offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 110: RESULT: c          offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 113: putting result (1 tuple 5 fields) into sqlda descriptor
+[NO_PID]: ecpg_execute on line 110: putting result (1 tuple 5 fields) into sqlda descriptor
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 113: query: fetch 1 from mycur1; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 110: query: fetch 1 from mycur1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 113: using PQexec
+[NO_PID]: ecpg_execute on line 110: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 113: correctly got 1 tuples with 5 fields
+[NO_PID]: ecpg_execute on line 110: correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_build_compat_sqlda sqld = 5
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 113: new sqlda was built
+[NO_PID]: ecpg_execute on line 110: new sqlda was built
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 0 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 113: RESULT: 4 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 110: RESULT: 4 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 1 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 113: RESULT: d offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 110: RESULT: d offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 2 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 113: RESULT: 4.0 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 110: RESULT: 4.0 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 3 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 113: RESULT: 4 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 110: RESULT: 4 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 4 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 113: RESULT: d          offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 110: RESULT: d          offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 113: putting result (1 tuple 5 fields) into sqlda descriptor
+[NO_PID]: ecpg_execute on line 110: putting result (1 tuple 5 fields) into sqlda descriptor
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 113: query: fetch 1 from mycur1; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 110: query: fetch 1 from mycur1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 113: using PQexec
+[NO_PID]: ecpg_execute on line 110: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 113: correctly got 0 tuples with 5 fields
+[NO_PID]: ecpg_execute on line 110: correctly got 0 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: raising sqlcode 100 on line 113: no data found on line 113
+[NO_PID]: raising sqlcode 100 on line 110: no data found on line 110
 [NO_PID]: sqlca: code: 100, state: 02000
-[NO_PID]: ecpg_execute on line 122: query: close mycur1; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 119: query: close mycur1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 122: using PQexec
+[NO_PID]: ecpg_execute on line 119: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 122: OK: CLOSE CURSOR
+[NO_PID]: ecpg_execute on line 119: OK: CLOSE CURSOR
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGdeallocate on line 125: name st_id1
+[NO_PID]: ECPGdeallocate on line 122: name st_id1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGprepare on line 136: name st_id2; query: "SELECT * FROM t1"
+[NO_PID]: ECPGprepare on line 133: name st_id2; query: "SELECT * FROM t1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 142: query: declare mycur2 cursor for SELECT * FROM t1; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 139: query: declare mycur2 cursor for SELECT * FROM t1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 142: using PQexec
+[NO_PID]: ecpg_execute on line 139: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 142: OK: DECLARE CURSOR
+[NO_PID]: ecpg_execute on line 139: OK: DECLARE CURSOR
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: query: fetch from mycur2; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 147: query: fetch from mycur2; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: using PQexec
+[NO_PID]: ecpg_execute on line 147: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: correctly got 1 tuples with 5 fields
+[NO_PID]: ecpg_execute on line 147: correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_build_compat_sqlda sqld = 5
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: new sqlda was built
+[NO_PID]: ecpg_execute on line 147: new sqlda was built
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 0 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: 1 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 147: RESULT: 1 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 1 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: a offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 147: RESULT: a offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 2 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: 1.0 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 147: RESULT: 1.0 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 3 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: 1 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 147: RESULT: 1 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 4 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: a          offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 147: RESULT: a          offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: putting result (1 tuple 5 fields) into sqlda descriptor
+[NO_PID]: ecpg_execute on line 147: putting result (1 tuple 5 fields) into sqlda descriptor
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: query: fetch from mycur2; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 147: query: fetch from mycur2; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: using PQexec
+[NO_PID]: ecpg_execute on line 147: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: correctly got 1 tuples with 5 fields
+[NO_PID]: ecpg_execute on line 147: correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_build_compat_sqlda sqld = 5
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: new sqlda was built
+[NO_PID]: ecpg_execute on line 147: new sqlda was built
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 0 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: 2 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 147: RESULT: 2 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 1 IS NULL
 [NO_PID]: sqlca: code: 0, state: 00000
@ -228,177 +228,177 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 4 IS NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: putting result (1 tuple 5 fields) into sqlda descriptor
+[NO_PID]: ecpg_execute on line 147: putting result (1 tuple 5 fields) into sqlda descriptor
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: query: fetch from mycur2; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 147: query: fetch from mycur2; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: using PQexec
+[NO_PID]: ecpg_execute on line 147: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: correctly got 1 tuples with 5 fields
+[NO_PID]: ecpg_execute on line 147: correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_build_compat_sqlda sqld = 5
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: new sqlda was built
+[NO_PID]: ecpg_execute on line 147: new sqlda was built
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 0 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: 3 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 147: RESULT: 3 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 1 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: "c" offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 147: RESULT: "c" offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 2 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: -3 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 147: RESULT: -3 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 3 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: NaN offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 147: RESULT: NaN offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 4 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: c          offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 147: RESULT: c          offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: putting result (1 tuple 5 fields) into sqlda descriptor
+[NO_PID]: ecpg_execute on line 147: putting result (1 tuple 5 fields) into sqlda descriptor
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: query: fetch from mycur2; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 147: query: fetch from mycur2; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: using PQexec
+[NO_PID]: ecpg_execute on line 147: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: correctly got 1 tuples with 5 fields
+[NO_PID]: ecpg_execute on line 147: correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_build_compat_sqlda sqld = 5
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: new sqlda was built
+[NO_PID]: ecpg_execute on line 147: new sqlda was built
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 0 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: 4 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 147: RESULT: 4 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 1 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: d offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 147: RESULT: d offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 2 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: 4.0 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 147: RESULT: 4.0 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 3 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: 4 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 147: RESULT: 4 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 4 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: d          offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 147: RESULT: d          offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: putting result (1 tuple 5 fields) into sqlda descriptor
+[NO_PID]: ecpg_execute on line 147: putting result (1 tuple 5 fields) into sqlda descriptor
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: query: fetch from mycur2; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 147: query: fetch from mycur2; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: using PQexec
+[NO_PID]: ecpg_execute on line 147: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: correctly got 0 tuples with 5 fields
+[NO_PID]: ecpg_execute on line 147: correctly got 0 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: raising sqlcode 100 on line 150: no data found on line 150
+[NO_PID]: raising sqlcode 100 on line 147: no data found on line 147
 [NO_PID]: sqlca: code: 100, state: 02000
-[NO_PID]: ecpg_execute on line 159: query: close mycur2; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 156: query: close mycur2; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 159: using PQexec
+[NO_PID]: ecpg_execute on line 156: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 159: OK: CLOSE CURSOR
+[NO_PID]: ecpg_execute on line 156: OK: CLOSE CURSOR
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGdeallocate on line 162: name st_id2
+[NO_PID]: ECPGdeallocate on line 159: name st_id2
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGprepare on line 185: name st_id3; query: "SELECT * FROM t1 WHERE id = $1"
+[NO_PID]: ECPGprepare on line 182: name st_id3; query: "SELECT * FROM t1 WHERE id = $1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 188: query: SELECT * FROM t1 WHERE id = $1; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 185: query: SELECT * FROM t1 WHERE id = $1; with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 188: using PQexecPrepared for "SELECT * FROM t1 WHERE id = $1"
+[NO_PID]: ecpg_execute on line 185: using PQexecPrepared for "SELECT * FROM t1 WHERE id = $1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: free_params on line 188: parameter 1 = 4
+[NO_PID]: free_params on line 185: parameter 1 = 4
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 188: correctly got 1 tuples with 5 fields
+[NO_PID]: ecpg_execute on line 185: correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_build_compat_sqlda sqld = 5
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 188: new sqlda was built
+[NO_PID]: ecpg_execute on line 185: new sqlda was built
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 0 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 188: RESULT: 4 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 185: RESULT: 4 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 1 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 188: RESULT: d offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 185: RESULT: d offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 2 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 188: RESULT: 4.0 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 185: RESULT: 4.0 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 3 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 188: RESULT: 4 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 185: RESULT: 4 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 4 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 188: RESULT: d          offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 185: RESULT: d          offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 188: putting result (1 tuple 5 fields) into sqlda descriptor
+[NO_PID]: ecpg_execute on line 185: putting result (1 tuple 5 fields) into sqlda descriptor
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGdeallocate on line 193: name st_id3
+[NO_PID]: ECPGdeallocate on line 190: name st_id3
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGconnect: opening database regress1 on <DEFAULT> port <DEFAULT>  
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGprepare on line 222: name st_id4; query: "SELECT * FROM t1 WHERE id = $1"
+[NO_PID]: ECPGprepare on line 219: name st_id4; query: "SELECT * FROM t1 WHERE id = $1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 225: query: SELECT * FROM t1 WHERE id = $1; with 1 parameter(s) on connection con2
+[NO_PID]: ecpg_execute on line 222: query: SELECT * FROM t1 WHERE id = $1; with 1 parameter(s) on connection con2
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 225: using PQexecPrepared for "SELECT * FROM t1 WHERE id = $1"
+[NO_PID]: ecpg_execute on line 222: using PQexecPrepared for "SELECT * FROM t1 WHERE id = $1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: free_params on line 225: parameter 1 = 4
+[NO_PID]: free_params on line 222: parameter 1 = 4
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 225: correctly got 1 tuples with 5 fields
+[NO_PID]: ecpg_execute on line 222: correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_build_compat_sqlda sqld = 5
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 225: new sqlda was built
+[NO_PID]: ecpg_execute on line 222: new sqlda was built
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 0 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 225: RESULT: 4 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 222: RESULT: 4 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 1 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 225: RESULT: d offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 222: RESULT: d offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 2 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 225: RESULT: 4.0 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 222: RESULT: 4.0 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 3 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 225: RESULT: 4 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 222: RESULT: 4 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_compat_sqlda row 0 col 4 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 225: RESULT: d          offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 222: RESULT: d          offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 225: putting result (1 tuple 5 fields) into sqlda descriptor
+[NO_PID]: ecpg_execute on line 222: putting result (1 tuple 5 fields) into sqlda descriptor
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 230: action "commit"; connection "con2"
+[NO_PID]: ECPGtrans on line 227: action "commit"; connection "con2"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGdeallocate on line 233: name st_id4
+[NO_PID]: ECPGdeallocate on line 230: name st_id4
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_finish: connection con2 closed
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 245: query: drop table t1; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 242: query: drop table t1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 245: using PQexec
+[NO_PID]: ecpg_execute on line 242: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 245: OK: DROP TABLE
+[NO_PID]: ecpg_execute on line 242: OK: DROP TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 248: action "commit"; connection "regress1"
+[NO_PID]: ECPGtrans on line 245: action "commit"; connection "regress1"
 [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-sqlda.c
+++ b/src/interfaces/ecpg/test/expected/sql-sqlda.c
@ -9,7 +9,6 @@
 #line 1 "sqlda.pgc"
 #include <stdlib.h>
 #include <string.h>
-#include <inttypes.h>
 #include <limits.h>


@ -20,7 +19,7 @@



-#line 6 "sqlda.pgc"
+#line 5 "sqlda.pgc"



@ -44,7 +43,7 @@ typedef struct sqlda_struct	sqlda_t;

 #endif /* ECPG_SQLDA_H */

-#line 8 "sqlda.pgc"
+#line 7 "sqlda.pgc"


 #line 1 "pgtypes_numeric.h"
@ -115,11 +114,11 @@ int			PGTYPESnumeric_from_decimal(decimal *, numeric *);

 #endif   /* PGTYPES_NUMERIC */

-#line 9 "sqlda.pgc"
+#line 8 "sqlda.pgc"


 /* exec sql whenever sqlerror  stop ; */
-#line 11 "sqlda.pgc"
+#line 10 "sqlda.pgc"


 /* These shouldn't be under DECLARE SECTION */
@ -149,13 +148,6 @@ dump_sqlda(sqlda_t *sqlda)
 		case ECPGt_int:
 			printf("name sqlda descriptor: '%s' value %d\n", sqlda->sqlvar[i].sqlname.data, *(int *)sqlda->sqlvar[i].sqldata);
 			break;
-#ifdef HAVE_LONG_LONG_INT_64
-		case ECPGt_long_long:
-#else
-		case ECPGt_long:
-#endif
-			printf("name sqlda descriptor: '%s' value " INT64_FORMAT "\n", sqlda->sqlvar[i].sqlname.data, *(int64_t *)sqlda->sqlvar[i].sqldata);
-			break;
 		case ECPGt_double:
 			printf("name sqlda descriptor: '%s' value %lf\n", sqlda->sqlvar[i].sqlname.data, *(double *)sqlda->sqlvar[i].sqldata);
 			break;
@ -181,19 +173,19 @@ main (void)
 		
 		

-#line 67 "sqlda.pgc"
+#line 59 "sqlda.pgc"
 char * stmt1 = "SELECT * FROM t1" ;
 
-#line 68 "sqlda.pgc"
+#line 60 "sqlda.pgc"
 char * stmt2 = "SELECT * FROM t1 WHERE id = ?" ;
 
-#line 69 "sqlda.pgc"
+#line 61 "sqlda.pgc"
 int rec ;
 
-#line 70 "sqlda.pgc"
+#line 62 "sqlda.pgc"
 int id ;
 /* exec sql end declare section */
-#line 71 "sqlda.pgc"
+#line 63 "sqlda.pgc"


 	char msg[128];
@ -202,42 +194,42 @@ main (void)

 	strcpy(msg, "connect");
 	{ ECPGconnect(__LINE__, 0, "regress1" , NULL, NULL , "regress1", 0); 
-#line 78 "sqlda.pgc"
+#line 70 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 78 "sqlda.pgc"
+#line 70 "sqlda.pgc"


 	strcpy(msg, "set");
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "set datestyle to iso", ECPGt_EOIT, ECPGt_EORT);
-#line 81 "sqlda.pgc"
+#line 73 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 81 "sqlda.pgc"
+#line 73 "sqlda.pgc"


 	strcpy(msg, "create");
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table t1 ( id integer , t text , d1 numeric , d2 float8 , c char ( 10 ) )", ECPGt_EOIT, ECPGt_EORT);
-#line 89 "sqlda.pgc"
+#line 81 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 89 "sqlda.pgc"
+#line 81 "sqlda.pgc"


 	strcpy(msg, "insert");
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into t1 values ( 1 , 'a' , 1.0 , 1 , 'a' ) , ( 2 , null , null , null , null ) , ( 3 , '\"c\"' , - 3 , 'nan' :: float8 , 'c' ) , ( 4 , 'd' , 4.0 , 4 , 'd' )", ECPGt_EOIT, ECPGt_EORT);
-#line 96 "sqlda.pgc"
+#line 88 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 96 "sqlda.pgc"
+#line 88 "sqlda.pgc"


 	strcpy(msg, "commit");
 	{ ECPGtrans(__LINE__, NULL, "commit");
-#line 99 "sqlda.pgc"
+#line 91 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 99 "sqlda.pgc"
+#line 91 "sqlda.pgc"


 	/* SQLDA test for getting all records from a table */
@ -246,29 +238,29 @@ if (sqlca.sqlcode < 0) exit (1);}

 	strcpy(msg, "prepare");
 	{ ECPGprepare(__LINE__, NULL, 0, "st_id1", stmt1);
-#line 106 "sqlda.pgc"
+#line 98 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 106 "sqlda.pgc"
+#line 98 "sqlda.pgc"


 	strcpy(msg, "declare");
 	/* declare mycur1 cursor for $1 */
-#line 109 "sqlda.pgc"
+#line 101 "sqlda.pgc"


 	strcpy(msg, "open");
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare mycur1 cursor for $1", 
 	ECPGt_char_variable,(ECPGprepared_statement(NULL, "st_id1", __LINE__)),(long)1,(long)1,(1)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
-#line 112 "sqlda.pgc"
+#line 104 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 112 "sqlda.pgc"
+#line 104 "sqlda.pgc"


 	/* exec sql whenever not found  break ; */
-#line 114 "sqlda.pgc"
+#line 106 "sqlda.pgc"


 	rec = 0;
@ -278,13 +270,13 @@ if (sqlca.sqlcode < 0) exit (1);}
 		{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "fetch 1 from mycur1", ECPGt_EOIT, 
 	ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L, 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
-#line 120 "sqlda.pgc"
+#line 112 "sqlda.pgc"

 if (sqlca.sqlcode == ECPG_NOT_FOUND) break;
-#line 120 "sqlda.pgc"
+#line 112 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 120 "sqlda.pgc"
+#line 112 "sqlda.pgc"
 

 		printf("FETCH RECORD %d\n", ++rec);
@ -292,23 +284,23 @@ if (sqlca.sqlcode < 0) exit (1);}
 	}

 	/* exec sql whenever not found  continue ; */
-#line 126 "sqlda.pgc"
+#line 118 "sqlda.pgc"


 	strcpy(msg, "close");
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "close mycur1", ECPGt_EOIT, ECPGt_EORT);
-#line 129 "sqlda.pgc"
+#line 121 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 129 "sqlda.pgc"
+#line 121 "sqlda.pgc"


 	strcpy(msg, "deallocate");
 	{ ECPGdeallocate(__LINE__, 0, NULL, "st_id1");
-#line 132 "sqlda.pgc"
+#line 124 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 132 "sqlda.pgc"
+#line 124 "sqlda.pgc"


 	free(outp_sqlda);
@ -319,35 +311,35 @@ if (sqlca.sqlcode < 0) exit (1);}

 	strcpy(msg, "prepare");
 	{ ECPGprepare(__LINE__, NULL, 0, "st_id2", stmt1);
-#line 141 "sqlda.pgc"
+#line 133 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 141 "sqlda.pgc"
+#line 133 "sqlda.pgc"


 	strcpy(msg, "declare");
 	/* declare mycur2 cursor for $1 */
-#line 144 "sqlda.pgc"
+#line 136 "sqlda.pgc"


 	strcpy(msg, "open");
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare mycur2 cursor for $1", 
 	ECPGt_char_variable,(ECPGprepared_statement(NULL, "st_id2", __LINE__)),(long)1,(long)1,(1)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
-#line 147 "sqlda.pgc"
+#line 139 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 147 "sqlda.pgc"
+#line 139 "sqlda.pgc"


 	strcpy(msg, "fetch");
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "fetch all from mycur2", ECPGt_EOIT, 
 	ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L, 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
-#line 150 "sqlda.pgc"
+#line 142 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 150 "sqlda.pgc"
+#line 142 "sqlda.pgc"


 	outp_sqlda1 = outp_sqlda;
@ -365,18 +357,18 @@ if (sqlca.sqlcode < 0) exit (1);}

 	strcpy(msg, "close");
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "close mycur2", ECPGt_EOIT, ECPGt_EORT);
-#line 166 "sqlda.pgc"
+#line 158 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 166 "sqlda.pgc"
+#line 158 "sqlda.pgc"


 	strcpy(msg, "deallocate");
 	{ ECPGdeallocate(__LINE__, 0, NULL, "st_id2");
-#line 169 "sqlda.pgc"
+#line 161 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 169 "sqlda.pgc"
+#line 161 "sqlda.pgc"


 	/* SQLDA test for getting one record using an input descriptor */
@ -400,10 +392,10 @@ if (sqlca.sqlcode < 0) exit (1);}

 	strcpy(msg, "prepare");
 	{ ECPGprepare(__LINE__, NULL, 0, "st_id3", stmt2);
-#line 191 "sqlda.pgc"
+#line 183 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 191 "sqlda.pgc"
+#line 183 "sqlda.pgc"


 	strcpy(msg, "execute");
@ -412,20 +404,20 @@ if (sqlca.sqlcode < 0) exit (1);}
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, 
 	ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L, 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
-#line 194 "sqlda.pgc"
+#line 186 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 194 "sqlda.pgc"
+#line 186 "sqlda.pgc"


 	dump_sqlda(outp_sqlda);

 	strcpy(msg, "deallocate");
 	{ ECPGdeallocate(__LINE__, 0, NULL, "st_id3");
-#line 199 "sqlda.pgc"
+#line 191 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 199 "sqlda.pgc"
+#line 191 "sqlda.pgc"


 	free(inp_sqlda);
@ -436,10 +428,10 @@ if (sqlca.sqlcode < 0) exit (1);}
 	 */

 	{ ECPGconnect(__LINE__, 0, "regress1" , NULL, NULL , "con2", 0); 
-#line 208 "sqlda.pgc"
+#line 200 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 208 "sqlda.pgc"
+#line 200 "sqlda.pgc"


 	/*
@ -461,10 +453,10 @@ if (sqlca.sqlcode < 0) exit (1);}

 	strcpy(msg, "prepare");
 	{ ECPGprepare(__LINE__, "con2", 0, "st_id4", stmt2);
-#line 228 "sqlda.pgc"
+#line 220 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 228 "sqlda.pgc"
+#line 220 "sqlda.pgc"


 	strcpy(msg, "execute");
@ -473,28 +465,28 @@ if (sqlca.sqlcode < 0) exit (1);}
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, 
 	ECPGt_sqlda, &outp_sqlda, 0L, 0L, 0L, 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
-#line 231 "sqlda.pgc"
+#line 223 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 231 "sqlda.pgc"
+#line 223 "sqlda.pgc"


 	dump_sqlda(outp_sqlda);

 	strcpy(msg, "commit");
 	{ ECPGtrans(__LINE__, "con2", "commit");
-#line 236 "sqlda.pgc"
+#line 228 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 236 "sqlda.pgc"
+#line 228 "sqlda.pgc"


 	strcpy(msg, "deallocate");
 	{ ECPGdeallocate(__LINE__, 0, NULL, "st_id4");
-#line 239 "sqlda.pgc"
+#line 231 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 239 "sqlda.pgc"
+#line 231 "sqlda.pgc"


 	free(inp_sqlda);
@ -502,36 +494,36 @@ if (sqlca.sqlcode < 0) exit (1);}

 	strcpy(msg, "disconnect");
 	{ ECPGdisconnect(__LINE__, "con2");
-#line 245 "sqlda.pgc"
+#line 237 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 245 "sqlda.pgc"
+#line 237 "sqlda.pgc"


 	/* End test */

 	strcpy(msg, "drop");
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table t1", ECPGt_EOIT, ECPGt_EORT);
-#line 250 "sqlda.pgc"
+#line 242 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 250 "sqlda.pgc"
+#line 242 "sqlda.pgc"


 	strcpy(msg, "commit");
 	{ ECPGtrans(__LINE__, NULL, "commit");
-#line 253 "sqlda.pgc"
+#line 245 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 253 "sqlda.pgc"
+#line 245 "sqlda.pgc"


 	strcpy(msg, "disconnect");
 	{ ECPGdisconnect(__LINE__, "CURRENT");
-#line 256 "sqlda.pgc"
+#line 248 "sqlda.pgc"

 if (sqlca.sqlcode < 0) exit (1);}
-#line 256 "sqlda.pgc"
+#line 248 "sqlda.pgc"


 	return (0);
--- a/src/interfaces/ecpg/test/expected/sql-sqlda.stderr
+++ b/src/interfaces/ecpg/test/expected/sql-sqlda.stderr
@ -2,77 +2,77 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGconnect: opening database regress1 on <DEFAULT> port <DEFAULT>  
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 81: query: set datestyle to iso; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 73: query: set datestyle to iso; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 81: using PQexec
+[NO_PID]: ecpg_execute on line 73: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 81: OK: SET
+[NO_PID]: ecpg_execute on line 73: OK: SET
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 84: query: create table t1 ( id integer , t text , d1 numeric , d2 float8 , c char ( 10 ) ); with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 76: query: create table t1 ( id integer , t text , d1 numeric , d2 float8 , c char ( 10 ) ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 84: using PQexec
+[NO_PID]: ecpg_execute on line 76: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 84: OK: CREATE TABLE
+[NO_PID]: ecpg_execute on line 76: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 92: query: insert into t1 values ( 1 , 'a' , 1.0 , 1 , 'a' ) , ( 2 , null , null , null , null ) , ( 3 , '"c"' , - 3 , 'nan' :: float8 , 'c' ) , ( 4 , 'd' , 4.0 , 4 , 'd' ); with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 84: query: insert into t1 values ( 1 , 'a' , 1.0 , 1 , 'a' ) , ( 2 , null , null , null , null ) , ( 3 , '"c"' , - 3 , 'nan' :: float8 , 'c' ) , ( 4 , 'd' , 4.0 , 4 , 'd' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 92: using PQexec
+[NO_PID]: ecpg_execute on line 84: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 92: OK: INSERT 0 4
+[NO_PID]: ecpg_execute on line 84: OK: INSERT 0 4
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 99: action "commit"; connection "regress1"
+[NO_PID]: ECPGtrans on line 91: action "commit"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGprepare on line 106: name st_id1; query: "SELECT * FROM t1"
+[NO_PID]: ECPGprepare on line 98: name st_id1; query: "SELECT * FROM t1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 112: query: declare mycur1 cursor for SELECT * FROM t1; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 104: query: declare mycur1 cursor for SELECT * FROM t1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 112: using PQexec
+[NO_PID]: ecpg_execute on line 104: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 112: OK: DECLARE CURSOR
+[NO_PID]: ecpg_execute on line 104: OK: DECLARE CURSOR
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 120: query: fetch 1 from mycur1; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 112: query: fetch 1 from mycur1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 120: using PQexec
+[NO_PID]: ecpg_execute on line 112: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 120: correctly got 1 tuples with 5 fields
+[NO_PID]: ecpg_execute on line 112: correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_build_native_sqlda sqld = 5
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 120: new sqlda was built
+[NO_PID]: ecpg_execute on line 112: new sqlda was built
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 0 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 120: RESULT: 1 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 112: RESULT: 1 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 1 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 120: RESULT: a offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 112: RESULT: a offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 2 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 3 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 120: RESULT: 1 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 112: RESULT: 1 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 4 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 120: RESULT: a          offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 112: RESULT: a          offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 120: putting result (1 tuple 5 fields) into sqlda descriptor
+[NO_PID]: ecpg_execute on line 112: putting result (1 tuple 5 fields) into sqlda descriptor
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 120: query: fetch 1 from mycur1; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 112: query: fetch 1 from mycur1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 120: using PQexec
+[NO_PID]: ecpg_execute on line 112: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 120: correctly got 1 tuples with 5 fields
+[NO_PID]: ecpg_execute on line 112: correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_build_native_sqlda sqld = 5
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 120: new sqlda was built
+[NO_PID]: ecpg_execute on line 112: new sqlda was built
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 0 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 120: RESULT: 2 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 112: RESULT: 2 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 1 IS NULL
 [NO_PID]: sqlca: code: 0, state: 00000
@ -82,153 +82,153 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 4 IS NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 120: putting result (1 tuple 5 fields) into sqlda descriptor
+[NO_PID]: ecpg_execute on line 112: putting result (1 tuple 5 fields) into sqlda descriptor
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 120: query: fetch 1 from mycur1; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 112: query: fetch 1 from mycur1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 120: using PQexec
+[NO_PID]: ecpg_execute on line 112: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 120: correctly got 1 tuples with 5 fields
+[NO_PID]: ecpg_execute on line 112: correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_build_native_sqlda sqld = 5
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 120: new sqlda was built
+[NO_PID]: ecpg_execute on line 112: new sqlda was built
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 0 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 120: RESULT: 3 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 112: RESULT: 3 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 1 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 120: RESULT: "c" offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 112: RESULT: "c" offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 2 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 3 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 120: RESULT: NaN offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 112: RESULT: NaN offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 4 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 120: RESULT: c          offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 112: RESULT: c          offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 120: putting result (1 tuple 5 fields) into sqlda descriptor
+[NO_PID]: ecpg_execute on line 112: putting result (1 tuple 5 fields) into sqlda descriptor
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 120: query: fetch 1 from mycur1; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 112: query: fetch 1 from mycur1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 120: using PQexec
+[NO_PID]: ecpg_execute on line 112: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 120: correctly got 1 tuples with 5 fields
+[NO_PID]: ecpg_execute on line 112: correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_build_native_sqlda sqld = 5
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 120: new sqlda was built
+[NO_PID]: ecpg_execute on line 112: new sqlda was built
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 0 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 120: RESULT: 4 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 112: RESULT: 4 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 1 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 120: RESULT: d offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 112: RESULT: d offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 2 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 3 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 120: RESULT: 4 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 112: RESULT: 4 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 4 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 120: RESULT: d          offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 112: RESULT: d          offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 120: putting result (1 tuple 5 fields) into sqlda descriptor
+[NO_PID]: ecpg_execute on line 112: putting result (1 tuple 5 fields) into sqlda descriptor
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 120: query: fetch 1 from mycur1; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 112: query: fetch 1 from mycur1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 120: using PQexec
+[NO_PID]: ecpg_execute on line 112: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 120: correctly got 0 tuples with 5 fields
+[NO_PID]: ecpg_execute on line 112: correctly got 0 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: raising sqlcode 100 on line 120: no data found on line 120
+[NO_PID]: raising sqlcode 100 on line 112: no data found on line 112
 [NO_PID]: sqlca: code: 100, state: 02000
-[NO_PID]: ecpg_execute on line 129: query: close mycur1; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 121: query: close mycur1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 129: using PQexec
+[NO_PID]: ecpg_execute on line 121: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 129: OK: CLOSE CURSOR
+[NO_PID]: ecpg_execute on line 121: OK: CLOSE CURSOR
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGdeallocate on line 132: name st_id1
+[NO_PID]: ECPGdeallocate on line 124: name st_id1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGprepare on line 141: name st_id2; query: "SELECT * FROM t1"
+[NO_PID]: ECPGprepare on line 133: name st_id2; query: "SELECT * FROM t1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 147: query: declare mycur2 cursor for SELECT * FROM t1; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 139: query: declare mycur2 cursor for SELECT * FROM t1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 147: using PQexec
+[NO_PID]: ecpg_execute on line 139: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 147: OK: DECLARE CURSOR
+[NO_PID]: ecpg_execute on line 139: OK: DECLARE CURSOR
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: query: fetch all from mycur2; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 142: query: fetch all from mycur2; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: using PQexec
+[NO_PID]: ecpg_execute on line 142: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: correctly got 4 tuples with 5 fields
+[NO_PID]: ecpg_execute on line 142: correctly got 4 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_build_native_sqlda sqld = 5
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: new sqlda was built
+[NO_PID]: ecpg_execute on line 142: new sqlda was built
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 3 col 0 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: 4 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 142: RESULT: 4 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 3 col 1 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: d offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 142: RESULT: d offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 3 col 2 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 3 col 3 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: 4 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 142: RESULT: 4 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 3 col 4 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: d          offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 142: RESULT: d          offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: putting result (1 tuple 5 fields) into sqlda descriptor
+[NO_PID]: ecpg_execute on line 142: putting result (1 tuple 5 fields) into sqlda descriptor
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_build_native_sqlda sqld = 5
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: new sqlda was built
+[NO_PID]: ecpg_execute on line 142: new sqlda was built
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 2 col 0 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: 3 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 142: RESULT: 3 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 2 col 1 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: "c" offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 142: RESULT: "c" offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 2 col 2 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 2 col 3 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: NaN offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 142: RESULT: NaN offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 2 col 4 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: c          offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 142: RESULT: c          offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: putting result (1 tuple 5 fields) into sqlda descriptor
+[NO_PID]: ecpg_execute on line 142: putting result (1 tuple 5 fields) into sqlda descriptor
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_build_native_sqlda sqld = 5
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: new sqlda was built
+[NO_PID]: ecpg_execute on line 142: new sqlda was built
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 1 col 0 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: 2 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 142: RESULT: 2 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 1 col 1 IS NULL
 [NO_PID]: sqlca: code: 0, state: 00000
@ -238,125 +238,125 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 1 col 4 IS NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: putting result (1 tuple 5 fields) into sqlda descriptor
+[NO_PID]: ecpg_execute on line 142: putting result (1 tuple 5 fields) into sqlda descriptor
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_build_native_sqlda sqld = 5
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: new sqlda was built
+[NO_PID]: ecpg_execute on line 142: new sqlda was built
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 0 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: 1 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 142: RESULT: 1 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 1 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: a offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 142: RESULT: a offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 2 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 3 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: 1 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 142: RESULT: 1 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 4 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 150: RESULT: a          offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 142: RESULT: a          offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 150: putting result (1 tuple 5 fields) into sqlda descriptor
+[NO_PID]: ecpg_execute on line 142: putting result (1 tuple 5 fields) into sqlda descriptor
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 166: query: close mycur2; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 158: query: close mycur2; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 166: using PQexec
+[NO_PID]: ecpg_execute on line 158: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 166: OK: CLOSE CURSOR
+[NO_PID]: ecpg_execute on line 158: OK: CLOSE CURSOR
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGdeallocate on line 169: name st_id2
+[NO_PID]: ECPGdeallocate on line 161: name st_id2
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGprepare on line 191: name st_id3; query: "SELECT * FROM t1 WHERE id = $1"
+[NO_PID]: ECPGprepare on line 183: name st_id3; query: "SELECT * FROM t1 WHERE id = $1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 194: query: SELECT * FROM t1 WHERE id = $1; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 186: query: SELECT * FROM t1 WHERE id = $1; with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 194: using PQexecPrepared for "SELECT * FROM t1 WHERE id = $1"
+[NO_PID]: ecpg_execute on line 186: using PQexecPrepared for "SELECT * FROM t1 WHERE id = $1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: free_params on line 194: parameter 1 = 4
+[NO_PID]: free_params on line 186: parameter 1 = 4
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 194: correctly got 1 tuples with 5 fields
+[NO_PID]: ecpg_execute on line 186: correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_build_native_sqlda sqld = 5
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 194: new sqlda was built
+[NO_PID]: ecpg_execute on line 186: new sqlda was built
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 0 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 194: RESULT: 4 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 186: RESULT: 4 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 1 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 194: RESULT: d offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 186: RESULT: d offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 2 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 3 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 194: RESULT: 4 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 186: RESULT: 4 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 4 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 194: RESULT: d          offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 186: RESULT: d          offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 194: putting result (1 tuple 5 fields) into sqlda descriptor
+[NO_PID]: ecpg_execute on line 186: putting result (1 tuple 5 fields) into sqlda descriptor
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGdeallocate on line 199: name st_id3
+[NO_PID]: ECPGdeallocate on line 191: name st_id3
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGconnect: opening database regress1 on <DEFAULT> port <DEFAULT>  
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGprepare on line 228: name st_id4; query: "SELECT * FROM t1 WHERE id = $1"
+[NO_PID]: ECPGprepare on line 220: name st_id4; query: "SELECT * FROM t1 WHERE id = $1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 231: query: SELECT * FROM t1 WHERE id = $1; with 1 parameter(s) on connection con2
+[NO_PID]: ecpg_execute on line 223: query: SELECT * FROM t1 WHERE id = $1; with 1 parameter(s) on connection con2
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 231: using PQexecPrepared for "SELECT * FROM t1 WHERE id = $1"
+[NO_PID]: ecpg_execute on line 223: using PQexecPrepared for "SELECT * FROM t1 WHERE id = $1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: free_params on line 231: parameter 1 = 4
+[NO_PID]: free_params on line 223: parameter 1 = 4
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 231: correctly got 1 tuples with 5 fields
+[NO_PID]: ecpg_execute on line 223: correctly got 1 tuples with 5 fields
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_build_native_sqlda sqld = 5
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 231: new sqlda was built
+[NO_PID]: ecpg_execute on line 223: new sqlda was built
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 0 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 231: RESULT: 4 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 223: RESULT: 4 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 1 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 231: RESULT: d offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 223: RESULT: d offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 2 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 3 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 231: RESULT: 4 offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 223: RESULT: 4 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_set_native_sqlda row 0 col 4 IS NOT NULL
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_get_data on line 231: RESULT: d          offset: -1; array: yes
+[NO_PID]: ecpg_get_data on line 223: RESULT: d          offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 231: putting result (1 tuple 5 fields) into sqlda descriptor
+[NO_PID]: ecpg_execute on line 223: putting result (1 tuple 5 fields) into sqlda descriptor
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 236: action "commit"; connection "con2"
+[NO_PID]: ECPGtrans on line 228: action "commit"; connection "con2"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGdeallocate on line 239: name st_id4
+[NO_PID]: ECPGdeallocate on line 231: name st_id4
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_finish: connection con2 closed
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 250: query: drop table t1; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 242: query: drop table t1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 250: using PQexec
+[NO_PID]: ecpg_execute on line 242: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 250: OK: DROP TABLE
+[NO_PID]: ecpg_execute on line 242: OK: DROP TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 253: action "commit"; connection "regress1"
+[NO_PID]: ECPGtrans on line 245: action "commit"; connection "regress1"
 [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/sql/sqlda.pgc
+++ b/src/interfaces/ecpg/test/sql/sqlda.pgc
@ -1,6 +1,5 @@
 #include <stdlib.h>
 #include <string.h>
-#include <inttypes.h>
 #include <limits.h>

 exec sql include ../regression;
@ -37,13 +36,6 @@ dump_sqlda(sqlda_t *sqlda)
 		case ECPGt_int:
 			printf("name sqlda descriptor: '%s' value %d\n", sqlda->sqlvar[i].sqlname.data, *(int *)sqlda->sqlvar[i].sqldata);
 			break;
-#ifdef HAVE_LONG_LONG_INT_64
-		case ECPGt_long_long:
-#else
-		case ECPGt_long:
-#endif
-			printf("name sqlda descriptor: '%s' value " INT64_FORMAT "\n", sqlda->sqlvar[i].sqlname.data, *(int64_t *)sqlda->sqlvar[i].sqldata);
-			break;
 		case ECPGt_double:
 			printf("name sqlda descriptor: '%s' value %lf\n", sqlda->sqlvar[i].sqlname.data, *(double *)sqlda->sqlvar[i].sqldata);
 			break;