First rounf of whitespace changes. Everything but connect-test1 should be fine.

src/interfaces/ecpg/preproc/ecpg.addons

-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.addons,v 1.1 2008/11/14 10:03:33 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.addons,v 1.2 2008/12/29 17:07:05 meskes Exp $ */
 
 ECPG: stmtClosePortalStmt block
 	{
@@ -207,7 +207,7 @@ ECPG: ConstraintAttributeSpecConstraintTimeSpecConstraintDeferrabilitySpec addon
 				mmerror(PARSE_ERROR, ET_ERROR, "INITIALLY DEFERRED constraint must be DEFERRABLE\n");
 ECPG: var_valueNumericOnly addon
 ECPG: fetch_directionSignedIconst addon
-		if ($1[1] == '$')
+		if ($1[0] == '$')
 		{
 			free($1);
 			$1 = make_str("$0");
@@ -216,7 +216,7 @@ ECPG: fetch_directionABSOLUTE_PSignedIconst addon
 ECPG: fetch_directionRELATIVE_PSignedIconst addon
 ECPG: fetch_directionFORWARDSignedIconst addon
 ECPG: fetch_directionBACKWARDSignedIconst addon
-		if ($2[1] == '$')
+		if ($2[0] == '$')
 		{
 			free($2);
 			$2 = make_str("$0");

src/interfaces/ecpg/preproc/ecpg.header

-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.header,v 1.3 2008/11/26 08:45:12 petere Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/ecpg.header,v 1.4 2008/12/29 17:07:05 meskes Exp $ */
 
 /* Copyright comment */
 %{
@@ -111,7 +111,8 @@ cat2_str(char *str1, char *str2)
 	char * res_str	= (char *)mm_alloc(strlen(str1) + strlen(str2) + 2);
 
 	strcpy(res_str, str1);
-	strcat(res_str, " ");
+	if (strlen(str1) != 0 && strlen(str2) != 0)
+		strcat(res_str, " ");
 	strcat(res_str, str2);
 	free(str1);
 	free(str2);

src/interfaces/ecpg/test/expected/compat_informix-rnull.c

@@ -34,91 +34,91 @@ int main(void)
 {
 	
 #line 15 "rnull.pgc"
- char  c  []  = "abc" ;
+ char c [] = "abc" ;
 
 #line 15 "rnull.pgc"
 
 	
 #line 16 "rnull.pgc"
- short  s   = 17 ;
+ short s = 17 ;
 
 #line 16 "rnull.pgc"
 
 	
 #line 17 "rnull.pgc"
- int  i   = - 74874 ;
+ int i = - 74874 ;
 
 #line 17 "rnull.pgc"
 
 	
 #line 18 "rnull.pgc"
- bool  b   = 1 ;
+ bool b = 1 ;
 
 #line 18 "rnull.pgc"
 
 	
 #line 19 "rnull.pgc"
- float  f   = 3.71 ;
+ float f = 3.71 ;
 
 #line 19 "rnull.pgc"
 
 	
 #line 20 "rnull.pgc"
- long  l   = 487444 ;
+ long l = 487444 ;
 
 #line 20 "rnull.pgc"
 
 	
 #line 21 "rnull.pgc"
- double  dbl   = 404.404 ;
+ double dbl = 404.404 ;
 
 #line 21 "rnull.pgc"
 
 	
 #line 22 "rnull.pgc"
- decimal  dec    ;
+ decimal dec ;
 
 #line 22 "rnull.pgc"
 
 	
 #line 23 "rnull.pgc"
- date  dat    ;
+ date dat ;
 
 #line 23 "rnull.pgc"
 
 	
 #line 24 "rnull.pgc"
- timestamp  tmp    ;
+ timestamp tmp ;
 
 #line 24 "rnull.pgc"
 
 
 	ECPGdebug(1, stderr);
-	/* exec sql whenever sqlerror  do sqlprint (  ) ; */
+	/* exec sql whenever sqlerror  do sqlprint ( ) ; */
 #line 27 "rnull.pgc"
 
 
 	{ ECPGconnect(__LINE__, 1, "regress1" , NULL, NULL , NULL, 0); 
 #line 29 "rnull.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 29 "rnull.pgc"
 
 
-	{ ECPGdo(__LINE__, 1, 0, NULL, 0, ECPGst_normal, "create  table test ( id int   , c char  ( 10 )    , s smallint   , i int   , b bool    , f float    , l bigint   , dbl double precision   , dec decimal    , dat date    , tmp timestamptz    )    ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 1, 0, NULL, 0, ECPGst_normal, "create table test ( id int , c char ( 10 ) , s smallint , i int , b bool , f float , l bigint , dbl double precision , dec decimal , dat date , tmp timestamptz )", ECPGt_EOIT, ECPGt_EORT);
 #line 33 "rnull.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 33 "rnull.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "commit ");
+	{ ECPGtrans(__LINE__, NULL, "commit");
 #line 34 "rnull.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 34 "rnull.pgc"
 
 
-	{ ECPGdo(__LINE__, 1, 0, NULL, 0, ECPGst_normal, "insert into test ( id  , c  , s  , i  , b  , f  , l  , dbl  ) values ( 1 ,  $1  ,  $2  ,  $3  ,  $4  ,  $5  ,  $6  ,  $7  ) ", 
+	{ ECPGdo(__LINE__, 1, 0, NULL, 0, ECPGst_normal, "insert into test ( id , c , s , i , b , f , l , dbl ) values ( 1 , $1  , $2  , $3  , $4  , $5  , $6  , $7  )", 
 	ECPGt_char,(c),(long)sizeof("abc"),(long)1,(sizeof("abc"))*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_short,&(s),(long)1,(long)1,sizeof(short), 
@@ -135,13 +135,13 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
 #line 38 "rnull.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 38 "rnull.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "commit ");
+	{ ECPGtrans(__LINE__, NULL, "commit");
 #line 39 "rnull.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 39 "rnull.pgc"
 
 
@@ -156,7 +156,7 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
 	rsetnull(CDATETYPE, (char *) &dat);
 	rsetnull(CDTIMETYPE, (char *) &tmp);
 
-	{ ECPGdo(__LINE__, 1, 0, NULL, 0, ECPGst_normal, "insert into test ( id  , c  , s  , i  , b  , f  , l  , dbl  , dec  , dat  , tmp  ) values ( 2 ,  $1  ,  $2  ,  $3  ,  $4  ,  $5  ,  $6  ,  $7  ,  $8  ,  $9  ,  $10  ) ", 
+	{ ECPGdo(__LINE__, 1, 0, NULL, 0, ECPGst_normal, "insert into test ( id , c , s , i , b , f , l , dbl , dec , dat , tmp ) values ( 2 , $1  , $2  , $3  , $4  , $5  , $6  , $7  , $8  , $9  , $10  )", 
 	ECPGt_char,(c),(long)sizeof("abc"),(long)1,(sizeof("abc"))*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_short,&(s),(long)1,(long)1,sizeof(short), 
@@ -179,19 +179,19 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
 #line 54 "rnull.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 54 "rnull.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "commit ");
+	{ ECPGtrans(__LINE__, NULL, "commit");
 #line 55 "rnull.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 55 "rnull.pgc"
 
 
 	printf("first select\n");
 
-	{ ECPGdo(__LINE__, 1, 0, NULL, 0, ECPGst_normal, "select  c , s , i , b , f , l , dbl , dec , dat , tmp  from test where id = 1  ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 1, 0, NULL, 0, ECPGst_normal, "select c , s , i , b , f , l , dbl , dec , dat , tmp from test where id = 1", ECPGt_EOIT, 
 	ECPGt_char,(c),(long)sizeof("abc"),(long)1,(sizeof("abc"))*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_short,&(s),(long)1,(long)1,sizeof(short), 
@@ -214,7 +214,7 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
 #line 61 "rnull.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 61 "rnull.pgc"
 
 
@@ -231,7 +231,7 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
 
 	printf("second select\n");
 
-	{ ECPGdo(__LINE__, 1, 0, NULL, 0, ECPGst_normal, "select  c , s , i , b , f , l , dbl , dec , dat , tmp  from test where id = 2  ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 1, 0, NULL, 0, ECPGst_normal, "select c , s , i , b , f , l , dbl , dec , dat , tmp from test where id = 2", ECPGt_EOIT, 
 	ECPGt_char,(c),(long)sizeof("abc"),(long)1,(sizeof("abc"))*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_short,&(s),(long)1,(long)1,sizeof(short), 
@@ -254,7 +254,7 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
 #line 78 "rnull.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 78 "rnull.pgc"
 
 
@@ -269,23 +269,23 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
 	test_null(CDATETYPE, (char *) &dat);
 	test_null(CDTIMETYPE, (char *) &tmp);
 
-	{ ECPGdo(__LINE__, 1, 0, NULL, 0, ECPGst_normal, "drop table test ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 1, 0, NULL, 0, ECPGst_normal, "drop table test", ECPGt_EOIT, ECPGt_EORT);
 #line 91 "rnull.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 91 "rnull.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "commit ");
+	{ ECPGtrans(__LINE__, NULL, "commit");
 #line 92 "rnull.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 92 "rnull.pgc"
 
 
 	{ ECPGdisconnect(__LINE__, "CURRENT");
 #line 94 "rnull.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 94 "rnull.pgc"
 
 

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

@@ -2,15 +2,15 @@
 [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 31: query: create  table test ( id int   , c char  ( 10 )    , s smallint   , i int   , b bool    , f float    , l bigint   , dbl double precision   , dec decimal    , dat date    , tmp timestamptz    )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 31: query: create table test ( id int , c char ( 10 ) , s smallint , i int , b bool , f float , l bigint , dbl double precision , dec decimal , dat date , tmp timestamptz ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 31: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 31: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 34: action "commit "; connection "regress1"
+[NO_PID]: ECPGtrans on line 34: action "commit"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 36: query: insert into test ( id  , c  , s  , i  , b  , f  , l  , dbl  ) values ( 1 ,  $1  ,  $2  ,  $3  ,  $4  ,  $5  ,  $6  ,  $7  ) ; with 7 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 36: query: insert into test ( id , c , s , i , b , f , l , dbl ) values ( 1 , $1  , $2  , $3  , $4  , $5  , $6  , $7  ); with 7 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 36: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -30,9 +30,9 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 36: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 39: action "commit "; connection "regress1"
+[NO_PID]: ECPGtrans on line 39: action "commit"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 52: query: insert into test ( id  , c  , s  , i  , b  , f  , l  , dbl  , dec  , dat  , tmp  ) values ( 2 ,  $1  ,  $2  ,  $3  ,  $4  ,  $5  ,  $6  ,  $7  ,  $8  ,  $9  ,  $10  ) ; with 10 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 52: query: insert into test ( id , c , s , i , b , f , l , dbl , dec , dat , tmp ) values ( 2 , $1  , $2  , $3  , $4  , $5  , $6  , $7  , $8  , $9  , $10  ); with 10 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 52: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -58,9 +58,9 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 52: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 55: action "commit "; connection "regress1"
+[NO_PID]: ECPGtrans on line 55: action "commit"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 59: query: select  c , s , i , b , f , l , dbl , dec , dat , tmp  from test where id = 1  ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 59: query: select c , s , i , b , f , l , dbl , dec , dat , tmp from test where id = 1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 59: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -86,7 +86,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 59: RESULT:  offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 76: query: select  c , s , i , b , f , l , dbl , dec , dat , tmp  from test where id = 2  ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 76: query: select c , s , i , b , f , l , dbl , dec , dat , tmp from test where id = 2; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 76: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -112,13 +112,13 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 76: RESULT:  offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 91: query: drop table test ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 91: query: drop table test; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 91: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 91: OK: DROP TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 92: action "commit "; connection "regress1"
+[NO_PID]: ECPGtrans on line 92: 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

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

@@ -33,115 +33,115 @@ int main(void)
 {
 	
 #line 14 "test_informix.pgc"
- int  i   = 14 ;
+ int i = 14 ;
 
 #line 14 "test_informix.pgc"
  
 	
 #line 15 "test_informix.pgc"
- decimal  j    ,  m    ,  n    ;
+ decimal j , m , n ;
 
 #line 15 "test_informix.pgc"
 
 
 	ECPGdebug(1, stderr);
-	/* exec sql whenever sqlerror  do dosqlprint (  ) ; */
+	/* exec sql whenever sqlerror  do dosqlprint ( ) ; */
 #line 18 "test_informix.pgc"
 
 
 	{ ECPGconnect(__LINE__, 1, "regress1" , NULL, NULL , NULL, 0); 
 #line 20 "test_informix.pgc"
 
-if (sqlca.sqlcode < 0) dosqlprint (  );}
+if (sqlca.sqlcode < 0) dosqlprint ( );}
 #line 20 "test_informix.pgc"
 
 	if (sqlca.sqlcode != 0) exit(1);
 
-	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "create  table test ( i int   primary key   , j int   )    ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "create table test ( i int primary key , j int )", ECPGt_EOIT, ECPGt_EORT);
 #line 23 "test_informix.pgc"
 
-if (sqlca.sqlcode < 0) dosqlprint (  );}
+if (sqlca.sqlcode < 0) dosqlprint ( );}
 #line 23 "test_informix.pgc"
 
 
 	/* this INSERT works */
 	rsetnull(CDECIMALTYPE, (char *)&j);
-	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "insert into test ( i  , j  ) values ( 7 ,  $1  ) ", 
+	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "insert into test ( i , j ) values ( 7 , $1  )", 
 	ECPGt_decimal,&(j),(long)1,(long)1,sizeof(decimal), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
 #line 27 "test_informix.pgc"
 
-if (sqlca.sqlcode < 0) dosqlprint (  );}
+if (sqlca.sqlcode < 0) dosqlprint ( );}
 #line 27 "test_informix.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "commit ");
+	{ ECPGtrans(__LINE__, NULL, "commit");
 #line 28 "test_informix.pgc"
 
-if (sqlca.sqlcode < 0) dosqlprint (  );}
+if (sqlca.sqlcode < 0) dosqlprint ( );}
 #line 28 "test_informix.pgc"
 
 
 	/* this INSERT should fail because i is a unique column */
-	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "insert into test ( i  , j  ) values ( 7 , 12 ) ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "insert into test ( i , j ) values ( 7 , 12 )", ECPGt_EOIT, ECPGt_EORT);
 #line 31 "test_informix.pgc"
 
-if (sqlca.sqlcode < 0) dosqlprint (  );}
+if (sqlca.sqlcode < 0) dosqlprint ( );}
 #line 31 "test_informix.pgc"
 
 	printf("INSERT: %ld=%s\n", sqlca.sqlcode, sqlca.sqlerrm.sqlerrmc);
-	if (sqlca.sqlcode != 0) { ECPGtrans(__LINE__, NULL, "rollback ");
+	if (sqlca.sqlcode != 0) { ECPGtrans(__LINE__, NULL, "rollback");
 #line 33 "test_informix.pgc"
 
-if (sqlca.sqlcode < 0) dosqlprint (  );}
+if (sqlca.sqlcode < 0) dosqlprint ( );}
 #line 33 "test_informix.pgc"
 
 
-	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "insert into test ( i  , j  ) values (  $1  , 1 ) ", 
+	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "insert into test ( i , j ) values ( $1  , 1 )", 
 	ECPGt_int,&(i),(long)1,(long)1,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
 #line 35 "test_informix.pgc"
 
-if (sqlca.sqlcode < 0) dosqlprint (  );}
+if (sqlca.sqlcode < 0) dosqlprint ( );}
 #line 35 "test_informix.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "commit ");
+	{ ECPGtrans(__LINE__, NULL, "commit");
 #line 36 "test_informix.pgc"
 
-if (sqlca.sqlcode < 0) dosqlprint (  );}
+if (sqlca.sqlcode < 0) dosqlprint ( );}
 #line 36 "test_informix.pgc"
 
 
 	/* this will fail (more than one row in subquery) */
-	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "select  i  from test where j = ( select  j  from test    )  ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "select i from test where j = ( select j from test )", ECPGt_EOIT, ECPGt_EORT);
 #line 39 "test_informix.pgc"
 
-if (sqlca.sqlcode < 0) dosqlprint (  );}
+if (sqlca.sqlcode < 0) dosqlprint ( );}
 #line 39 "test_informix.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "rollback ");
+	{ ECPGtrans(__LINE__, NULL, "rollback");
 #line 40 "test_informix.pgc"
 
-if (sqlca.sqlcode < 0) dosqlprint (  );}
+if (sqlca.sqlcode < 0) dosqlprint ( );}
 #line 40 "test_informix.pgc"
 
 
 	/* this however should be ok */
-	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "select  i  from test where j = ( select  j  from test    order by i   limit 1  )  ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "select i from test where j = ( select j from test order by i limit 1 )", ECPGt_EOIT, ECPGt_EORT);
 #line 43 "test_informix.pgc"
 
-if (sqlca.sqlcode < 0) dosqlprint (  );}
+if (sqlca.sqlcode < 0) dosqlprint ( );}
 #line 43 "test_informix.pgc"
 
 	printf("SELECT: %ld=%s\n", sqlca.sqlcode, sqlca.sqlerrm.sqlerrmc);
-	if (sqlca.sqlcode != 0) { ECPGtrans(__LINE__, NULL, "rollback ");
+	if (sqlca.sqlcode != 0) { ECPGtrans(__LINE__, NULL, "rollback");
 #line 45 "test_informix.pgc"
 
-if (sqlca.sqlcode < 0) dosqlprint (  );}
+if (sqlca.sqlcode < 0) dosqlprint ( );}
 #line 45 "test_informix.pgc"
 
 
-	 ECPG_informix_set_var( 0, &( i ), __LINE__);\
-  /* declare c  cursor  for select  *  from test where i <=  $1    */
+	ECPG_informix_set_var( 0, &( i ), __LINE__);\
+ /* declare c cursor for select * from test where i <= $1  */
 #line 47 "test_informix.pgc"
 
 	openit();
@@ -157,7 +157,7 @@ if (sqlca.sqlcode < 0) dosqlprint (  );}
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
 #line 54 "test_informix.pgc"
 
-if (sqlca.sqlcode < 0) dosqlprint (  );}
+if (sqlca.sqlcode < 0) dosqlprint ( );}
 #line 54 "test_informix.pgc"
 
 		if (sqlca.sqlcode == 100) break;
@@ -177,55 +177,55 @@ if (sqlca.sqlcode < 0) dosqlprint (  );}
 	deccvint(7, &j);
 	deccvint(14, &m);
 	decadd(&j, &m, &n);
-	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "delete from test  where i =  $1  :: decimal   ", 
+	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "delete from test where i = $1  :: decimal", 
 	ECPGt_decimal,&(n),(long)1,(long)1,sizeof(decimal), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
 #line 72 "test_informix.pgc"
 
-if (sqlca.sqlcode < 0) dosqlprint (  );}
+if (sqlca.sqlcode < 0) dosqlprint ( );}
 #line 72 "test_informix.pgc"
 
 	printf("DELETE: %ld\n", sqlca.sqlcode);
 
-	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "select  1  from test where i = 14  ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "select 1 from test where i = 14", ECPGt_EOIT, ECPGt_EORT);
 #line 75 "test_informix.pgc"
 
-if (sqlca.sqlcode < 0) dosqlprint (  );}
+if (sqlca.sqlcode < 0) dosqlprint ( );}
 #line 75 "test_informix.pgc"
 
 	printf("Exists: %ld\n", sqlca.sqlcode);
 
-	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "select  1  from test where i = 147  ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "select 1 from test where i = 147", ECPGt_EOIT, ECPGt_EORT);
 #line 78 "test_informix.pgc"
 
-if (sqlca.sqlcode < 0) dosqlprint (  );}
+if (sqlca.sqlcode < 0) dosqlprint ( );}
 #line 78 "test_informix.pgc"
 
 	printf("Does not exist: %ld\n", sqlca.sqlcode);
 
-	{ ECPGtrans(__LINE__, NULL, "commit ");
+	{ ECPGtrans(__LINE__, NULL, "commit");
 #line 81 "test_informix.pgc"
 
-if (sqlca.sqlcode < 0) dosqlprint (  );}
+if (sqlca.sqlcode < 0) dosqlprint ( );}
 #line 81 "test_informix.pgc"
 
-	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "drop table test ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "drop table test", ECPGt_EOIT, ECPGt_EORT);
 #line 82 "test_informix.pgc"
 
-if (sqlca.sqlcode < 0) dosqlprint (  );}
+if (sqlca.sqlcode < 0) dosqlprint ( );}
 #line 82 "test_informix.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "commit ");
+	{ ECPGtrans(__LINE__, NULL, "commit");
 #line 83 "test_informix.pgc"
 
-if (sqlca.sqlcode < 0) dosqlprint (  );}
+if (sqlca.sqlcode < 0) dosqlprint ( );}
 #line 83 "test_informix.pgc"
 
 
 	{ ECPGdisconnect(__LINE__, "CURRENT");
 #line 85 "test_informix.pgc"
 
-if (sqlca.sqlcode < 0) dosqlprint (  );}
+if (sqlca.sqlcode < 0) dosqlprint ( );}
 #line 85 "test_informix.pgc"
 
 
@@ -234,12 +234,12 @@ if (sqlca.sqlcode < 0) dosqlprint (  );}
 
 static void openit(void)
 {
-	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "declare c  cursor  for select  *  from test where i <=  $1   ", 
+	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "declare c cursor for select * from test where i <= $1 ", 
 	ECPGt_int,&(*( int  *)(ECPG_informix_get_var( 0))),(long)1,(long)1,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
 #line 92 "test_informix.pgc"
 
-if (sqlca.sqlcode < 0) dosqlprint (  );}
+if (sqlca.sqlcode < 0) dosqlprint ( );}
 #line 92 "test_informix.pgc"
 
 }

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

@@ -2,13 +2,13 @@
 [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 23: query: create  table test ( i int   primary key   , j int   )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 23: query: create table test ( i int primary key , j int ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 23: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 23: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 27: query: insert into test ( i  , j  ) values ( 7 ,  $1  ) ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 27: query: insert into test ( i , j ) values ( 7 , $1  ); with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 27: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -16,9 +16,9 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 27: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 28: action "commit "; connection "regress1"
+[NO_PID]: ECPGtrans on line 28: action "commit"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 31: query: insert into test ( i  , j  ) values ( 7 , 12 ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 31: query: insert into test ( i , j ) values ( 7 , 12 ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 31: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -26,9 +26,9 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: raising sqlstate 23505 (sqlcode -239) on line 31: duplicate key value violates unique constraint "test_pkey" on line 31
 [NO_PID]: sqlca: code: -239, state: 23505
-[NO_PID]: ECPGtrans on line 33: action "rollback "; connection "regress1"
+[NO_PID]: ECPGtrans on line 33: action "rollback"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 35: query: insert into test ( i  , j  ) values (  $1  , 1 ) ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 35: query: insert into test ( i , j ) values ( $1  , 1 ); with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 35: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -36,9 +36,9 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 35: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 36: action "commit "; connection "regress1"
+[NO_PID]: ECPGtrans on line 36: action "commit"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 39: query: select  i  from test where j = ( select  j  from test    )  ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 39: query: select i from test where j = ( select j from test ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 39: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -46,15 +46,15 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: raising sqlstate 21000 (sqlcode -284) on line 39: more than one row returned by a subquery used as an expression on line 39
 [NO_PID]: sqlca: code: -284, state: 21000
-[NO_PID]: ECPGtrans on line 40: action "rollback "; connection "regress1"
+[NO_PID]: ECPGtrans on line 40: action "rollback"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 43: query: select  i  from test where j = ( select  j  from test    order by i   limit 1  )  ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 43: query: select i from test where j = ( select j from test order by i limit 1 ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 43: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 43: correctly got 1 tuples with 1 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 92: query: declare c  cursor  for select  *  from test where i <=  $1   ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 92: query: declare c cursor for select * from test where i <= $1 ; with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 92: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -90,7 +90,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: raising sqlcode 100 on line 54: no data found on line 54
 [NO_PID]: sqlca: code: 100, state: 02000
-[NO_PID]: ecpg_execute on line 72: query: delete from test  where i =  $1  :: decimal   ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 72: query: delete from test where i = $1  :: decimal; with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 72: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -100,13 +100,13 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: raising sqlcode 100 on line 72: no data found on line 72
 [NO_PID]: sqlca: code: 100, state: 02000
-[NO_PID]: ecpg_execute on line 75: query: select  1  from test where i = 14  ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 75: query: select 1 from test where i = 14; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 75: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 75: correctly got 1 tuples with 1 fields
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 78: query: select  1  from test where i = 147  ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 78: query: select 1 from test where i = 147; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 78: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -114,15 +114,15 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: raising sqlcode 100 on line 78: no data found on line 78
 [NO_PID]: sqlca: code: 100, state: 02000
-[NO_PID]: ECPGtrans on line 81: action "commit "; connection "regress1"
+[NO_PID]: ECPGtrans on line 81: action "commit"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 82: query: drop table test ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 82: query: drop table test; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 82: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 82: OK: DROP TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 83: action "commit "; connection "regress1"
+[NO_PID]: ECPGtrans on line 83: 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

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

@@ -114,7 +114,7 @@ static void sql_check(char *fn, char *caller, int ignore)
       printf("%s\n", errorstring);
 
       /* attempt a ROLLBACK */
-      { ECPGtrans(__LINE__, NULL, "rollback ");}
+      { ECPGtrans(__LINE__, NULL, "rollback");}
 #line 27 "test_informix2.pgc"
 
 
@@ -145,19 +145,19 @@ int main(void)
 		 
 	
 #line 49 "test_informix2.pgc"
- int  c    ;
+ int c ;
  
 #line 50 "test_informix2.pgc"
- timestamp  d    ;
+ timestamp d ;
  
 #line 51 "test_informix2.pgc"
- timestamp  e    ;
+ timestamp e ;
  
 #line 52 "test_informix2.pgc"
- timestamp  maxd    ;
+ timestamp maxd ;
  
 #line 53 "test_informix2.pgc"
- char  dbname  [ 30 ]   ;
+ char dbname [ 30 ] ;
 /* exec sql end declare section */
 #line 54 "test_informix2.pgc"
 
@@ -186,7 +186,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 66 "test_informix2.pgc"
 
 
-	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "create  table history ( customerid integer   , timestamp timestamp without time zone   , action_taken char  ( 5 )    , narrative varchar ( 100 )    )    ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "create table history ( customerid integer , timestamp timestamp without time zone , action_taken char ( 5 ) , narrative varchar ( 100 ) )", ECPGt_EOIT, ECPGt_EORT);
 #line 68 "test_informix2.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
@@ -194,7 +194,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 
 	sql_check("main", "create", 0);
 	
-	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "insert into history ( customerid  , timestamp  , action_taken  , narrative  ) values ( 1 , '2003-05-07 13:28:34 CEST' , 'test' , 'test' ) ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "insert into history ( customerid , timestamp , action_taken , narrative ) values ( 1 , '2003-05-07 13:28:34 CEST' , 'test' , 'test' )", ECPGt_EOIT, ECPGt_EORT);
 #line 73 "test_informix2.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
@@ -202,7 +202,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 
 	sql_check("main", "insert", 0);
 
-	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "select  max ( timestamp )  from history   ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "select max ( timestamp ) from history", ECPGt_EOIT, 
 	ECPGt_timestamp,&(maxd),(long)1,(long)1,sizeof(timestamp), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
 #line 78 "test_informix2.pgc"
@@ -212,7 +212,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 
 	sql_check("main", "select max", 100);
 
-	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "select  customerid , timestamp  from history where timestamp =  $1     limit 1 ", 
+	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "select customerid , timestamp from history where timestamp = $1  limit 1", 
 	ECPGt_timestamp,&(maxd),(long)1,(long)1,sizeof(timestamp), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, 
 	ECPGt_int,&(c),(long)1,(long)1,sizeof(int), 
@@ -233,7 +233,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 	free(intvl);
 	c++;
 
-	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "insert into history ( customerid  , timestamp  , action_taken  , narrative  ) values (  $1  ,  $2  , 'test' , 'test' ) ", 
+	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "insert into history ( customerid , timestamp , action_taken , narrative ) values ( $1  , $2  , 'test' , 'test' )", 
 	ECPGt_int,&(c),(long)1,(long)1,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_timestamp,&(e),(long)1,(long)1,sizeof(timestamp), 
@@ -245,14 +245,14 @@ if (sqlca.sqlcode < 0) sqlprint();}
 
 	sql_check("main", "update", 0);
   
-	{ ECPGtrans(__LINE__, NULL, "commit ");
+	{ ECPGtrans(__LINE__, NULL, "commit");
 #line 100 "test_informix2.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 100 "test_informix2.pgc"
 
 
-	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "drop table history ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 1, 1, NULL, 0, ECPGst_normal, "drop table history", ECPGt_EOIT, ECPGt_EORT);
 #line 102 "test_informix2.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
@@ -260,7 +260,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 
 	sql_check("main", "drop", 0);
 
-	{ ECPGtrans(__LINE__, NULL, "commit ");
+	{ ECPGtrans(__LINE__, NULL, "commit");
 #line 105 "test_informix2.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}

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

@@ -8,19 +8,19 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 66: OK: SET
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 68: query: create  table history ( customerid integer   , timestamp timestamp without time zone   , action_taken char  ( 5 )    , narrative varchar ( 100 )    )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 68: query: create table history ( customerid integer , timestamp timestamp without time zone , action_taken char ( 5 ) , narrative varchar ( 100 ) ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 68: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 68: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 71: query: insert into history ( customerid  , timestamp  , action_taken  , narrative  ) values ( 1 , '2003-05-07 13:28:34 CEST' , 'test' , 'test' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 71: query: insert into history ( customerid , timestamp , action_taken , narrative ) values ( 1 , '2003-05-07 13:28:34 CEST' , 'test' , 'test' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 71: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 71: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 76: query: select  max ( timestamp )  from history   ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 76: query: select max ( timestamp ) from history; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 76: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -28,7 +28,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 76: RESULT: Wed 07 May 13:28:34 2003 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 81: query: select  customerid , timestamp  from history where timestamp =  $1     limit 1 ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 81: query: select customerid , timestamp from history where timestamp = $1  limit 1; with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 81: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -40,7 +40,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 81: RESULT: Wed 07 May 13:28:34 2003 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 95: query: insert into history ( customerid  , timestamp  , action_taken  , narrative  ) values (  $1  ,  $2  , 'test' , 'test' ) ; with 2 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 95: query: insert into history ( customerid , timestamp , action_taken , narrative ) values ( $1  , $2  , 'test' , 'test' ); with 2 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 95: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -50,15 +50,15 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 95: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 100: action "commit "; connection "regress1"
+[NO_PID]: ECPGtrans on line 100: action "commit"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 102: query: drop table history ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 102: query: drop table history; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 102: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 102: OK: DROP TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 105: action "commit "; connection "regress1"
+[NO_PID]: ECPGtrans on line 105: 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

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

@@ -2,7 +2,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <DEFAULT>  
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 23: query: alter user connectuser   encrypted password 'connectpw'; with 0 parameter(s) on connection main
+[NO_PID]: ecpg_execute on line 23: query: alter user connectuser encrypted password 'connectpw'; with 0 parameter(s) on connection main
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 23: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000

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

@@ -36,10 +36,10 @@ main(void)
 	 
 
 #line 17 "test2.pgc"
- char  id  [ 200 ]   ;
+ char id [ 200 ] ;
  
 #line 18 "test2.pgc"
- char  res  [ 200 ]   ;
+ char res [ 200 ] ;
 /* exec sql end declare section */
 #line 19 "test2.pgc"
 
@@ -55,17 +55,17 @@ main(void)
 
 
 	/* this selects from "second" which was opened last */
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  current_database ( )     ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select current_database ( )", ECPGt_EOIT, 
 	ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);}
 #line 28 "test2.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, "first", 0, ECPGst_normal, "select  current_database ( )     ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 0, 1, "first", 0, ECPGst_normal, "select current_database ( )", ECPGt_EOIT, 
 	ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);}
 #line 29 "test2.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, "second", 0, ECPGst_normal, "select  current_database ( )     ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 0, 1, "second", 0, ECPGst_normal, "select current_database ( )", ECPGt_EOIT, 
 	ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);}
 #line 30 "test2.pgc"
@@ -74,7 +74,7 @@ main(void)
 	{ ECPGsetconn(__LINE__, "first");}
 #line 32 "test2.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  current_database ( )     ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select current_database ( )", ECPGt_EOIT, 
 	ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);}
 #line 33 "test2.pgc"
@@ -84,7 +84,7 @@ main(void)
 	{ ECPGdisconnect(__LINE__, "CURRENT");}
 #line 36 "test2.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  current_database ( )     ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select current_database ( )", ECPGt_EOIT, 
 	ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);}
 #line 37 "test2.pgc"

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

@@ -4,7 +4,7 @@
 [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 28: query: select  current_database ( )     ; with 0 parameter(s) on connection second
+[NO_PID]: ecpg_execute on line 28: query: select current_database ( ); with 0 parameter(s) on connection second
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 28: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -12,7 +12,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 28: RESULT: regress1 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 29: query: select  current_database ( )     ; with 0 parameter(s) on connection first
+[NO_PID]: ecpg_execute on line 29: query: select current_database ( ); with 0 parameter(s) on connection first
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 29: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -20,7 +20,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 29: RESULT: connectdb offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 30: query: select  current_database ( )     ; with 0 parameter(s) on connection second
+[NO_PID]: ecpg_execute on line 30: query: select current_database ( ); with 0 parameter(s) on connection second
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 30: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -28,7 +28,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 30: RESULT: regress1 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 33: query: select  current_database ( )     ; with 0 parameter(s) on connection first
+[NO_PID]: ecpg_execute on line 33: query: select current_database ( ); with 0 parameter(s) on connection first
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 33: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -38,7 +38,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_finish: connection first closed
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 37: query: select  current_database ( )     ; with 0 parameter(s) on connection second
+[NO_PID]: ecpg_execute on line 37: query: select current_database ( ); with 0 parameter(s) on connection second
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 37: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000

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

@@ -35,10 +35,10 @@ main(void)
 	 
 
 #line 16 "test3.pgc"
- char  id  [ 200 ]   ;
+ char id [ 200 ] ;
  
 #line 17 "test3.pgc"
- char  res  [ 200 ]   ;
+ char res [ 200 ] ;
 /* exec sql end declare section */
 #line 18 "test3.pgc"
 
@@ -54,7 +54,7 @@ main(void)
 
 
 	/* this selects from "second" which was opened last */
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  current_database ( )     ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select current_database ( )", ECPGt_EOIT, 
 	ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);}
 #line 27 "test3.pgc"
@@ -64,7 +64,7 @@ main(void)
 	{ ECPGdisconnect(__LINE__, "CURRENT");}
 #line 30 "test3.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  current_database ( )     ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select current_database ( )", ECPGt_EOIT, 
 	ECPGt_char,(res),(long)200,(long)1,(200)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);}
 #line 31 "test3.pgc"

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

@@ -4,7 +4,7 @@
 [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 27: query: select  current_database ( )     ; with 0 parameter(s) on connection second
+[NO_PID]: ecpg_execute on line 27: query: select current_database ( ); with 0 parameter(s) on connection second
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 27: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -14,7 +14,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_finish: connection second closed
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 31: query: select  current_database ( )     ; with 0 parameter(s) on connection first
+[NO_PID]: ecpg_execute on line 31: query: select current_database ( ); with 0 parameter(s) on connection first
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 31: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/connect-test5.c

@@ -27,13 +27,13 @@ main(void)
 	 
 
 #line 16 "test5.pgc"
- char  db  [ 200 ]   ;
+ char db [ 200 ] ;
  
 #line 17 "test5.pgc"
- char  id  [ 200 ]   ;
+ char id [ 200 ] ;
  
 #line 18 "test5.pgc"
- char * user   = "connectuser" ;
+ char * user = "connectuser" ;
 /* exec sql end declare section */
 #line 19 "test5.pgc"
 
@@ -43,7 +43,7 @@ main(void)
 	{ ECPGconnect(__LINE__, 0, "connectdb" , NULL, NULL , "main", 0); }
 #line 23 "test5.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "alter user connectuser   encrypted password 'connectpw'", ECPGt_EOIT, ECPGt_EORT);}
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "alter user connectuser encrypted password 'connectpw'", ECPGt_EOIT, ECPGt_EORT);}
 #line 24 "test5.pgc"
 
 	{ ECPGdisconnect(__LINE__, "CURRENT");}

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

@@ -2,7 +2,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGconnect: opening database connectdb on <DEFAULT> port <DEFAULT>  
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 24: query: alter user connectuser   encrypted password 'connectpw'; with 0 parameter(s) on connection main
+[NO_PID]: ecpg_execute on line 24: query: alter user connectuser encrypted password 'connectpw'; with 0 parameter(s) on connection main
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 24: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000

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

@@ -35,16 +35,16 @@ main(void)
 		 
 	
 #line 14 "dt_test.pgc"
- date  date1    ;
+ date date1 ;
  
 #line 15 "dt_test.pgc"
- timestamp  ts1    ;
+ timestamp ts1 ;
  
 #line 16 "dt_test.pgc"
- interval * iv1    ,  iv2    ;
+ interval * iv1 , iv2 ;
  
 #line 17 "dt_test.pgc"
- char * text    ;
+ char * text ;
 /* exec sql end declare section */
 #line 18 "dt_test.pgc"
 
@@ -56,49 +56,49 @@ main(void)
 	int i;
 
         ECPGdebug(1, stderr);
-        /* exec sql whenever sqlerror  do sqlprint (  ) ; */
+        /* exec sql whenever sqlerror  do sqlprint ( ) ; */
 #line 27 "dt_test.pgc"
 
         { ECPGconnect(__LINE__, 0, "regress1" , NULL, NULL , NULL, 0); 
 #line 28 "dt_test.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 28 "dt_test.pgc"
 
-        { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create  table date_test ( d date    , ts timestamp    )    ", ECPGt_EOIT, ECPGt_EORT);
+        { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table date_test ( d date , ts timestamp )", ECPGt_EOIT, ECPGt_EORT);
 #line 29 "dt_test.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 29 "dt_test.pgc"
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "set datestyle to iso", ECPGt_EOIT, ECPGt_EORT);
 #line 30 "dt_test.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 30 "dt_test.pgc"
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "set intervalstyle to postgres_verbose", ECPGt_EOIT, ECPGt_EORT);
 #line 31 "dt_test.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 31 "dt_test.pgc"
 
 
 	date1 = PGTYPESdate_from_asc(d1, NULL); 
 	ts1 = PGTYPEStimestamp_from_asc(t1, NULL); 
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into date_test ( d  , ts  ) values (  $1  ,  $2  ) ", 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into date_test ( d , ts ) values ( $1  , $2  )", 
 	ECPGt_date,&(date1),(long)1,(long)1,sizeof(date), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_timestamp,&(ts1),(long)1,(long)1,sizeof(timestamp), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
 #line 36 "dt_test.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 36 "dt_test.pgc"
 
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  *  from date_test where d =  $1   ", 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from date_test where d = $1 ", 
 	ECPGt_date,&(date1),(long)1,(long)1,sizeof(date), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, 
 	ECPGt_date,&(date1),(long)1,(long)1,sizeof(date), 
@@ -107,7 +107,7 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
 #line 38 "dt_test.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 38 "dt_test.pgc"
 
 
@@ -422,16 +422,16 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
 	printf("timestamp_defmt_asc(%s, %s) = %s, error: %d\n", in, fmt, text, i);
 	free(text);
 
-	{ ECPGtrans(__LINE__, NULL, "rollback ");
+	{ ECPGtrans(__LINE__, NULL, "rollback");
 #line 351 "dt_test.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 351 "dt_test.pgc"
 
         { ECPGdisconnect(__LINE__, "CURRENT");
 #line 352 "dt_test.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 352 "dt_test.pgc"
 
 

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

@@ -2,7 +2,7 @@
 [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 29: query: create  table date_test ( d date    , ts timestamp    )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 29: query: create table date_test ( d date , ts timestamp ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 29: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -20,7 +20,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 31: OK: SET
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 36: query: insert into date_test ( d  , ts  ) values (  $1  ,  $2  ) ; with 2 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 36: query: insert into date_test ( d , ts ) values ( $1  , $2  ); with 2 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 36: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -30,7 +30,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 36: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 38: query: select  *  from date_test where d =  $1   ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 38: query: select * from date_test where d = $1 ; with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 38: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -42,7 +42,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 38: RESULT: 2000-07-12 17:34:29 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 351: action "rollback "; connection "regress1"
+[NO_PID]: ECPGtrans on line 351: action "rollback"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_finish: connection regress1 closed
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/pgtypeslib-dt_test2.c

@@ -74,19 +74,19 @@ main(void)
 		 
 	
 #line 52 "dt_test2.pgc"
- date  date1    ;
+ date date1 ;
  
 #line 53 "dt_test2.pgc"
- timestamp  ts1    ,  ts2    ;
+ timestamp ts1 , ts2 ;
  
 #line 54 "dt_test2.pgc"
- char * text    ;
+ char * text ;
  
 #line 55 "dt_test2.pgc"
- interval * i1    ;
+ interval * i1 ;
  
 #line 56 "dt_test2.pgc"
- date * dc    ;
+ date * dc ;
 /* exec sql end declare section */
 #line 57 "dt_test2.pgc"
 

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

@@ -41,7 +41,7 @@ main(void)
 		/* = {0, 0, 0, 0, 0, NULL, NULL} ; */
 	
 #line 22 "num_test.pgc"
- numeric * des    ;
+ numeric * des ;
 /* exec sql end declare section */
 #line 24 "num_test.pgc"
 
@@ -50,27 +50,27 @@ main(void)
 	int i;
 
 	ECPGdebug(1, stderr);
-	/* exec sql whenever sqlerror  do sqlprint (  ) ; */
+	/* exec sql whenever sqlerror  do sqlprint ( ) ; */
 #line 30 "num_test.pgc"
 
 
 	{ ECPGconnect(__LINE__, 0, "regress1" , NULL, NULL , NULL, 0); 
 #line 32 "num_test.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 32 "num_test.pgc"
 
 
 	{ ECPGsetcommit(__LINE__, "off", NULL);
 #line 34 "num_test.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 34 "num_test.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create  table test ( text char  ( 5 )    , num numeric ( 14 , 7 )   )    ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table test ( text char ( 5 ) , num numeric ( 14 , 7 ) )", ECPGt_EOIT, ECPGt_EORT);
 #line 35 "num_test.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 35 "num_test.pgc"
 
 
@@ -97,12 +97,12 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
 
 	des = PGTYPESnumeric_new();
 	PGTYPESnumeric_copy(res, des);
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test ( text  , num  ) values ( 'test' ,  $1  ) ", 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test ( text , num ) values ( 'test' , $1  )", 
 	ECPGt_numeric,&(des),(long)1,(long)0,sizeof(numeric), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
 #line 60 "num_test.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 60 "num_test.pgc"
 
 
@@ -110,12 +110,12 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
 	PGTYPESnumeric_mul(value1, value2, res);
 	PGTYPESnumeric_free(value2);
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  num  from test where text = 'test'  ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select num from test where text = 'test'", ECPGt_EOIT, 
 	ECPGt_numeric,&(des),(long)1,(long)0,sizeof(numeric), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
 #line 66 "num_test.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 66 "num_test.pgc"
 
 
@@ -141,16 +141,16 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
 	PGTYPESnumeric_free(value2);
 	PGTYPESnumeric_free(res);
 
-	{ ECPGtrans(__LINE__, NULL, "rollback ");
+	{ ECPGtrans(__LINE__, NULL, "rollback");
 #line 90 "num_test.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 90 "num_test.pgc"
 
 	{ ECPGdisconnect(__LINE__, "CURRENT");
 #line 91 "num_test.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 91 "num_test.pgc"
 
 

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

@@ -4,13 +4,13 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGsetcommit on line 34: action "off"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 35: query: create  table test ( text char  ( 5 )    , num numeric ( 14 , 7 )   )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 35: query: create table test ( text char ( 5 ) , num numeric ( 14 , 7 ) ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 35: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 35: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 60: query: insert into test ( text  , num  ) values ( 'test' ,  $1  ) ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 60: query: insert into test ( text , num ) values ( 'test' , $1  ); with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 60: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -18,7 +18,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 60: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 66: query: select  num  from test where text = 'test'  ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 66: query: select num from test where text = 'test'; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 66: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -26,7 +26,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 66: RESULT: 2369.7000000 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 90: action "rollback "; connection "regress1"
+[NO_PID]: ECPGtrans on line 90: action "rollback"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_finish: connection regress1 closed
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/preproc-array_of_struct.c

@@ -32,21 +32,21 @@
 
 typedef  struct { 
 #line 12 "array_of_struct.pgc"
-   struct varchar_name_12  { int len; char arr[ 50 ]; }  name    ;
+  struct varchar_name_12  { int len; char arr[ 50 ]; }  name ;
  
 #line 13 "array_of_struct.pgc"
- int  phone    ;
- }   customer ;
+ int phone ;
+ } customer ;
 #line 14 "array_of_struct.pgc"
 
 
 typedef  struct ind { 
 #line 19 "array_of_struct.pgc"
- short  name_ind    ;
+ short name_ind ;
  
 #line 20 "array_of_struct.pgc"
- short  phone_ind    ;
- }   cust_ind ;
+ short phone_ind ;
+ } cust_ind ;
 #line 21 "array_of_struct.pgc"
 
 
@@ -61,10 +61,10 @@ int main( int argc, char * argv[] )
              
        typedef struct { 
 #line 30 "array_of_struct.pgc"
-   struct varchar_name_30  { int len; char arr[ 50 ]; }  name    ;
+  struct varchar_name_30  { int len; char arr[ 50 ]; }  name ;
  
 #line 31 "array_of_struct.pgc"
- int  phone    ;
+ int phone ;
  }  customer2 ;
 
 #line 32 "array_of_struct.pgc"
@@ -84,37 +84,37 @@ int main( int argc, char * argv[] )
        
     
 #line 26 "array_of_struct.pgc"
- customer  custs1  [ 10 ]   ;
+ customer custs1 [ 10 ] ;
  
 #line 27 "array_of_struct.pgc"
- cust_ind  inds  [ 10 ]   ;
-  
+ cust_ind inds [ 10 ] ;
+ 
 #line 33 "array_of_struct.pgc"
- customer2  custs2  [ 10 ]   ;
+ customer2 custs2 [ 10 ] ;
  
 #line 38 "array_of_struct.pgc"
  struct customer3 { 
 #line 36 "array_of_struct.pgc"
-   struct varchar_name_36  { int len; char arr[ 50 ]; }  name    ;
+  struct varchar_name_36  { int len; char arr[ 50 ]; }  name ;
  
 #line 37 "array_of_struct.pgc"
- int  phone    ;
- }  custs3  [ 10 ]   ;
+ int phone ;
+ } custs3 [ 10 ] ;
  
 #line 43 "array_of_struct.pgc"
  struct customer4 { 
 #line 41 "array_of_struct.pgc"
-   struct varchar_name_41  { int len; char arr[ 50 ]; }  name    ;
+  struct varchar_name_41  { int len; char arr[ 50 ]; }  name ;
  
 #line 42 "array_of_struct.pgc"
- int  phone    ;
- }  custs4    ;
+ int phone ;
+ } custs4 ;
  
 #line 44 "array_of_struct.pgc"
- int  r    ;
+ int r ;
  
 #line 45 "array_of_struct.pgc"
-   struct varchar_onlyname_45  { int len; char arr[ 50 ]; }  onlyname [2]   ;
+  struct varchar_onlyname_45  { int len; char arr[ 50 ]; }  onlyname [2] ;
 /* exec sql end declare section */
 #line 46 "array_of_struct.pgc"
 
@@ -131,7 +131,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 50 "array_of_struct.pgc"
 
 
-    { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create  table customers ( c varchar ( 50 )    , p int   )    ", ECPGt_EOIT, ECPGt_EORT);
+    { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table customers ( c varchar ( 50 ) , p int )", ECPGt_EOIT, ECPGt_EORT);
 #line 52 "array_of_struct.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -140,7 +140,7 @@ if (sqlca.sqlwarn[0] == 'W') sqlprint();
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 52 "array_of_struct.pgc"
 
-    { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into customers values ( 'John Doe' , '12345' ) ", ECPGt_EOIT, ECPGt_EORT);
+    { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into customers values ( 'John Doe' , '12345' )", ECPGt_EOIT, ECPGt_EORT);
 #line 53 "array_of_struct.pgc"
 
 if (sqlca.sqlcode == ECPG_NOT_FOUND) sqlprint();
@@ -152,7 +152,7 @@ if (sqlca.sqlwarn[0] == 'W') sqlprint();
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 53 "array_of_struct.pgc"
 
-    { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into customers values ( 'Jane Doe' , '67890' ) ", ECPGt_EOIT, ECPGt_EORT);
+    { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into customers values ( 'Jane Doe' , '67890' )", ECPGt_EOIT, ECPGt_EORT);
 #line 54 "array_of_struct.pgc"
 
 if (sqlca.sqlcode == ECPG_NOT_FOUND) sqlprint();
@@ -165,7 +165,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 54 "array_of_struct.pgc"
 
 
-    { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  *  from customers     limit 2 ", ECPGt_EOIT, 
+    { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from customers limit 2", ECPGt_EOIT, 
 	ECPGt_varchar,&(custs1->name),(long)50,(long)10,sizeof( customer ), 
 	ECPGt_short,&(inds->name_ind),(long)1,(long)10,sizeof( struct ind ), 
 	ECPGt_int,&(custs1->phone),(long)1,(long)10,sizeof( customer ), 
@@ -188,7 +188,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 	    printf( "phone - %d\n", custs1[r].phone );
     }
 
-    { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  *  from customers     limit 2 ", ECPGt_EOIT, 
+    { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from customers limit 2", ECPGt_EOIT, 
 	ECPGt_varchar,&(custs2->name),(long)50,(long)10,sizeof( customer2 ), 
 	ECPGt_short,&(inds->name_ind),(long)1,(long)10,sizeof( struct ind ), 
 	ECPGt_int,&(custs2->phone),(long)1,(long)10,sizeof( customer2 ), 
@@ -211,7 +211,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 	    printf( "phone - %d\n", custs2[r].phone );
     }
 
-    { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  *  from customers     limit 2 ", ECPGt_EOIT, 
+    { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from customers limit 2", ECPGt_EOIT, 
 	ECPGt_varchar,&(custs3->name),(long)50,(long)10,sizeof( struct customer3 ), 
 	ECPGt_short,&(inds->name_ind),(long)1,(long)10,sizeof( struct ind ), 
 	ECPGt_int,&(custs3->phone),(long)1,(long)10,sizeof( struct customer3 ), 
@@ -234,7 +234,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 	    printf( "phone - %d\n", custs3[r].phone );
     }
 
-    { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  *  from customers     limit 1 ", ECPGt_EOIT, 
+    { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from customers limit 1", ECPGt_EOIT, 
 	ECPGt_varchar,&(custs4.name),(long)50,(long)1,sizeof(struct varchar_name_41), 
 	ECPGt_short,&(inds[0].name_ind),(long)1,(long)1,sizeof(short), 
 	ECPGt_int,&(custs4.phone),(long)1,(long)1,sizeof(int), 
@@ -254,7 +254,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
     printf( "name  - %s\n", custs4.name.arr );
     printf( "phone - %d\n", custs4.phone );
 
-    { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  c  from customers     limit 2 ", ECPGt_EOIT, 
+    { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select c from customers limit 2", ECPGt_EOIT, 
 	ECPGt_varchar,(onlyname),(long)50,(long)2,sizeof(struct varchar_onlyname_45), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
 #line 85 "array_of_struct.pgc"

src/interfaces/ecpg/test/expected/preproc-array_of_struct.stderr

@@ -2,25 +2,25 @@
 [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 52: query: create  table customers ( c varchar ( 50 )    , p int   )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 52: query: create table customers ( c varchar ( 50 ) , p int ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 52: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 52: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 53: query: insert into customers values ( 'John Doe' , '12345' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 53: query: insert into customers values ( 'John Doe' , '12345' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 53: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 53: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 54: query: insert into customers values ( 'Jane Doe' , '67890' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 54: query: insert into customers values ( 'Jane Doe' , '67890' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 54: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 54: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 56: query: select  *  from customers     limit 2 ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 56: query: select * from customers limit 2; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 56: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -34,7 +34,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 56: RESULT: 67890 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 64: query: select  *  from customers     limit 2 ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 64: query: select * from customers limit 2; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 64: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -48,7 +48,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 64: RESULT: 67890 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 72: query: select  *  from customers     limit 2 ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 72: query: select * from customers limit 2; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 72: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -62,7 +62,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 72: RESULT: 67890 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 80: query: select  *  from customers     limit 1 ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 80: query: select * from customers limit 1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 80: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -72,7 +72,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 80: RESULT: 12345 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 85: query: select  c  from customers     limit 2 ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 85: query: select c from customers limit 2; 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]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/preproc-autoprep.c

@@ -28,7 +28,7 @@ int main(int argc, char* argv[]) {
   	     
   
 #line 10 "autoprep.pgc"
- int  item  [ 4 ]   ,  ind  [ 4 ]   ,  i   = 1 ;
+ int item [ 4 ] , ind [ 4 ] , i = 1 ;
 /* exec sql end declare section */
 #line 11 "autoprep.pgc"
 
@@ -45,7 +45,7 @@ int main(int argc, char* argv[]) {
 #line 17 "autoprep.pgc"
 
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_prepnormal, "create  table T ( Item1 int   , Item2 int   )    ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_prepnormal, "create table T ( Item1 int , Item2 int )", ECPGt_EOIT, ECPGt_EORT);
 #line 19 "autoprep.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -55,7 +55,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 19 "autoprep.pgc"
 
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_prepnormal, "insert into T values ( 1 , null ) ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_prepnormal, "insert into T values ( 1 , null )", ECPGt_EOIT, ECPGt_EORT);
 #line 21 "autoprep.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -64,7 +64,7 @@ if (sqlca.sqlwarn[0] == 'W') sqlprint();
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 21 "autoprep.pgc"
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_prepnormal, "insert into T values ( 1 ,  $1  ) ", 
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_prepnormal, "insert into T values ( 1 , $1  )", 
 	ECPGt_int,&(i),(long)1,(long)1,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
 #line 22 "autoprep.pgc"
@@ -76,7 +76,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 22 "autoprep.pgc"
 
   i++;
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_prepnormal, "insert into T values ( 1 ,  $1  ) ", 
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_prepnormal, "insert into T values ( 1 , $1  )", 
 	ECPGt_int,&(i),(long)1,(long)1,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
 #line 24 "autoprep.pgc"
@@ -87,7 +87,7 @@ if (sqlca.sqlwarn[0] == 'W') sqlprint();
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 24 "autoprep.pgc"
 
-  { ECPGprepare(__LINE__, NULL, 0, "i", " insert into T values ( 1 , 2 )  ");
+  { ECPGprepare(__LINE__, NULL, 0, "i", " insert into T values ( 1 , 2 ) ");
 #line 25 "autoprep.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -106,7 +106,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 26 "autoprep.pgc"
 
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_prepnormal, "select  Item2  from T    order by Item2  nulls last", ECPGt_EOIT, 
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_prepnormal, "select Item2 from T order by Item2 nulls last", ECPGt_EOIT, 
 	ECPGt_int,(item),(long)1,(long)4,sizeof(int), 
 	ECPGt_int,(ind),(long)1,(long)4,sizeof(int), ECPGt_EORT);
 #line 28 "autoprep.pgc"
@@ -121,11 +121,11 @@ if (sqlca.sqlcode < 0) sqlprint();}
   for (i=0; i<4; i++)
   	printf("item[%d] = %d\n", i, ind[i] ? -1 : item[i]);
 
-  /* declare C  cursor  for select  Item1  from T    */
+  /* declare C cursor for select Item1 from T */
 #line 33 "autoprep.pgc"
 
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_prepnormal, "declare C  cursor  for select  Item1  from T   ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_prepnormal, "declare C cursor for select Item1 from T", ECPGt_EOIT, ECPGt_EORT);
 #line 35 "autoprep.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -158,7 +158,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 40 "autoprep.pgc"
 
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_prepnormal, "drop table T ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_prepnormal, "drop table T", ECPGt_EOIT, ECPGt_EORT);
 #line 42 "autoprep.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();

src/interfaces/ecpg/test/expected/preproc-autoprep.stderr

@@ -4,61 +4,61 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_auto_prepare on line 19: statement not in cache; inserting
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGprepare on line 19: name ecpg1; query: "create  table T ( Item1 int   , Item2 int   )    "
+[NO_PID]: ECPGprepare on line 19: name ecpg1; query: "create table T ( Item1 int , Item2 int )"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 19: query: create  table T ( Item1 int   , Item2 int   )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 19: query: create table T ( Item1 int , Item2 int ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 19: using PQexecPrepared for "create  table T ( Item1 int   , Item2 int   )    "
+[NO_PID]: ecpg_execute on line 19: using PQexecPrepared for "create table T ( Item1 int , Item2 int )"
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 19: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_auto_prepare on line 21: statement not in cache; inserting
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGprepare on line 21: name ecpg2; query: "insert into T values ( 1 , null ) "
+[NO_PID]: ECPGprepare on line 21: name ecpg2; query: "insert into T values ( 1 , null )"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 21: query: insert into T values ( 1 , null ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 21: query: insert into T values ( 1 , null ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 21: using PQexecPrepared for "insert into T values ( 1 , null ) "
+[NO_PID]: ecpg_execute on line 21: using PQexecPrepared for "insert into T values ( 1 , null )"
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 21: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_auto_prepare on line 22: statement not in cache; inserting
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGprepare on line 22: name ecpg3; query: "insert into T values ( 1 ,  $1  ) "
+[NO_PID]: ECPGprepare on line 22: name ecpg3; query: "insert into T values ( 1 , $1  )"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 22: query: insert into T values ( 1 ,  $1  ) ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 22: query: insert into T values ( 1 , $1  ); with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 22: using PQexecPrepared for "insert into T values ( 1 ,  $1  ) "
+[NO_PID]: ecpg_execute on line 22: using PQexecPrepared for "insert into T values ( 1 , $1  )"
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: free_params on line 22: parameter 1 = 1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 22: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_auto_prepare on line 24: statement found in cache; entry 6248
+[NO_PID]: ecpg_auto_prepare on line 24: statement found in cache; entry 1640
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 24: query: insert into T values ( 1 ,  $1  ) ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 24: query: insert into T values ( 1 , $1  ); with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 24: using PQexecPrepared for "insert into T values ( 1 ,  $1  ) "
+[NO_PID]: ecpg_execute on line 24: using PQexecPrepared for "insert into T values ( 1 , $1  )"
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: free_params on line 24: parameter 1 = 2
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 24: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGprepare on line 25: name i; query: " insert into T values ( 1 , 2 )  "
+[NO_PID]: ECPGprepare on line 25: name i; query: " insert into T values ( 1 , 2 ) "
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 26: query:  insert into T values ( 1 , 2 )  ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 26: query:  insert into T values ( 1 , 2 ) ; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 26: using PQexecPrepared for " insert into T values ( 1 , 2 )  "
+[NO_PID]: ecpg_execute on line 26: using PQexecPrepared for " insert into T values ( 1 , 2 ) "
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_auto_prepare on line 28: statement not in cache; inserting
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGprepare on line 28: name ecpg4; query: "select  Item2  from T    order by Item2  nulls last"
+[NO_PID]: ECPGprepare on line 28: name ecpg4; query: "select Item2 from T order by Item2 nulls last"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 28: query: select  Item2  from T    order by Item2  nulls last; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 28: query: select Item2 from T order by Item2 nulls last; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 28: using PQexecPrepared for "select  Item2  from T    order by Item2  nulls last"
+[NO_PID]: ecpg_execute on line 28: using PQexecPrepared for "select Item2 from T order by Item2 nulls last"
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 28: correctly got 4 tuples with 1 fields
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -72,11 +72,11 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_auto_prepare on line 35: statement not in cache; inserting
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGprepare on line 35: name ecpg5; query: "declare C  cursor  for select  Item1  from T   "
+[NO_PID]: ECPGprepare on line 35: name ecpg5; query: "declare C cursor for select Item1 from T"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 35: query: declare C  cursor  for select  Item1  from T   ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 35: query: declare C cursor for select Item1 from T; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 35: using PQexecPrepared for "declare C  cursor  for select  Item1  from T   "
+[NO_PID]: ecpg_execute on line 35: using PQexecPrepared for "declare C cursor for select Item1 from T"
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 35: OK: DECLARE CURSOR
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -104,11 +104,11 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_auto_prepare on line 42: statement not in cache; inserting
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGprepare on line 42: name ecpg8; query: "drop table T "
+[NO_PID]: ECPGprepare on line 42: name ecpg8; query: "drop table T"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 42: query: drop table T ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 42: query: drop table T; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 42: using PQexecPrepared for "drop table T "
+[NO_PID]: ecpg_execute on line 42: using PQexecPrepared for "drop table T"
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 42: OK: DROP TABLE
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/preproc-define.c

@@ -30,7 +30,7 @@
 
 
 
-/* exec sql type intarray is int  [ 6 ]  */
+/* exec sql type intarray is int [ 6 ] */
 #line 13 "define.pgc"
 
 typedef int intarray[ 6];
@@ -40,27 +40,27 @@ main(void)
 {
 /* exec sql begin declare section */
 
-	   typedef char  string  [ 8 ];
+	   typedef char  string [ 8 ];
 
 #line 21 "define.pgc"
 
 	 
 	   
 	  	 
- 
+
 #line 22 "define.pgc"
- intarray  amount    ;
+ intarray amount ;
  
 #line 23 "define.pgc"
- char  name  [ 6 ] [ 8 ]   ;
+ char name [ 6 ] [ 8 ] ;
  
 #line 24 "define.pgc"
- char  letter  [ 6 ] [ 1 ]   ;
+ char letter [ 6 ] [ 1 ] ;
  
 #if 0
  
 #line 26 "define.pgc"
- int  not_used    ;
+ int not_used ;
  
 #endif
 /* exec sql end declare section */
@@ -77,39 +77,39 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 34 "define.pgc"
 
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create  table test ( name char  ( 8 )    , amount int   , letter char  ( 1 )    )    ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table test ( name char ( 8 ) , amount int , letter char ( 1 ) )", ECPGt_EOIT, ECPGt_EORT);
 #line 36 "define.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 36 "define.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "commit ");
+	{ ECPGtrans(__LINE__, NULL, "commit");
 #line 37 "define.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 37 "define.pgc"
 
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into Test ( name  , amount  , letter  ) values ( 'false' , 1 , 'f' ) ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into Test ( name , amount , letter ) values ( 'false' , 1 , 'f' )", ECPGt_EOIT, ECPGt_EORT);
 #line 39 "define.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 39 "define.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test ( name  , amount  , letter  ) values ( 'true' , 2 , 't' ) ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test ( name , amount , letter ) values ( 'true' , 2 , 't' )", ECPGt_EOIT, ECPGt_EORT);
 #line 40 "define.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 40 "define.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "commit ");
+	{ ECPGtrans(__LINE__, NULL, "commit");
 #line 41 "define.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 41 "define.pgc"
 
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  *  from test   ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from test", ECPGt_EOIT, 
 	ECPGt_char,(name),(long)8,(long)6,(8)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_int,(amount),(long)1,(long)6,sizeof(int), 
@@ -129,10 +129,10 @@ if (sqlca.sqlcode < 0) sqlprint();}
 		   
 		
 #line 48 "define.pgc"
- char  n  [ 8 ]   ,  l   = letter [ i ] [ 0 ] ;
+ char n [ 8 ] , l = letter [ i ] [ 0 ] ;
  
 #line 49 "define.pgc"
- int  a   = amount [ i ] ;
+ int a = amount [ i ] ;
 /* exec sql end declare section */
 #line 50 "define.pgc"
 
@@ -141,13 +141,13 @@ if (sqlca.sqlcode < 0) sqlprint();}
 		printf("name[%d]=%8.8s\tamount[%d]=%d\tletter[%d]=%c\n", i, n, i, a, i, l);
 	}
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table test ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table test", ECPGt_EOIT, ECPGt_EORT);
 #line 56 "define.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 56 "define.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "commit ");
+	{ ECPGtrans(__LINE__, NULL, "commit");
 #line 57 "define.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}

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

@@ -2,29 +2,29 @@
 [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 36: query: create  table test ( name char  ( 8 )    , amount int   , letter char  ( 1 )    )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 36: query: create table test ( name char ( 8 ) , amount int , letter char ( 1 ) ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 36: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 36: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 37: action "commit "; connection "regress1"
+[NO_PID]: ECPGtrans on line 37: action "commit"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 39: query: insert into Test ( name  , amount  , letter  ) values ( 'false' , 1 , 'f' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 39: query: insert into Test ( name , amount , letter ) values ( 'false' , 1 , 'f' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 39: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 39: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 40: query: insert into test ( name  , amount  , letter  ) values ( 'true' , 2 , 't' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 40: query: insert into test ( name , amount , letter ) values ( 'true' , 2 , 't' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 40: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 40: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 41: action "commit "; connection "regress1"
+[NO_PID]: ECPGtrans on line 41: action "commit"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 43: query: select  *  from test   ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 43: query: select * from test; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 43: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -42,13 +42,13 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 43: RESULT: t offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 56: query: drop table test ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 56: query: drop table test; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 56: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 56: OK: DROP TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 57: action "commit "; connection "regress1"
+[NO_PID]: ECPGtrans on line 57: 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

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

@@ -150,37 +150,37 @@ int main(void)
 		  /* = 1L */ 
 	
 #line 60 "init.pgc"
- int  a   = ( int ) 2 ;
+ int a = ( int ) 2 ;
  
 #line 61 "init.pgc"
- int  b   = 2 + 2 ;
+ int b = 2 + 2 ;
  
 #line 62 "init.pgc"
- int  b2   = ( 14 * 7 ) ;
+ int b2 = ( 14 * 7 ) ;
  
 #line 63 "init.pgc"
- int  d   = x . member ;
+ int d = x . member ;
  
 #line 64 "init.pgc"
- int  g   = fb ( 2 ) ;
+ int g = fb ( 2 ) ;
  
 #line 65 "init.pgc"
- int  i   = 3 ^ 1 ;
+ int i = 3 ^ 1 ;
  
 #line 66 "init.pgc"
- int  j   = 1 ? 1 : 2 ;
+ int j = 1 ? 1 : 2 ;
  
 #line 68 "init.pgc"
- int  e   = y -> member ;
+ int e = y -> member ;
  
 #line 69 "init.pgc"
- int  c   = 10 >> 2 ;
+ int c = 10 >> 2 ;
  
 #line 70 "init.pgc"
- bool  h   = 2 || 1 ;
+ bool h = 2 || 1 ;
  
 #line 71 "init.pgc"
- long  iay    ;
+ long iay ;
 /* exec sql end declare section */
 #line 72 "init.pgc"
 
@@ -192,7 +192,7 @@ int main(void)
 	  /* compile error */
 	
 #line 78 "init.pgc"
- int  k   = N : : i ;
+ int k = N : : i ;
 /* exec sql end declare section */
 #line 79 "init.pgc"
 
@@ -203,19 +203,19 @@ int main(void)
 	printf("%d %d %d %d %d %d %d %d %d %d %d\n", a, b, b2, c, d, e, f, g, h, i, j);
 	iay = 0;
 	printf("%ld\n", iay);
-	/* exec sql whenever sqlerror  do fa (  ) ; */
+	/* exec sql whenever sqlerror  do fa ( ) ; */
 #line 87 "init.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  now ( )     ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select now ( )", ECPGt_EOIT, ECPGt_EORT);
 #line 88 "init.pgc"
 
-if (sqlca.sqlcode < 0) fa (  );}
+if (sqlca.sqlcode < 0) fa ( );}
 #line 88 "init.pgc"
 
 	/* exec sql whenever sqlerror  do fb ( 20 ) ; */
 #line 89 "init.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  now ( )     ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select now ( )", ECPGt_EOIT, ECPGt_EORT);
 #line 90 "init.pgc"
 
 if (sqlca.sqlcode < 0) fb ( 20 );}
@@ -224,7 +224,7 @@ if (sqlca.sqlcode < 0) fb ( 20 );}
 	/* exec sql whenever sqlerror  do fc ( \"50\" ) ; */
 #line 91 "init.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  now ( )     ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select now ( )", ECPGt_EOIT, ECPGt_EORT);
 #line 92 "init.pgc"
 
 if (sqlca.sqlcode < 0) fc ( "50" );}
@@ -233,7 +233,7 @@ if (sqlca.sqlcode < 0) fc ( "50" );}
 	/* exec sql whenever sqlerror  do fd ( \"50\" , 1 ) ; */
 #line 93 "init.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  now ( )     ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select now ( )", ECPGt_EOIT, ECPGt_EORT);
 #line 94 "init.pgc"
 
 if (sqlca.sqlcode < 0) fd ( "50" , 1 );}
@@ -242,7 +242,7 @@ if (sqlca.sqlcode < 0) fd ( "50" , 1 );}
 	/* exec sql whenever sqlerror  do fe ( ENUM0 ) ; */
 #line 95 "init.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  now ( )     ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select now ( )", ECPGt_EOIT, ECPGt_EORT);
 #line 96 "init.pgc"
 
 if (sqlca.sqlcode < 0) fe ( ENUM0 );}
@@ -251,7 +251,7 @@ if (sqlca.sqlcode < 0) fe ( ENUM0 );}
 	/* exec sql whenever sqlerror  do sqlnotice ( NULL , 0 ) ; */
 #line 97 "init.pgc"
  
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  now ( )     ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select now ( )", ECPGt_EOIT, ECPGt_EORT);
 #line 98 "init.pgc"
 
 if (sqlca.sqlcode < 0) sqlnotice ( NULL , 0 );}

src/interfaces/ecpg/test/expected/preproc-strings.c

@@ -24,7 +24,7 @@
       
 
 #line 6 "strings.pgc"
- char * s1    , * s2    , * s3    , * s4    , * s5    , * s6    ;
+ char * s1 , * s2 , * s3 , * s4 , * s5 , * s6 ;
 /* exec sql end declare section */
 #line 7 "strings.pgc"
 
@@ -37,7 +37,7 @@ int main(void)
 #line 13 "strings.pgc"
 
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  'abcdef' , N'abcdef' as foo , E'abc\\bdef' as \"foo\" , U&'d\\0061t\\0061' as U&\"foo\" , U&'d!+000061t!+000061' uescape '!' , $foo$abc$def$foo$     ", ECPGt_EOIT, 
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select 'abcdef' , N'abcdef' as foo , E'abc\\bdef' as \"foo\" , U&'d\\0061t\\0061' as U&\"foo\" , U&'d!+000061t!+000061' uescape '!' , $foo$abc$def$foo$", ECPGt_EOIT, 
 	ECPGt_char,&(s1),(long)0,(long)1,(1)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_char,&(s2),(long)0,(long)1,(1)*sizeof(char), 

src/interfaces/ecpg/test/expected/preproc-strings.stderr

@@ -2,7 +2,7 @@
 [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 15: query: select  'abcdef' , N'abcdef' as foo , E'abc\bdef' as "foo" , U&'d\0061t\0061' as U&"foo" , U&'d!+000061t!+000061' uescape '!' , $foo$abc$def$foo$     ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 15: query: select 'abcdef' , N'abcdef' as foo , E'abc\bdef' as "foo" , U&'d\0061t\0061' as U&"foo" , U&'d!+000061t!+000061' uescape '!' , $foo$abc$def$foo$; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 15: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/preproc-type.c

@@ -40,12 +40,12 @@ typedef short  mmSmallInt ;
 #line 8 "type.pgc"
 
 
-/* exec sql type string is char  [ 11 ]  */
+/* exec sql type string is char [ 11 ] */
 #line 10 "type.pgc"
 
 typedef char string[11];
 
-/* exec sql type c is char  reference */
+/* exec sql type c is char reference */
 #line 13 "type.pgc"
 
 typedef char* c;
@@ -59,13 +59,13 @@ typedef char* c;
 
 struct TBempl { 
 #line 19 "type.pgc"
- mmInteger  idnum    ;
+ mmInteger idnum ;
  
 #line 20 "type.pgc"
- mmChar  name  [ 21 ]   ;
+ mmChar name [ 21 ] ;
  
 #line 21 "type.pgc"
- mmSmallInt  accs    ;
+ mmSmallInt accs ;
  } ;/* exec sql end declare section */
 #line 23 "type.pgc"
 
@@ -84,27 +84,27 @@ main (void)
    
   
 #line 29 "type.pgc"
- struct TBempl  empl    ;
+ struct TBempl empl ;
  
 #line 30 "type.pgc"
- string  str    ;
+ string str ;
  
 #line 31 "type.pgc"
- c  ptr   = NULL ;
+ c ptr = NULL ;
  
 #line 36 "type.pgc"
  struct varchar_vc { 
 #line 34 "type.pgc"
- int  len    ;
+ int len ;
  
 #line 35 "type.pgc"
- char  text  [ 10 ]   ;
- }  vc    ;
+ char text [ 10 ] ;
+ } vc ;
 /* exec sql end declare section */
 #line 37 "type.pgc"
 
 
-  /* exec sql var vc is   [ 10 ]  */
+  /* exec sql var vc is [ 10 ] */
 #line 39 "type.pgc"
 
   ECPGdebug (1, stderr);
@@ -119,7 +119,7 @@ main (void)
       exit (sqlca.sqlcode);
     }
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create  table empl ( idnum integer   , name char  ( 20 )    , accs smallint   , string1 char  ( 10 )    , string2 char  ( 10 )    , string3 char  ( 10 )    )    ", ECPGt_EOIT, ECPGt_EORT);}
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table empl ( idnum integer , name char ( 20 ) , accs smallint , string1 char ( 10 ) , string2 char ( 10 ) , string3 char ( 10 ) )", ECPGt_EOIT, ECPGt_EORT);}
 #line 51 "type.pgc"
 
   if (sqlca.sqlcode)
@@ -128,7 +128,7 @@ main (void)
       exit (sqlca.sqlcode);
     }
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into empl values ( 1 , 'user name' , 320 , 'first str' , 'second str' , 'third str' ) ", ECPGt_EOIT, ECPGt_EORT);}
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into empl values ( 1 , 'user name' , 320 , 'first str' , 'second str' , 'third str' )", ECPGt_EOIT, ECPGt_EORT);}
 #line 58 "type.pgc"
 
   if (sqlca.sqlcode)
@@ -137,7 +137,7 @@ main (void)
       exit (sqlca.sqlcode);
     }
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  idnum , name , accs , string1 , string2 , string3  from empl where idnum =  $1   ", 
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select idnum , name , accs , string1 , string2 , string3 from empl where idnum = $1 ", 
 	ECPGt_long,&(empl.idnum),(long)1,(long)1,sizeof(long), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, 
 	ECPGt_long,&(empl.idnum),(long)1,(long)1,sizeof(long), 

src/interfaces/ecpg/test/expected/preproc-type.stderr

@@ -2,19 +2,19 @@
 [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 50: query: create  table empl ( idnum integer   , name char  ( 20 )    , accs smallint   , string1 char  ( 10 )    , string2 char  ( 10 )    , string3 char  ( 10 )    )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 50: query: create table empl ( idnum integer , name char ( 20 ) , accs smallint , string1 char ( 10 ) , string2 char ( 10 ) , string3 char ( 10 ) ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 50: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 50: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 58: query: insert into empl values ( 1 , 'user name' , 320 , 'first str' , 'second str' , 'third str' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 58: query: insert into empl values ( 1 , 'user name' , 320 , 'first str' , 'second str' , 'third str' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 58: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 58: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 65: query: select  idnum , name , accs , string1 , string2 , string3  from empl where idnum =  $1   ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 65: query: select idnum , name , accs , string1 , string2 , string3 from empl where idnum = $1 ; with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 65: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000

src/interfaces/ecpg/test/expected/preproc-variable.c

@@ -25,28 +25,28 @@
 #line 6 "variable.pgc"
 
 
-/* exec sql type c is char  reference */
+/* exec sql type c is char reference */
 #line 8 "variable.pgc"
 
 typedef char* c;
 
 /* exec sql type ind is union { 
 #line 11 "variable.pgc"
- int  integer    ;
+ int integer ;
  
 #line 11 "variable.pgc"
- short  smallint    ;
- }   */
+ short smallint ;
+ } */
 #line 11 "variable.pgc"
 
 typedef union { int integer; short smallint; } ind;
 
 #define BUFFERSIZ 8
-/* exec sql type str is   [ BUFFERSIZ ]  */
+/* exec sql type str is [ BUFFERSIZ ] */
 #line 15 "variable.pgc"
 
 
-/* declare cur  cursor  for select  name , born , age , married , children  from family    */
+/* declare cur cursor for select name , born , age , married , children from family */
 #line 18 "variable.pgc"
 
 
@@ -55,10 +55,10 @@ main (void)
 {
 	struct birthinfo { 
 #line 23 "variable.pgc"
- long  born    ;
+ long born ;
  
 #line 23 "variable.pgc"
- short  age    ;
+ short age ;
  } ;
 #line 23 "variable.pgc"
 
@@ -74,42 +74,42 @@ main (void)
 #line 27 "variable.pgc"
  struct personal_struct { 
 #line 25 "variable.pgc"
-   struct varchar_name_25  { int len; char arr[ BUFFERSIZ ]; }  name    ;
+  struct varchar_name_25  { int len; char arr[ BUFFERSIZ ]; }  name ;
  
 #line 26 "variable.pgc"
- struct birthinfo  birth    ;
- }  personal    , * p    ;
+ struct birthinfo birth ;
+ } personal , * p ;
  
 #line 30 "variable.pgc"
  struct personal_indicator { 
 #line 28 "variable.pgc"
- int  ind_name    ;
+ int ind_name ;
  
 #line 29 "variable.pgc"
- struct birthinfo  ind_birth    ;
- }  ind_personal    , * i    ;
+ struct birthinfo ind_birth ;
+ } ind_personal , * i ;
  
 #line 31 "variable.pgc"
- ind  ind_children    ;
+ ind ind_children ;
 /* exec sql end declare section */
 #line 32 "variable.pgc"
 
 
 	
 #line 34 "variable.pgc"
- char * married   = NULL ;
+ char * married = NULL ;
 
 #line 34 "variable.pgc"
 
 	
 #line 35 "variable.pgc"
- long  ind_married    ;
+ long ind_married ;
 
 #line 35 "variable.pgc"
 
 	
 #line 36 "variable.pgc"
- ind  children    ;
+ ind children ;
 
 #line 36 "variable.pgc"
 
@@ -135,7 +135,7 @@ if (sqlca.sqlcode < 0) exit (1);}
 
 
 	strcpy(msg, "create");
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create  table family ( name char  ( 8 )    , born integer   , age smallint   , married date    , children integer   )    ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table family ( name char ( 8 ) , born integer , age smallint , married date , children integer )", ECPGt_EOIT, ECPGt_EORT);
 #line 49 "variable.pgc"
 
 if (sqlca.sqlcode < 0) exit (1);}
@@ -143,31 +143,31 @@ if (sqlca.sqlcode < 0) exit (1);}
 
 
 	strcpy(msg, "insert");
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into family ( name  , married  , children  ) values ( 'Mum' , '19870714' , 3 ) ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into family ( name , married , children ) values ( 'Mum' , '19870714' , 3 )", ECPGt_EOIT, ECPGt_EORT);
 #line 52 "variable.pgc"
 
 if (sqlca.sqlcode < 0) exit (1);}
 #line 52 "variable.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into family ( name  , born  , married  , children  ) values ( 'Dad' , '19610721' , '19870714' , 3 ) ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into family ( name , born , married , children ) values ( 'Dad' , '19610721' , '19870714' , 3 )", ECPGt_EOIT, ECPGt_EORT);
 #line 53 "variable.pgc"
 
 if (sqlca.sqlcode < 0) exit (1);}
 #line 53 "variable.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into family ( name  , age  ) values ( 'Child 1' , 16 ) ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into family ( name , age ) values ( 'Child 1' , 16 )", ECPGt_EOIT, ECPGt_EORT);
 #line 54 "variable.pgc"
 
 if (sqlca.sqlcode < 0) exit (1);}
 #line 54 "variable.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into family ( name  , age  ) values ( 'Child 2' , 14 ) ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into family ( name , age ) values ( 'Child 2' , 14 )", ECPGt_EOIT, ECPGt_EORT);
 #line 55 "variable.pgc"
 
 if (sqlca.sqlcode < 0) exit (1);}
 #line 55 "variable.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into family ( name  , age  ) values ( 'Child 3' , 9 ) ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into family ( name , age ) values ( 'Child 3' , 9 )", ECPGt_EOIT, ECPGt_EORT);
 #line 56 "variable.pgc"
 
 if (sqlca.sqlcode < 0) exit (1);}
@@ -175,7 +175,7 @@ if (sqlca.sqlcode < 0) exit (1);}
 
 
 	strcpy(msg, "commit");
-	{ ECPGtrans(__LINE__, NULL, "commit ");
+	{ ECPGtrans(__LINE__, NULL, "commit");
 #line 59 "variable.pgc"
 
 if (sqlca.sqlcode < 0) exit (1);}
@@ -183,7 +183,7 @@ if (sqlca.sqlcode < 0) exit (1);}
 
 
 	strcpy(msg, "open");
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare cur  cursor  for select  name , born , age , married , children  from family   ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare cur cursor for select name , born , age , married , children from family", ECPGt_EOIT, ECPGt_EORT);
 #line 62 "variable.pgc"
 
 if (sqlca.sqlcode < 0) exit (1);}
@@ -242,7 +242,7 @@ if (sqlca.sqlcode < 0) exit (1);}
 
 
 	strcpy(msg, "drop");
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table family ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table family", ECPGt_EOIT, ECPGt_EORT);
 #line 91 "variable.pgc"
 
 if (sqlca.sqlcode < 0) exit (1);}
@@ -250,7 +250,7 @@ if (sqlca.sqlcode < 0) exit (1);}
 
 
 	strcpy(msg, "commit");
-	{ ECPGtrans(__LINE__, NULL, "commit ");
+	{ ECPGtrans(__LINE__, NULL, "commit");
 #line 94 "variable.pgc"
 
 if (sqlca.sqlcode < 0) exit (1);}

src/interfaces/ecpg/test/expected/preproc-variable.stderr

@@ -8,45 +8,45 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 46: OK: SET
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 49: query: create  table family ( name char  ( 8 )    , born integer   , age smallint   , married date    , children integer   )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 49: query: create table family ( name char ( 8 ) , born integer , age smallint , married date , children integer ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 49: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 49: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 52: query: insert into family ( name  , married  , children  ) values ( 'Mum' , '19870714' , 3 ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 52: query: insert into family ( name , married , children ) values ( 'Mum' , '19870714' , 3 ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 52: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 52: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 53: query: insert into family ( name  , born  , married  , children  ) values ( 'Dad' , '19610721' , '19870714' , 3 ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 53: query: insert into family ( name , born , married , children ) values ( 'Dad' , '19610721' , '19870714' , 3 ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 53: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 53: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 54: query: insert into family ( name  , age  ) values ( 'Child 1' , 16 ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 54: query: insert into family ( name , age ) values ( 'Child 1' , 16 ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 54: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 54: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 55: query: insert into family ( name  , age  ) values ( 'Child 2' , 14 ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 55: query: insert into family ( name , age ) values ( 'Child 2' , 14 ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 55: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 55: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 56: query: insert into family ( name  , age  ) values ( 'Child 3' , 9 ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 56: query: insert into family ( name , age ) values ( 'Child 3' , 9 ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 56: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 56: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 59: action "commit "; connection "regress1"
+[NO_PID]: ECPGtrans on line 59: action "commit"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 62: query: declare cur  cursor  for select  name , born , age , married , children  from family   ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 62: query: declare cur cursor for select name , born , age , married , children from family; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 62: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -156,13 +156,13 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 88: OK: CLOSE CURSOR
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 91: query: drop table family ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 91: query: drop table family; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 91: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 91: OK: DROP TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 94: action "commit "; connection "regress1"
+[NO_PID]: ECPGtrans on line 94: 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

src/interfaces/ecpg/test/expected/preproc-whenever.c

@@ -45,13 +45,13 @@ int main(void)
 {
 	
 #line 26 "whenever.pgc"
- int  i    ;
+ int i ;
 
 #line 26 "whenever.pgc"
 
 	
 #line 27 "whenever.pgc"
- char  c  [ 6 ]   ;
+ char c [ 6 ] ;
 
 #line 27 "whenever.pgc"
 
@@ -64,60 +64,60 @@ int main(void)
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 31 "whenever.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create  table test ( i int   , c char  ( 10 )    )    ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table test ( i int , c char ( 10 ) )", ECPGt_EOIT, ECPGt_EORT);
 #line 32 "whenever.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 32 "whenever.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( 1 , 'abcdefghij' ) ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( 1 , 'abcdefghij' )", ECPGt_EOIT, ECPGt_EORT);
 #line 33 "whenever.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 33 "whenever.pgc"
 
 
-	/* exec sql whenever sql_warning  do warn (  ) ; */
+	/* exec sql whenever sql_warning  do warn ( ) ; */
 #line 35 "whenever.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  *  from test   ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from test", ECPGt_EOIT, 
 	ECPGt_int,&(i),(long)1,(long)1,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_char,(c),(long)6,(long)1,(6)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
 #line 36 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+if (sqlca.sqlwarn[0] == 'W') warn ( );
 #line 36 "whenever.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 36 "whenever.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "rollback ");
+	{ ECPGtrans(__LINE__, NULL, "rollback");
 #line 37 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+if (sqlca.sqlwarn[0] == 'W') warn ( );
 #line 37 "whenever.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 37 "whenever.pgc"
 
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  *  from nonexistant   ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from nonexistant", ECPGt_EOIT, 
 	ECPGt_int,&(i),(long)1,(long)1,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
 #line 39 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+if (sqlca.sqlwarn[0] == 'W') warn ( );
 #line 39 "whenever.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 39 "whenever.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "rollback ");
+	{ ECPGtrans(__LINE__, NULL, "rollback");
 #line 40 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+if (sqlca.sqlwarn[0] == 'W') warn ( );
 #line 40 "whenever.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
@@ -127,78 +127,78 @@ if (sqlca.sqlcode < 0) sqlprint();}
 	/* exec sql whenever sqlerror  do print ( \"select\" ) ; */
 #line 42 "whenever.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  *  from nonexistant   ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from nonexistant", ECPGt_EOIT, 
 	ECPGt_int,&(i),(long)1,(long)1,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
 #line 43 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+if (sqlca.sqlwarn[0] == 'W') warn ( );
 #line 43 "whenever.pgc"
 
 if (sqlca.sqlcode < 0) print ( "select" );}
 #line 43 "whenever.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "rollback ");
+	{ ECPGtrans(__LINE__, NULL, "rollback");
 #line 44 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+if (sqlca.sqlwarn[0] == 'W') warn ( );
 #line 44 "whenever.pgc"
 
 if (sqlca.sqlcode < 0) print ( "select" );}
 #line 44 "whenever.pgc"
 
 
-	/* exec sql whenever sqlerror  call print2 (  ) ; */
+	/* exec sql whenever sqlerror  call print2 ( ) ; */
 #line 46 "whenever.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  *  from nonexistant   ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from nonexistant", ECPGt_EOIT, 
 	ECPGt_int,&(i),(long)1,(long)1,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
 #line 47 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+if (sqlca.sqlwarn[0] == 'W') warn ( );
 #line 47 "whenever.pgc"
 
-if (sqlca.sqlcode < 0) print2 (  );}
+if (sqlca.sqlcode < 0) print2 ( );}
 #line 47 "whenever.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "rollback ");
+	{ ECPGtrans(__LINE__, NULL, "rollback");
 #line 48 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+if (sqlca.sqlwarn[0] == 'W') warn ( );
 #line 48 "whenever.pgc"
 
-if (sqlca.sqlcode < 0) print2 (  );}
+if (sqlca.sqlcode < 0) print2 ( );}
 #line 48 "whenever.pgc"
 
 
 	/* exec sql whenever sqlerror  continue ; */
 #line 50 "whenever.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  *  from nonexistant   ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from nonexistant", ECPGt_EOIT, 
 	ECPGt_int,&(i),(long)1,(long)1,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
 #line 51 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );}
+if (sqlca.sqlwarn[0] == 'W') warn ( );}
 #line 51 "whenever.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "rollback ");
+	{ ECPGtrans(__LINE__, NULL, "rollback");
 #line 52 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );}
+if (sqlca.sqlwarn[0] == 'W') warn ( );}
 #line 52 "whenever.pgc"
 
 
 	/* exec sql whenever sqlerror  goto  error ; */
 #line 54 "whenever.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  *  from nonexistant   ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from nonexistant", ECPGt_EOIT, 
 	ECPGt_int,&(i),(long)1,(long)1,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
 #line 55 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+if (sqlca.sqlwarn[0] == 'W') warn ( );
 #line 55 "whenever.pgc"
 
 if (sqlca.sqlcode < 0) goto error;}
@@ -207,10 +207,10 @@ if (sqlca.sqlcode < 0) goto error;}
 	printf("Should not be reachable\n");
 
 	error:
-	{ ECPGtrans(__LINE__, NULL, "rollback ");
+	{ ECPGtrans(__LINE__, NULL, "rollback");
 #line 59 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+if (sqlca.sqlwarn[0] == 'W') warn ( );
 #line 59 "whenever.pgc"
 
 if (sqlca.sqlcode < 0) goto error;}
@@ -222,21 +222,21 @@ if (sqlca.sqlcode < 0) goto error;}
 
 	/* This cannot fail, thus we don't get an exit value not equal 0. */
 	/* However, it still test the precompiler output. */
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  1     ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select 1", ECPGt_EOIT, 
 	ECPGt_int,&(i),(long)1,(long)1,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
 #line 64 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+if (sqlca.sqlwarn[0] == 'W') warn ( );
 #line 64 "whenever.pgc"
 
 if (sqlca.sqlcode < 0) exit (1);}
 #line 64 "whenever.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "rollback ");
+	{ ECPGtrans(__LINE__, NULL, "rollback");
 #line 65 "whenever.pgc"
 
-if (sqlca.sqlwarn[0] == 'W') warn (  );
+if (sqlca.sqlwarn[0] == 'W') warn ( );
 #line 65 "whenever.pgc"
 
 if (sqlca.sqlcode < 0) exit (1);}

src/interfaces/ecpg/test/expected/preproc-whenever.stderr

@@ -2,19 +2,19 @@
 [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 32: query: create  table test ( i int   , c char  ( 10 )    )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 32: query: create table test ( i int , c char ( 10 ) ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 32: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 32: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 33: query: insert into test values ( 1 , 'abcdefghij' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 33: query: insert into test values ( 1 , 'abcdefghij' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 33: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 33: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 36: query: select  *  from test   ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 36: query: select * from test; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 36: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -25,74 +25,74 @@
 [NO_PID]: ecpg_get_data on line 36: RESULT: abcdefghij offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
 Warning: At least one column was truncated
-[NO_PID]: ECPGtrans on line 37: action "rollback "; connection "regress1"
+[NO_PID]: ECPGtrans on line 37: action "rollback"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 39: query: select  *  from nonexistant   ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 39: query: select * from nonexistant; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 39: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_check_PQresult on line 39: ERROR:  relation "nonexistant" does not exist
-LINE 1: select  *  from nonexistant   
-                        ^
+LINE 1: select * from nonexistant
+                      ^
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: raising sqlstate 42P01 (sqlcode -400) on line 39: relation "nonexistant" does not exist on line 39
 [NO_PID]: sqlca: code: -400, state: 42P01
 sql error: relation "nonexistant" does not exist on line 39
-[NO_PID]: ECPGtrans on line 40: action "rollback "; connection "regress1"
+[NO_PID]: ECPGtrans on line 40: action "rollback"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 43: query: select  *  from nonexistant   ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 43: query: select * from nonexistant; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 43: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_check_PQresult on line 43: ERROR:  relation "nonexistant" does not exist
-LINE 1: select  *  from nonexistant   
-                        ^
+LINE 1: select * from nonexistant
+                      ^
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: raising sqlstate 42P01 (sqlcode -400) on line 43: relation "nonexistant" does not exist on line 43
 [NO_PID]: sqlca: code: -400, state: 42P01
 Error in statement 'select':
 sql error: relation "nonexistant" does not exist on line 43
-[NO_PID]: ECPGtrans on line 44: action "rollback "; connection "regress1"
+[NO_PID]: ECPGtrans on line 44: action "rollback"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 47: query: select  *  from nonexistant   ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 47: query: select * from nonexistant; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 47: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_check_PQresult on line 47: ERROR:  relation "nonexistant" does not exist
-LINE 1: select  *  from nonexistant   
-                        ^
+LINE 1: select * from nonexistant
+                      ^
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: raising sqlstate 42P01 (sqlcode -400) on line 47: relation "nonexistant" does not exist on line 47
 [NO_PID]: sqlca: code: -400, state: 42P01
 Found another error
 sql error: relation "nonexistant" does not exist on line 47
-[NO_PID]: ECPGtrans on line 48: action "rollback "; connection "regress1"
+[NO_PID]: ECPGtrans on line 48: action "rollback"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 51: query: select  *  from nonexistant   ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 51: query: select * from nonexistant; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 51: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_check_PQresult on line 51: ERROR:  relation "nonexistant" does not exist
-LINE 1: select  *  from nonexistant   
-                        ^
+LINE 1: select * from nonexistant
+                      ^
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: raising sqlstate 42P01 (sqlcode -400) on line 51: relation "nonexistant" does not exist on line 51
 [NO_PID]: sqlca: code: -400, state: 42P01
-[NO_PID]: ECPGtrans on line 52: action "rollback "; connection "regress1"
+[NO_PID]: ECPGtrans on line 52: action "rollback"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 55: query: select  *  from nonexistant   ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 55: query: select * from nonexistant; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 55: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_check_PQresult on line 55: ERROR:  relation "nonexistant" does not exist
-LINE 1: select  *  from nonexistant   
-                        ^
+LINE 1: select * from nonexistant
+                      ^
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: raising sqlstate 42P01 (sqlcode -400) on line 55: relation "nonexistant" does not exist on line 55
 [NO_PID]: sqlca: code: -400, state: 42P01
-[NO_PID]: ECPGtrans on line 59: action "rollback "; connection "regress1"
+[NO_PID]: ECPGtrans on line 59: action "rollback"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 64: query: select  1     ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 64: query: select 1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 64: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -100,5 +100,5 @@ LINE 1: select  *  from nonexistant
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 64: RESULT: 1 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 65: action "rollback "; connection "regress1"
+[NO_PID]: ECPGtrans on line 65: action "rollback"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000

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

@@ -109,22 +109,22 @@ main (void)
 	 
 
 #line 14 "array.pgc"
- int  i   = 1 ;
+ int i = 1 ;
  
 #line 15 "array.pgc"
- int * did   = & i ;
+ int * did = & i ;
  
 #line 16 "array.pgc"
- int  a  [ 10 ]  = { 9 , 8 , 7 , 6 , 5 , 4 , 3 , 2 , 1 , 0 } ;
+ int a [ 10 ] = { 9 , 8 , 7 , 6 , 5 , 4 , 3 , 2 , 1 , 0 } ;
  
 #line 17 "array.pgc"
- char  text  [ 25 ]  = "klmnopqrst" ;
+ char text [ 25 ] = "klmnopqrst" ;
  
 #line 18 "array.pgc"
- char * t   = ( char * ) malloc ( 11 ) ;
+ char * t = ( char * ) malloc ( 11 ) ;
  
 #line 19 "array.pgc"
- double  f    ;
+ double f ;
 /* exec sql end declare section */
 #line 20 "array.pgc"
 
@@ -148,28 +148,28 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 29 "array.pgc"
 
 
- 	{ ECPGtrans(__LINE__, NULL, "begin work ");
+ 	{ ECPGtrans(__LINE__, NULL, "begin work");
 #line 31 "array.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 31 "array.pgc"
 
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create  table test ( f float    , i int   , a int  [ 10 ]  , text char  ( 10 )    )    ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table test ( f float , i int , a int [ 10 ] , text char ( 10 ) )", ECPGt_EOIT, ECPGt_EORT);
 #line 33 "array.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 33 "array.pgc"
 
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test ( f  , i  , a  , text  ) values ( 404.90 , 3 , '{0,1,2,3,4,5,6,7,8,9}' , 'abcdefghij' ) ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test ( f , i , a , text ) values ( 404.90 , 3 , '{0,1,2,3,4,5,6,7,8,9}' , 'abcdefghij' )", ECPGt_EOIT, ECPGt_EORT);
 #line 35 "array.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 35 "array.pgc"
 
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test ( f  , i  , a  , text  ) values ( 140787.0 , 2 ,  $1  ,  $2  ) ", 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test ( f , i , a , text ) values ( 140787.0 , 2 , $1  , $2  )", 
 	ECPGt_int,(a),(long)1,(long)10,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_char,(text),(long)25,(long)1,(25)*sizeof(char), 
@@ -180,7 +180,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 37 "array.pgc"
 
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test ( f  , i  , a  , text  ) values ( 14.07 ,  $1  ,  $2  ,  $3  ) ", 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test ( f , i , a , text ) values ( 14.07 , $1  , $2  , $3  )", 
 	ECPGt_int,&(did),(long)1,(long)0,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_int,(a),(long)1,(long)10,sizeof(int), 
@@ -193,21 +193,21 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 39 "array.pgc"
 
 
-	{ ECPGtrans(__LINE__, NULL, "commit ");
+	{ ECPGtrans(__LINE__, NULL, "commit");
 #line 41 "array.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 41 "array.pgc"
 
 
-	{ ECPGtrans(__LINE__, NULL, "begin work ");
+	{ ECPGtrans(__LINE__, NULL, "begin work");
 #line 43 "array.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 43 "array.pgc"
  
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  f , text  from test where i = 1  ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select f , text from test where i = 1", ECPGt_EOIT, 
 	ECPGt_double,&(f),(long)1,(long)1,sizeof(double), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_char,(text),(long)25,(long)1,(25)*sizeof(char), 
@@ -221,7 +221,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 	printf("Found f=%f text=%10.10s\n", f, text);
 
 	f=140787;
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  a , text  from test where f =  $1   ", 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select a , text from test where f = $1 ", 
 	ECPGt_double,&(f),(long)1,(long)1,sizeof(double), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, 
 	ECPGt_int,(a),(long)1,(long)10,sizeof(int), 
@@ -239,7 +239,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 
 	printf("Found text=%10.10s\n", t);
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  a  from test where f =  $1   ", 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select a from test where f = $1 ", 
 	ECPGt_double,&(f),(long)1,(long)1,sizeof(double), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, 
 	ECPGt_char,(text),(long)25,(long)1,(25)*sizeof(char), 
@@ -252,14 +252,14 @@ if (sqlca.sqlcode < 0) sqlprint();}
 
 	printf("Found text=%s\n", text);
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table test ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table test", ECPGt_EOIT, ECPGt_EORT);
 #line 70 "array.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 70 "array.pgc"
 
 
-	{ ECPGtrans(__LINE__, NULL, "commit ");
+	{ ECPGtrans(__LINE__, NULL, "commit");
 #line 72 "array.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}

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

@@ -4,21 +4,21 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGsetcommit on line 29: action "on"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 31: action "begin work "; connection "regress1"
+[NO_PID]: ECPGtrans on line 31: action "begin work"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 33: query: create  table test ( f float    , i int   , a int  [ 10 ]  , text char  ( 10 )    )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 33: query: create table test ( f float , i int , a int [ 10 ] , text char ( 10 ) ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 33: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 33: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 35: query: insert into test ( f  , i  , a  , text  ) values ( 404.90 , 3 , '{0,1,2,3,4,5,6,7,8,9}' , 'abcdefghij' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 35: query: insert into test ( f , i , a , text ) values ( 404.90 , 3 , '{0,1,2,3,4,5,6,7,8,9}' , 'abcdefghij' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 35: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 35: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 37: query: insert into test ( f  , i  , a  , text  ) values ( 140787.0 , 2 ,  $1  ,  $2  ) ; with 2 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 37: query: insert into test ( f , i , a , text ) values ( 140787.0 , 2 , $1  , $2  ); with 2 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 37: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -28,7 +28,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 37: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 39: query: insert into test ( f  , i  , a  , text  ) values ( 14.07 ,  $1  ,  $2  ,  $3  ) ; with 3 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 39: query: insert into test ( f , i , a , text ) values ( 14.07 , $1  , $2  , $3  ); with 3 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 39: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -40,11 +40,11 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 39: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 41: action "commit "; connection "regress1"
+[NO_PID]: ECPGtrans on line 41: action "commit"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 43: action "begin work "; connection "regress1"
+[NO_PID]: ECPGtrans on line 43: action "begin work"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 45: query: select  f , text  from test where i = 1  ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 45: query: select f , text from test where i = 1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 45: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -54,7 +54,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 45: RESULT: 0123456789 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 53: query: select  a , text  from test where f =  $1   ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 53: query: select a , text from test where f = $1 ; with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 53: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -68,7 +68,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 53: RESULT: klmnopqrst offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 63: query: select  a  from test where f =  $1   ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 63: query: select a from test where f = $1 ; with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 63: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -78,13 +78,13 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 63: RESULT: {9,8,7,6,5,4,3,2,1,0} offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 70: query: drop table test ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 70: query: drop table test; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 70: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 70: OK: DROP TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 72: action "commit "; connection "regress1"
+[NO_PID]: ECPGtrans on line 72: 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

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

@@ -31,16 +31,16 @@
 
 struct TBempl { 
 #line 9 "binary.pgc"
- long  idnum    ;
+ long idnum ;
  
 #line 10 "binary.pgc"
- char  name  [ 21 ]   ;
+ char name [ 21 ] ;
  
 #line 11 "binary.pgc"
- short  accs    ;
+ short accs ;
  
 #line 12 "binary.pgc"
- char  byte  [ 20 ]   ;
+ char byte [ 20 ] ;
  } ;/* exec sql end declare section */
 #line 14 "binary.pgc"
 
@@ -53,10 +53,10 @@ main (void)
      
   
 #line 20 "binary.pgc"
- struct TBempl  empl    ;
+ struct TBempl empl ;
  
 #line 21 "binary.pgc"
- char * data   = "\\001\\155\\000\\212" ;
+ char * data = "\\001\\155\\000\\212" ;
 /* exec sql end declare section */
 #line 22 "binary.pgc"
 
@@ -74,7 +74,7 @@ main (void)
       exit (sqlca.sqlcode);
     }
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create  table empl ( idnum integer   , name char  ( 20 )    , accs smallint   , byte bytea    )    ", ECPGt_EOIT, ECPGt_EORT);}
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table empl ( idnum integer , name char ( 20 ) , accs smallint , byte bytea )", ECPGt_EOIT, ECPGt_EORT);}
 #line 36 "binary.pgc"
 
   if (sqlca.sqlcode)
@@ -83,7 +83,7 @@ main (void)
       exit (sqlca.sqlcode);
     }
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into empl values ( 1 , 'first user' , 320 ,  $1  ) ", 
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into empl values ( 1 , 'first user' , 320 , $1  )", 
 	ECPGt_char,&(data),(long)0,(long)1,(1)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);}
 #line 43 "binary.pgc"
@@ -94,10 +94,10 @@ main (void)
       exit (sqlca.sqlcode);
     }
 
-  /* declare C  cursor  for select  name , accs , byte  from empl where idnum =  $1    */
+  /* declare C cursor for select name , accs , byte from empl where idnum = $1  */
 #line 50 "binary.pgc"
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare C  cursor  for select  name , accs , byte  from empl where idnum =  $1   ", 
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare C cursor for select name , accs , byte from empl where idnum = $1 ", 
 	ECPGt_long,&(empl.idnum),(long)1,(long)1,sizeof(long), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);}
 #line 51 "binary.pgc"
@@ -121,10 +121,10 @@ main (void)
 
   memset(empl.name, 0, 21L);
   memset(empl.byte, '#', 20L);
-  /* declare B  binary cursor  for select  name , accs , byte  from empl where idnum =  $1    */
+  /* declare B binary cursor for select name , accs , byte from empl where idnum = $1  */
 #line 63 "binary.pgc"
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare B  binary cursor  for select  name , accs , byte  from empl where idnum =  $1   ", 
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare B binary cursor for select name , accs , byte from empl where idnum = $1 ", 
 	ECPGt_long,&(empl.idnum),(long)1,(long)1,sizeof(long), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);}
 #line 64 "binary.pgc"

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

@@ -2,13 +2,13 @@
 [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 35: query: create  table empl ( idnum integer   , name char  ( 20 )    , accs smallint   , byte bytea    )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 35: query: create table empl ( idnum integer , name char ( 20 ) , accs smallint , byte bytea ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 35: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 35: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 43: query: insert into empl values ( 1 , 'first user' , 320 ,  $1  ) ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 43: query: insert into empl values ( 1 , 'first user' , 320 , $1  ); with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 43: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -16,7 +16,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 43: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 51: query: declare C  cursor  for select  name , accs , byte  from empl where idnum =  $1   ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 51: query: declare C cursor for select name , accs , byte from empl where idnum = $1 ; with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 51: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -36,7 +36,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 52: RESULT: \001m\000\212 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 64: query: declare B  binary cursor  for select  name , accs , byte  from empl where idnum =  $1   ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 64: query: declare B binary cursor for select name , accs , byte from empl where idnum = $1 ; with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 64: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000

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

@@ -97,7 +97,7 @@ int main(int argc, char **argv)
     
    
 #line 9 "code100.pgc"
- int  index    ;
+ int index ;
 /* exec sql end declare section */
 #line 10 "code100.pgc"
 
@@ -110,7 +110,7 @@ int main(int argc, char **argv)
 
    if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc);
 
-   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create  table test ( \"index\" numeric ( 3 )   primary key   , \"payload\" int4    not null )    ", ECPGt_EOIT, ECPGt_EORT);}
+   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table test ( \"index\" numeric ( 3 ) primary key , \"payload\" int4 not null )", ECPGt_EOIT, ECPGt_EORT);}
 #line 20 "code100.pgc"
 
    if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc);
@@ -120,7 +120,7 @@ int main(int argc, char **argv)
    if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc);
    
    for (index=0;index<10;++index)
-   {  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test ( payload  , index  ) values ( 0 ,  $1  ) ", 
+   {  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test ( payload , index ) values ( 0 , $1  )", 
 	ECPGt_int,&(index),(long)1,(long)1,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);}
 #line 28 "code100.pgc"
@@ -132,22 +132,22 @@ int main(int argc, char **argv)
 
    if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc);
    
-   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "update test set payload  = payload + 1  where index = - 1 ", ECPGt_EOIT, ECPGt_EORT);}
+   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "update test set payload = payload + 1 where index = - 1", ECPGt_EOIT, ECPGt_EORT);}
 #line 35 "code100.pgc"
 
    if (sqlca.sqlcode!=100) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc);
    
-   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "delete from test  where index = - 1 ", ECPGt_EOIT, ECPGt_EORT);}
+   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "delete from test where index = - 1", ECPGt_EOIT, ECPGt_EORT);}
 #line 38 "code100.pgc"
 
    if (sqlca.sqlcode!=100) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc);
 
-   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test ( select  *  from test where index = - 1   ) ", ECPGt_EOIT, ECPGt_EORT);}
+   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test ( select * from test where index = - 1 )", ECPGt_EOIT, ECPGt_EORT);}
 #line 41 "code100.pgc"
 
    if (sqlca.sqlcode!=100) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc);
 
-   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table test ", ECPGt_EOIT, ECPGt_EORT);}
+   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table test", ECPGt_EOIT, ECPGt_EORT);}
 #line 44 "code100.pgc"
 
    if (sqlca.sqlcode) printf("%ld:%s\n",sqlca.sqlcode,sqlca.sqlerrm.sqlerrmc);

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

@@ -2,7 +2,7 @@
 [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 18: query: create  table test ( "index" numeric ( 3 )   primary key   , "payload" int4    not null )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 18: query: create table test ( "index" numeric ( 3 ) primary key , "payload" int4 not null ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 18: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -10,7 +10,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGtrans on line 22: action "commit work"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 26: query: insert into test ( payload  , index  ) values ( 0 ,  $1  ) ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 26: query: insert into test ( payload , index ) values ( 0 , $1  ); with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -18,7 +18,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 26: query: insert into test ( payload  , index  ) values ( 0 ,  $1  ) ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 26: query: insert into test ( payload , index ) values ( 0 , $1  ); with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -26,7 +26,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 26: query: insert into test ( payload  , index  ) values ( 0 ,  $1  ) ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 26: query: insert into test ( payload , index ) values ( 0 , $1  ); with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -34,7 +34,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 26: query: insert into test ( payload  , index  ) values ( 0 ,  $1  ) ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 26: query: insert into test ( payload , index ) values ( 0 , $1  ); with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -42,7 +42,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 26: query: insert into test ( payload  , index  ) values ( 0 ,  $1  ) ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 26: query: insert into test ( payload , index ) values ( 0 , $1  ); with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -50,7 +50,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 26: query: insert into test ( payload  , index  ) values ( 0 ,  $1  ) ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 26: query: insert into test ( payload , index ) values ( 0 , $1  ); with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -58,7 +58,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 26: query: insert into test ( payload  , index  ) values ( 0 ,  $1  ) ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 26: query: insert into test ( payload , index ) values ( 0 , $1  ); with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -66,7 +66,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 26: query: insert into test ( payload  , index  ) values ( 0 ,  $1  ) ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 26: query: insert into test ( payload , index ) values ( 0 , $1  ); with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -74,7 +74,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 26: query: insert into test ( payload  , index  ) values ( 0 ,  $1  ) ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 26: query: insert into test ( payload , index ) values ( 0 , $1  ); with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -82,7 +82,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 26: query: insert into test ( payload  , index  ) values ( 0 ,  $1  ) ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 26: query: insert into test ( payload , index ) values ( 0 , $1  ); with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -92,7 +92,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGtrans on line 31: action "commit work"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 34: query: update test set payload  = payload + 1  where index = - 1 ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 34: query: update test set payload = payload + 1 where index = - 1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 34: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -100,7 +100,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: raising sqlcode 100 on line 34: no data found on line 34
 [NO_PID]: sqlca: code: 100, state: 02000
-[NO_PID]: ecpg_execute on line 38: query: delete from test  where index = - 1 ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 38: query: delete from test where index = - 1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 38: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -108,7 +108,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: raising sqlcode 100 on line 38: no data found on line 38
 [NO_PID]: sqlca: code: 100, state: 02000
-[NO_PID]: ecpg_execute on line 41: query: insert into test ( select  *  from test where index = - 1   ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 41: query: insert into test ( select * from test where index = - 1 ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 41: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -116,7 +116,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: raising sqlcode 100 on line 41: no data found on line 41
 [NO_PID]: sqlca: code: 100, state: 02000
-[NO_PID]: ecpg_execute on line 44: query: drop table test ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 44: query: drop table test; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 44: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000

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

@@ -106,32 +106,32 @@ main ()
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 13 "copystdout.pgc"
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create  table foo ( a int   , b varchar    )    ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table foo ( a int , b varchar )", ECPGt_EOIT, ECPGt_EORT);
 #line 14 "copystdout.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 14 "copystdout.pgc"
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into foo values ( 5 , 'abc' ) ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into foo values ( 5 , 'abc' )", ECPGt_EOIT, ECPGt_EORT);
 #line 15 "copystdout.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 15 "copystdout.pgc"
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into foo values ( 6 , 'def' ) ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into foo values ( 6 , 'def' )", ECPGt_EOIT, ECPGt_EORT);
 #line 16 "copystdout.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 16 "copystdout.pgc"
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into foo values ( 7 , 'ghi' ) ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into foo values ( 7 , 'ghi' )", ECPGt_EOIT, ECPGt_EORT);
 #line 17 "copystdout.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 17 "copystdout.pgc"
 
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "copy  foo   to stdout  with  delimiter  ','", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "copy foo to stdout with delimiter ','", ECPGt_EOIT, ECPGt_EORT);
 #line 19 "copystdout.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}

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

@@ -2,31 +2,31 @@
 [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 14: query: create  table foo ( a int   , b varchar    )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 14: query: create table foo ( a int , b varchar ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 14: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 14: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 15: query: insert into foo values ( 5 , 'abc' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 15: query: insert into foo values ( 5 , 'abc' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 15: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 15: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 16: query: insert into foo values ( 6 , 'def' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 16: query: insert into foo values ( 6 , 'def' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 16: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 16: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 17: query: insert into foo values ( 7 , 'ghi' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 17: query: insert into foo values ( 7 , 'ghi' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 17: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 17: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 19: query: copy  foo   to stdout  with  delimiter  ','; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 19: query: copy foo to stdout with delimiter ','; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 19: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000

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

@@ -99,44 +99,44 @@ int main(void)
       
    
 #line 10 "define.pgc"
- int  i    ;
+ int i ;
  
 #line 11 "define.pgc"
- char  s  [ 200 ]   ;
+ char s [ 200 ] ;
 /* exec sql end declare section */
 #line 12 "define.pgc"
 
 
    ECPGdebug(1, stderr);
 
-   /* exec sql whenever sqlerror  do sqlprint (  ) ; */
+   /* exec sql whenever sqlerror  do sqlprint ( ) ; */
 #line 16 "define.pgc"
 
    { ECPGconnect(__LINE__, 0, "regress1" , NULL, NULL , NULL, 0); 
 #line 17 "define.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 17 "define.pgc"
 
 
-   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create  table test ( a int   , b text    )    ", ECPGt_EOIT, ECPGt_EORT);
+   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table test ( a int , b text )", ECPGt_EOIT, ECPGt_EORT);
 #line 19 "define.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 19 "define.pgc"
 
-   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( 29 , 'abcdef' ) ", ECPGt_EOIT, ECPGt_EORT);
+   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( 29 , 'abcdef' )", ECPGt_EOIT, ECPGt_EORT);
 #line 20 "define.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 20 "define.pgc"
 
 
    
-   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( null , 'defined' ) ", ECPGt_EOIT, ECPGt_EORT);
+   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( null , 'defined' )", ECPGt_EOIT, ECPGt_EORT);
 #line 23 "define.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 23 "define.pgc"
 
    
@@ -146,24 +146,24 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
    
            
    
-   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( null , 'someothervar not defined' ) ", ECPGt_EOIT, ECPGt_EORT);
+   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( null , 'someothervar not defined' )", ECPGt_EOIT, ECPGt_EORT);
 #line 31 "define.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 31 "define.pgc"
 
    
 
    
 
-   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  1 , 29 :: text   || '-' || 'abcdef'     ", ECPGt_EOIT, 
+   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select 1 , 29 :: text || '-' || 'abcdef'", ECPGt_EOIT, 
 	ECPGt_int,&(i),(long)1,(long)1,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_char,(s),(long)200,(long)1,(200)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
 #line 36 "define.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 36 "define.pgc"
 
 
@@ -171,10 +171,10 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
 
    
    
-   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( 29 , 'no string' ) ", ECPGt_EOIT, ECPGt_EORT);
+   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( 29 , 'no string' )", ECPGt_EOIT, ECPGt_EORT);
 #line 42 "define.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 42 "define.pgc"
 
    
@@ -190,7 +190,7 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
    { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "set TIMEZONE to 'UTC'", ECPGt_EOIT, ECPGt_EORT);
 #line 53 "define.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 53 "define.pgc"
 
    
@@ -198,7 +198,7 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
    { ECPGdisconnect(__LINE__, "CURRENT");
 #line 56 "define.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 56 "define.pgc"
 
    return 0;

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

@@ -2,31 +2,31 @@
 [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 19: query: create  table test ( a int   , b text    )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 19: query: create table test ( a int , b text ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 19: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 19: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 20: query: insert into test values ( 29 , 'abcdef' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 20: query: insert into test values ( 29 , 'abcdef' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 20: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 20: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 23: query: insert into test values ( null , 'defined' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 23: query: insert into test values ( null , 'defined' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 23: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 23: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 31: query: insert into test values ( null , 'someothervar not defined' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 31: query: insert into test values ( null , 'someothervar not defined' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 31: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 31: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 36: query: select  1 , 29 :: text   || '-' || 'abcdef'     ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 36: query: select 1 , 29 :: text || '-' || 'abcdef'; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 36: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -36,7 +36,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 36: RESULT: 29-abcdef offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 42: query: insert into test values ( 29 , 'no string' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 42: query: insert into test values ( 29 , 'no string' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 42: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000

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

@@ -36,28 +36,28 @@ main(void)
 	  
 	
 #line 8 "desc.pgc"
- char * stmt1   = "INSERT INTO test1 VALUES ($1, $2)" ;
+ char * stmt1 = "INSERT INTO test1 VALUES ($1, $2)" ;
  
 #line 9 "desc.pgc"
- char * stmt2   = "SELECT * from test1 where a = $1 and b = $2" ;
+ char * stmt2 = "SELECT * from test1 where a = $1 and b = $2" ;
  
 #line 10 "desc.pgc"
- char * stmt3   = "SELECT * from test1 where :var = a" ;
+ char * stmt3 = "SELECT * from test1 where :var = a" ;
  
 #line 12 "desc.pgc"
- int  val1   = 1 ;
+ int val1 = 1 ;
  
 #line 13 "desc.pgc"
- char  val2  [ 4 ]  = "one" ,  val2output  []  = "AAA" ;
+ char val2 [ 4 ] = "one" , val2output [] = "AAA" ;
  
 #line 14 "desc.pgc"
- int  val1output   = 2 ,  val2i   = 0 ;
+ int val1output = 2 , val2i = 0 ;
  
 #line 15 "desc.pgc"
- int  val2null   = - 1 ;
+ int val2null = - 1 ;
  
 #line 16 "desc.pgc"
- int  ind1    ,  ind2    ;
+ int ind1 , ind2 ;
 /* exec sql end declare section */
 #line 17 "desc.pgc"
 
@@ -102,7 +102,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 27 "desc.pgc"
 
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create  table test1 ( a int   , b text    )    ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table test1 ( a int , b text )", ECPGt_EOIT, ECPGt_EORT);
 #line 29 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
@@ -242,10 +242,10 @@ if (sqlca.sqlcode < 0) sqlprint();}
 
 	printf("output = %s\n", val2output);
 
-	/* declare c1  cursor  for $1 */
+	/* declare c1 cursor for $1 */
 #line 57 "desc.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare c1  cursor  for $1", 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare c1 cursor for $1", 
 	ECPGt_char_variable,(ECPGprepared_statement(NULL, "foo2", __LINE__)),(long)1,(long)1,(1)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_descriptor, "indesc", 0L, 0L, 0L, 
@@ -292,10 +292,10 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 67 "desc.pgc"
 
 
-	/* declare c2  cursor  for $1 */
+	/* declare c2 cursor for $1 */
 #line 69 "desc.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare c2  cursor  for $1", 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare c2 cursor for $1", 
 	ECPGt_char_variable,(ECPGprepared_statement(NULL, "foo3", __LINE__)),(long)1,(long)1,(1)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_descriptor, "indesc", 0L, 0L, 0L, 
@@ -325,7 +325,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 75 "desc.pgc"
 
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  *  from test1 where a = 3  ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from test1 where a = 3", ECPGt_EOIT, 
 	ECPGt_int,&(val1output),(long)1,(long)1,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_char,(val2output),(long)sizeof("AAA"),(long)1,(sizeof("AAA"))*sizeof(char), 
@@ -337,7 +337,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 
 	printf("val1=%d val2=%c%c%c%c warn=%c truncate=%d\n", val1output, val2output[0], val2output[1], val2output[2], val2output[3], sqlca.sqlwarn[0], val2i);
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table test1 ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table test1", ECPGt_EOIT, ECPGt_EORT);
 #line 80 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}

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

@@ -2,7 +2,7 @@
 [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 29: query: create  table test1 ( a int   , b text    )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 29: query: create table test1 ( a int , b text ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 29: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -64,7 +64,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 54: RESULT: 1 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 58: query: declare c1  cursor  for SELECT * from test1 where a = $1 and b = $2; with 2 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 58: query: declare c1 cursor for SELECT * from test1 where a = $1 and b = $2; with 2 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 58: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -90,7 +90,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 64: OK: CLOSE CURSOR
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 70: query: declare c2  cursor  for SELECT * from test1 where $1 = a; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 70: query: declare c2 cursor for SELECT * from test1 where $1 = a; with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 70: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -114,7 +114,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 75: OK: CLOSE CURSOR
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 77: query: select  *  from test1 where a = 3  ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 77: query: select * from test1 where a = 3; 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]: sqlca: code: 0, state: 00000
@@ -124,7 +124,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 77: RESULT: this is a long test offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 80: query: drop table test1 ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 80: query: drop table test1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 80: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000

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

@@ -114,52 +114,52 @@ int main(void)
     
    
 #line 9 "dynalloc.pgc"
- int * d1   = 0 ;
+ int * d1 = 0 ;
  
 #line 10 "dynalloc.pgc"
- double * d2   = 0 ;
+ double * d2 = 0 ;
  
 #line 11 "dynalloc.pgc"
- char ** d3   = 0 ;
+ char ** d3 = 0 ;
  
 #line 12 "dynalloc.pgc"
- char ** d4   = 0 ;
+ char ** d4 = 0 ;
  
 #line 13 "dynalloc.pgc"
- char ** d5   = 0 ;
+ char ** d5 = 0 ;
  
 #line 14 "dynalloc.pgc"
- char ** d6   = 0 ;
+ char ** d6 = 0 ;
  
 #line 15 "dynalloc.pgc"
- char ** d7   = 0 ;
+ char ** d7 = 0 ;
  
 #line 17 "dynalloc.pgc"
- char ** d9   = 0 ;
+ char ** d9 = 0 ;
  
 #line 18 "dynalloc.pgc"
- int * i1   = 0 ;
+ int * i1 = 0 ;
  
 #line 19 "dynalloc.pgc"
- int * i2   = 0 ;
+ int * i2 = 0 ;
  
 #line 20 "dynalloc.pgc"
- int * i3   = 0 ;
+ int * i3 = 0 ;
  
 #line 21 "dynalloc.pgc"
- int * i4   = 0 ;
+ int * i4 = 0 ;
  
 #line 22 "dynalloc.pgc"
- int * i5   = 0 ;
+ int * i5 = 0 ;
  
 #line 23 "dynalloc.pgc"
- int * i6   = 0 ;
+ int * i6 = 0 ;
  
 #line 24 "dynalloc.pgc"
- int * i7   = 0 ;
+ int * i7 = 0 ;
  
 #line 26 "dynalloc.pgc"
- int * i9   = 0 ;
+ int * i9 = 0 ;
 /* exec sql end declare section */
 #line 27 "dynalloc.pgc"
 
@@ -167,54 +167,54 @@ int main(void)
 
    ECPGdebug(1, stderr);
 
-   /* exec sql whenever sqlerror  do sqlprint (  ) ; */
+   /* exec sql whenever sqlerror  do sqlprint ( ) ; */
 #line 32 "dynalloc.pgc"
 
    { ECPGconnect(__LINE__, 0, "regress1" , NULL, NULL , NULL, 0); 
 #line 33 "dynalloc.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 33 "dynalloc.pgc"
 
 
    { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "set datestyle to mdy", ECPGt_EOIT, ECPGt_EORT);
 #line 35 "dynalloc.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 35 "dynalloc.pgc"
 
 
-   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create  table test ( a serial    , b numeric ( 12 , 3 )   , c varchar    , d varchar ( 3 )    , e char  ( 4 )    , f timestamptz    , g boolean   , h box    , i inet    )    ", ECPGt_EOIT, ECPGt_EORT);
+   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table test ( a serial , b numeric ( 12 , 3 ) , c varchar , d varchar ( 3 ) , e char ( 4 ) , f timestamptz , g boolean , h box , i inet )", ECPGt_EOIT, ECPGt_EORT);
 #line 37 "dynalloc.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 37 "dynalloc.pgc"
 
-   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test ( b  , c  , d  , e  , f  , g  , h  , i  ) values ( 23.456 , 'varchar' , 'v' , 'c' , '2003-03-03 12:33:07 PDT' , true , '(1,2,3,4)' , '2001:4f8:3:ba:2e0:81ff:fe22:d1f1/128' ) ", ECPGt_EOIT, ECPGt_EORT);
+   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test ( b , c , d , e , f , g , h , i ) values ( 23.456 , 'varchar' , 'v' , 'c' , '2003-03-03 12:33:07 PDT' , true , '(1,2,3,4)' , '2001:4f8:3:ba:2e0:81ff:fe22:d1f1/128' )", ECPGt_EOIT, ECPGt_EORT);
 #line 38 "dynalloc.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 38 "dynalloc.pgc"
 
-   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test ( b  , c  , d  , e  , f  , g  , h  , i  ) values ( 2.446456 , null , 'v' , 'c' , '2003-03-03 12:33:07 PDT' , false , null , null ) ", ECPGt_EOIT, ECPGt_EORT);
+   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test ( b , c , d , e , f , g , h , i ) values ( 2.446456 , null , 'v' , 'c' , '2003-03-03 12:33:07 PDT' , false , null , null )", ECPGt_EOIT, ECPGt_EORT);
 #line 39 "dynalloc.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 39 "dynalloc.pgc"
 
 
    ECPGallocate_desc(__LINE__, "mydesc");
 #line 41 "dynalloc.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );
+if (sqlca.sqlcode < 0) sqlprint ( );
 #line 41 "dynalloc.pgc"
 
-   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  a , b , c , d , e , f , g , h , i  from test    order by a  ", ECPGt_EOIT, 
+   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select a , b , c , d , e , f , g , h , i from test order by a", ECPGt_EOIT, 
 	ECPGt_descriptor, "mydesc", 0L, 0L, 0L, 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
 #line 42 "dynalloc.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 42 "dynalloc.pgc"
 
    { ECPGget_desc(__LINE__, "mydesc", 1,ECPGd_indicator,
@@ -223,7 +223,7 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
 
 #line 43 "dynalloc.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 43 "dynalloc.pgc"
 
    { ECPGget_desc(__LINE__, "mydesc", 2,ECPGd_indicator,
@@ -232,7 +232,7 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
 
 #line 44 "dynalloc.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 44 "dynalloc.pgc"
 
    { ECPGget_desc(__LINE__, "mydesc", 3,ECPGd_indicator,
@@ -241,7 +241,7 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
 
 #line 45 "dynalloc.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 45 "dynalloc.pgc"
 
    { ECPGget_desc(__LINE__, "mydesc", 4,ECPGd_indicator,
@@ -250,7 +250,7 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
 
 #line 46 "dynalloc.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 46 "dynalloc.pgc"
 
    { ECPGget_desc(__LINE__, "mydesc", 5,ECPGd_indicator,
@@ -259,7 +259,7 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
 
 #line 47 "dynalloc.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 47 "dynalloc.pgc"
 
    { ECPGget_desc(__LINE__, "mydesc", 6,ECPGd_indicator,
@@ -268,7 +268,7 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
 
 #line 48 "dynalloc.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 48 "dynalloc.pgc"
 
    { ECPGget_desc(__LINE__, "mydesc", 7,ECPGd_indicator,
@@ -277,7 +277,7 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
 
 #line 49 "dynalloc.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 49 "dynalloc.pgc"
 
    /* skip box for now */
@@ -288,7 +288,7 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
 
 #line 52 "dynalloc.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 52 "dynalloc.pgc"
 
 
@@ -327,13 +327,13 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
    ECPGdeallocate_desc(__LINE__, "mydesc");
 #line 86 "dynalloc.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );
+if (sqlca.sqlcode < 0) sqlprint ( );
 #line 86 "dynalloc.pgc"
 
    { ECPGdisconnect(__LINE__, "CURRENT");
 #line 87 "dynalloc.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 87 "dynalloc.pgc"
 
    return 0;

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

@@ -8,25 +8,25 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 35: OK: SET
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 37: query: create  table test ( a serial    , b numeric ( 12 , 3 )   , c varchar    , d varchar ( 3 )    , e char  ( 4 )    , f timestamptz    , g boolean   , h box    , i inet    )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 37: query: create table test ( a serial , b numeric ( 12 , 3 ) , c varchar , d varchar ( 3 ) , e char ( 4 ) , f timestamptz , g boolean , h box , i inet ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 37: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 37: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 38: query: insert into test ( b  , c  , d  , e  , f  , g  , h  , i  ) values ( 23.456 , 'varchar' , 'v' , 'c' , '2003-03-03 12:33:07 PDT' , true , '(1,2,3,4)' , '2001:4f8:3:ba:2e0:81ff:fe22:d1f1/128' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 38: query: insert into test ( b , c , d , e , f , g , h , i ) values ( 23.456 , 'varchar' , 'v' , 'c' , '2003-03-03 12:33:07 PDT' , true , '(1,2,3,4)' , '2001:4f8:3:ba:2e0:81ff:fe22:d1f1/128' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 38: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 38: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 39: query: insert into test ( b  , c  , d  , e  , f  , g  , h  , i  ) values ( 2.446456 , null , 'v' , 'c' , '2003-03-03 12:33:07 PDT' , false , null , null ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 39: query: insert into test ( b , c , d , e , f , g , h , i ) values ( 2.446456 , null , 'v' , 'c' , '2003-03-03 12:33:07 PDT' , false , null , null ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 39: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 39: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 42: query: select  a , b , c , d , e , f , g , h , i  from test    order by a  ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 42: query: select a , b , c , d , e , f , g , h , i from test order by a; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 42: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000

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

@@ -101,19 +101,19 @@ int main(void)
     
    
 #line 9 "dynalloc2.pgc"
- int * ip1   = 0 ;
+ int * ip1 = 0 ;
  
 #line 10 "dynalloc2.pgc"
- char ** cp2   = 0 ;
+ char ** cp2 = 0 ;
  
 #line 11 "dynalloc2.pgc"
- int * ipointer1   = 0 ;
+ int * ipointer1 = 0 ;
  
 #line 12 "dynalloc2.pgc"
- int * ipointer2   = 0 ;
+ int * ipointer2 = 0 ;
  
 #line 13 "dynalloc2.pgc"
- int  colnum    ;
+ int colnum ;
 /* exec sql end declare section */
 #line 14 "dynalloc2.pgc"
 
@@ -121,85 +121,85 @@ int main(void)
 
    ECPGdebug(1, stderr);
 
-   /* exec sql whenever sqlerror  do sqlprint (  ) ; */
+   /* exec sql whenever sqlerror  do sqlprint ( ) ; */
 #line 19 "dynalloc2.pgc"
 
    { ECPGconnect(__LINE__, 0, "regress1" , NULL, NULL , NULL, 0); 
 #line 20 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 20 "dynalloc2.pgc"
 
 
    { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "set datestyle to postgres", ECPGt_EOIT, ECPGt_EORT);
 #line 22 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 22 "dynalloc2.pgc"
 
 
-   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create  table test ( a int   , b text    )    ", ECPGt_EOIT, ECPGt_EORT);
+   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table test ( a int , b text )", ECPGt_EOIT, ECPGt_EORT);
 #line 24 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 24 "dynalloc2.pgc"
 
-   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( 1 , 'one' ) ", ECPGt_EOIT, ECPGt_EORT);
+   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( 1 , 'one' )", ECPGt_EOIT, ECPGt_EORT);
 #line 25 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 25 "dynalloc2.pgc"
 
-   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( 2 , 'two' ) ", ECPGt_EOIT, ECPGt_EORT);
+   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( 2 , 'two' )", ECPGt_EOIT, ECPGt_EORT);
 #line 26 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 26 "dynalloc2.pgc"
 
-   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( null , 'three' ) ", ECPGt_EOIT, ECPGt_EORT);
+   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( null , 'three' )", ECPGt_EOIT, ECPGt_EORT);
 #line 27 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 27 "dynalloc2.pgc"
 
-   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( 4 , 'four' ) ", ECPGt_EOIT, ECPGt_EORT);
+   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( 4 , 'four' )", ECPGt_EOIT, ECPGt_EORT);
 #line 28 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 28 "dynalloc2.pgc"
 
-   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( 5 , null ) ", ECPGt_EOIT, ECPGt_EORT);
+   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( 5 , null )", ECPGt_EOIT, ECPGt_EORT);
 #line 29 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 29 "dynalloc2.pgc"
 
-   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( null , null ) ", ECPGt_EOIT, ECPGt_EORT);
+   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into test values ( null , null )", ECPGt_EOIT, ECPGt_EORT);
 #line 30 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 30 "dynalloc2.pgc"
 
 
    ECPGallocate_desc(__LINE__, "mydesc");
 #line 32 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );
+if (sqlca.sqlcode < 0) sqlprint ( );
 #line 32 "dynalloc2.pgc"
 
-   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  *  from test   ", ECPGt_EOIT, 
+   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select * from test", ECPGt_EOIT, 
 	ECPGt_descriptor, "mydesc", 0L, 0L, 0L, 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
 #line 33 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 33 "dynalloc2.pgc"
 
    { ECPGget_desc_header(__LINE__, "mydesc", &(colnum));
 
 #line 34 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 34 "dynalloc2.pgc"
 
    { ECPGget_desc(__LINE__, "mydesc", 1,ECPGd_indicator,
@@ -208,7 +208,7 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
 
 #line 35 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 35 "dynalloc2.pgc"
 
    { ECPGget_desc(__LINE__, "mydesc", 2,ECPGd_indicator,
@@ -217,7 +217,7 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
 
 #line 36 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 36 "dynalloc2.pgc"
 
 
@@ -237,19 +237,19 @@ if (sqlca.sqlcode < 0) sqlprint (  );}
    ECPGdeallocate_desc(__LINE__, "mydesc");
 #line 51 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );
+if (sqlca.sqlcode < 0) sqlprint ( );
 #line 51 "dynalloc2.pgc"
 
-   { ECPGtrans(__LINE__, NULL, "rollback ");
+   { ECPGtrans(__LINE__, NULL, "rollback");
 #line 52 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 52 "dynalloc2.pgc"
 
    { ECPGdisconnect(__LINE__, "CURRENT");
 #line 53 "dynalloc2.pgc"
 
-if (sqlca.sqlcode < 0) sqlprint (  );}
+if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 53 "dynalloc2.pgc"
 
    return 0;

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

@@ -8,49 +8,49 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 22: OK: SET
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 24: query: create  table test ( a int   , b text    )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 24: query: create table test ( a int , b text ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 24: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 24: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 25: query: insert into test values ( 1 , 'one' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 25: query: insert into test values ( 1 , 'one' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 25: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 25: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 26: query: insert into test values ( 2 , 'two' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 26: query: insert into test values ( 2 , 'two' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 27: query: insert into test values ( null , 'three' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 27: query: insert into test values ( null , 'three' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 27: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 27: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 28: query: insert into test values ( 4 , 'four' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 28: query: insert into test values ( 4 , 'four' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 28: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 28: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 29: query: insert into test values ( 5 , null ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 29: query: insert into test values ( 5 , null ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 29: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 29: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 30: query: insert into test values ( null , null ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 30: query: insert into test values ( null , null ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 30: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 30: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 33: query: select  *  from test   ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 33: query: select * from test; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 33: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -92,7 +92,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 36: RESULT:  offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 52: action "rollback "; connection "regress1"
+[NO_PID]: ECPGtrans on line 52: action "rollback"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_finish: connection regress1 closed
 [NO_PID]: sqlca: code: 0, state: 00000

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

@@ -166,40 +166,40 @@ main (int argc, char **argv)
    
   
 #line 22 "dyntest.pgc"
- int  COUNT    ;
+ int COUNT ;
  
 #line 23 "dyntest.pgc"
- int  INTVAR    ;
+ int INTVAR ;
  
 #line 24 "dyntest.pgc"
- int  INDEX    ;
+ int INDEX ;
  
 #line 25 "dyntest.pgc"
- int  INDICATOR    ;
+ int INDICATOR ;
  
 #line 26 "dyntest.pgc"
- int  TYPE    ,  LENGTH    ,  OCTET_LENGTH    ,  PRECISION    ,  SCALE    ,  RETURNED_OCTET_LENGTH    ;
+ int TYPE , LENGTH , OCTET_LENGTH , PRECISION , SCALE , RETURNED_OCTET_LENGTH ;
  
 #line 27 "dyntest.pgc"
- int  DATETIME_INTERVAL_CODE    ;
+ int DATETIME_INTERVAL_CODE ;
  
 #line 28 "dyntest.pgc"
- char  NAME  [ 120 ]   ,  BOOLVAR    ;
+ char NAME [ 120 ] , BOOLVAR ;
  
 #line 29 "dyntest.pgc"
- char  STRINGVAR  [ 1024 ]   ;
+ char STRINGVAR [ 1024 ] ;
  
 #line 30 "dyntest.pgc"
- double  DOUBLEVAR    ;
+ double DOUBLEVAR ;
  
 #line 31 "dyntest.pgc"
- char * QUERY    ;
+ char * QUERY ;
 /* exec sql end declare section */
 #line 32 "dyntest.pgc"
 
   int done = 0;
 
-  /* exec sql var BOOLVAR is bool   */
+  /* exec sql var BOOLVAR is bool */
 #line 35 "dyntest.pgc"
 
 
@@ -207,66 +207,66 @@ main (int argc, char **argv)
 
   QUERY = "select * from dyntest";
 
-  /* exec sql whenever sqlerror  do error (  ) ; */
+  /* exec sql whenever sqlerror  do error ( ) ; */
 #line 43 "dyntest.pgc"
 
 
   ECPGallocate_desc(__LINE__, "MYDESC");
 #line 45 "dyntest.pgc"
 
-if (sqlca.sqlcode < 0) error (  );
+if (sqlca.sqlcode < 0) error ( );
 #line 45 "dyntest.pgc"
 
 
   { ECPGconnect(__LINE__, 0, "regress1" , NULL, NULL , NULL, 0); 
 #line 47 "dyntest.pgc"
 
-if (sqlca.sqlcode < 0) error (  );}
+if (sqlca.sqlcode < 0) error ( );}
 #line 47 "dyntest.pgc"
 
 
   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "set datestyle to german", ECPGt_EOIT, ECPGt_EORT);
 #line 49 "dyntest.pgc"
 
-if (sqlca.sqlcode < 0) error (  );}
+if (sqlca.sqlcode < 0) error ( );}
 #line 49 "dyntest.pgc"
 
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create  table dyntest ( name char  ( 14 )    , d float8    , i int   , bignumber int8    , b boolean   , comment text    , day date    )    ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table dyntest ( name char ( 14 ) , d float8 , i int , bignumber int8 , b boolean , comment text , day date )", ECPGt_EOIT, ECPGt_EORT);
 #line 53 "dyntest.pgc"
 
-if (sqlca.sqlcode < 0) error (  );}
+if (sqlca.sqlcode < 0) error ( );}
 #line 53 "dyntest.pgc"
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into dyntest values ( 'first entry' , 14.7 , 14 , 123045607890 , true , 'The world''s most advanced open source database.' , '1987-07-14' ) ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into dyntest values ( 'first entry' , 14.7 , 14 , 123045607890 , true , 'The world''s most advanced open source database.' , '1987-07-14' )", ECPGt_EOIT, ECPGt_EORT);
 #line 54 "dyntest.pgc"
 
-if (sqlca.sqlcode < 0) error (  );}
+if (sqlca.sqlcode < 0) error ( );}
 #line 54 "dyntest.pgc"
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into dyntest values ( 'second entry' , 1407.87 , 1407 , 987065403210 , false , 'The elephant never forgets.' , '1999-11-5' ) ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into dyntest values ( 'second entry' , 1407.87 , 1407 , 987065403210 , false , 'The elephant never forgets.' , '1999-11-5' )", ECPGt_EOIT, ECPGt_EORT);
 #line 55 "dyntest.pgc"
 
-if (sqlca.sqlcode < 0) error (  );}
+if (sqlca.sqlcode < 0) error ( );}
 #line 55 "dyntest.pgc"
 
 
   { ECPGprepare(__LINE__, NULL, 0, "myquery", QUERY);
 #line 57 "dyntest.pgc"
 
-if (sqlca.sqlcode < 0) error (  );}
+if (sqlca.sqlcode < 0) error ( );}
 #line 57 "dyntest.pgc"
 
-  /* declare MYCURS  cursor  for $1 */
+  /* declare MYCURS cursor for $1 */
 #line 58 "dyntest.pgc"
 
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare MYCURS  cursor  for $1", 
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare MYCURS cursor for $1", 
 	ECPGt_char_variable,(ECPGprepared_statement(NULL, "myquery", __LINE__)),(long)1,(long)1,(1)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
 #line 60 "dyntest.pgc"
 
-if (sqlca.sqlcode < 0) error (  );}
+if (sqlca.sqlcode < 0) error ( );}
 #line 60 "dyntest.pgc"
 
 
@@ -277,7 +277,7 @@ if (sqlca.sqlcode < 0) error (  );}
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
 #line 64 "dyntest.pgc"
 
-if (sqlca.sqlcode < 0) error (  );}
+if (sqlca.sqlcode < 0) error ( );}
 #line 64 "dyntest.pgc"
 
 
@@ -288,7 +288,7 @@ if (sqlca.sqlcode < 0) error (  );}
 
 #line 69 "dyntest.pgc"
 
-if (sqlca.sqlcode < 0) error (  );}
+if (sqlca.sqlcode < 0) error ( );}
 #line 69 "dyntest.pgc"
 
       if (!done)
@@ -311,7 +311,7 @@ if (sqlca.sqlcode < 0) error (  );}
 
 #line 86 "dyntest.pgc"
 
-if (sqlca.sqlcode < 0) error (  );}
+if (sqlca.sqlcode < 0) error ( );}
 #line 86 "dyntest.pgc"
 
 	  printf ("%2d\t%s (type: %d length: %d precision: %d scale: %d = " , INDEX, NAME, TYPE, LENGTH, PRECISION, SCALE);
@@ -347,7 +347,7 @@ if (sqlca.sqlcode < 0) error (  );}
 
 #line 116 "dyntest.pgc"
 
-if (sqlca.sqlcode < 0) error (  );}
+if (sqlca.sqlcode < 0) error ( );}
 #line 116 "dyntest.pgc"
 
 	      switch (DATETIME_INTERVAL_CODE)
@@ -404,7 +404,7 @@ if (sqlca.sqlcode < 0) error (  );}
 
 #line 166 "dyntest.pgc"
 
-if (sqlca.sqlcode < 0) error (  );}
+if (sqlca.sqlcode < 0) error ( );}
 #line 166 "dyntest.pgc"
 
 		printf ("%s\n", BOOLVAR ? "true" : "false");
@@ -416,7 +416,7 @@ if (sqlca.sqlcode < 0) error (  );}
 
 #line 171 "dyntest.pgc"
 
-if (sqlca.sqlcode < 0) error (  );}
+if (sqlca.sqlcode < 0) error ( );}
 #line 171 "dyntest.pgc"
 
 		printf ("%d\n", INTVAR);
@@ -427,7 +427,7 @@ if (sqlca.sqlcode < 0) error (  );}
 
 #line 175 "dyntest.pgc"
 
-if (sqlca.sqlcode < 0) error (  );}
+if (sqlca.sqlcode < 0) error ( );}
 #line 175 "dyntest.pgc"
 
 		printf ("%.*f\n", PRECISION, DOUBLEVAR);
@@ -439,7 +439,7 @@ if (sqlca.sqlcode < 0) error (  );}
 
 #line 181 "dyntest.pgc"
 
-if (sqlca.sqlcode < 0) error (  );}
+if (sqlca.sqlcode < 0) error ( );}
 #line 181 "dyntest.pgc"
 
 		printf ("%d \"%s\"\n", DATETIME_INTERVAL_CODE, STRINGVAR);
@@ -451,7 +451,7 @@ if (sqlca.sqlcode < 0) error (  );}
 
 #line 186 "dyntest.pgc"
 
-if (sqlca.sqlcode < 0) error (  );}
+if (sqlca.sqlcode < 0) error ( );}
 #line 186 "dyntest.pgc"
 
 		printf ("\"%s\"\n", STRINGVAR);
@@ -462,7 +462,7 @@ if (sqlca.sqlcode < 0) error (  );}
 
 #line 190 "dyntest.pgc"
 
-if (sqlca.sqlcode < 0) error (  );}
+if (sqlca.sqlcode < 0) error ( );}
 #line 190 "dyntest.pgc"
 
 		printf ("<\"%s\">\n", STRINGVAR);
@@ -474,14 +474,14 @@ if (sqlca.sqlcode < 0) error (  );}
   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "close MYCURS", ECPGt_EOIT, ECPGt_EORT);
 #line 197 "dyntest.pgc"
 
-if (sqlca.sqlcode < 0) error (  );}
+if (sqlca.sqlcode < 0) error ( );}
 #line 197 "dyntest.pgc"
 
 
   ECPGdeallocate_desc(__LINE__, "MYDESC");
 #line 199 "dyntest.pgc"
 
-if (sqlca.sqlcode < 0) error (  );
+if (sqlca.sqlcode < 0) error ( );
 #line 199 "dyntest.pgc"
 
 

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

@@ -8,19 +8,19 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 49: OK: SET
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 51: query: create  table dyntest ( name char  ( 14 )    , d float8    , i int   , bignumber int8    , b boolean   , comment text    , day date    )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 51: query: create table dyntest ( name char ( 14 ) , d float8 , i int , bignumber int8 , b boolean , comment text , day date ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 51: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 51: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 54: query: insert into dyntest values ( 'first entry' , 14.7 , 14 , 123045607890 , true , 'The world''s most advanced open source database.' , '1987-07-14' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 54: query: insert into dyntest values ( 'first entry' , 14.7 , 14 , 123045607890 , true , 'The world''s most advanced open source database.' , '1987-07-14' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 54: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 54: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 55: query: insert into dyntest values ( 'second entry' , 1407.87 , 1407 , 987065403210 , false , 'The elephant never forgets.' , '1999-11-5' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 55: query: insert into dyntest values ( 'second entry' , 1407.87 , 1407 , 987065403210 , false , 'The elephant never forgets.' , '1999-11-5' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 55: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -28,7 +28,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGprepare on line 57: name myquery; query: "select * from dyntest"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 60: query: declare MYCURS  cursor  for select * from dyntest; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 60: query: declare MYCURS cursor for select * from dyntest; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 60: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000

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

@@ -38,19 +38,19 @@ main(void)
 	 
 
 #line 14 "execute.pgc"
- int  amount  [ 8 ]   ;
+ int amount [ 8 ] ;
  
 #line 15 "execute.pgc"
- int  increment   = 100 ;
+ int increment = 100 ;
  
 #line 16 "execute.pgc"
- char  name  [ 8 ] [ 8 ]   ;
+ char name [ 8 ] [ 8 ] ;
  
 #line 17 "execute.pgc"
- char  letter  [ 8 ] [ 1 ]   ;
+ char letter [ 8 ] [ 1 ] ;
  
 #line 18 "execute.pgc"
- char  command  [ 128 ]   ;
+ char command [ 128 ] ;
 /* exec sql end declare section */
 #line 19 "execute.pgc"
 
@@ -64,13 +64,13 @@ main(void)
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 24 "execute.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create  table test ( name char  ( 8 )    , amount int   , letter char  ( 1 )    )    ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table test ( name char ( 8 ) , amount int , letter char ( 1 ) )", ECPGt_EOIT, ECPGt_EORT);
 #line 25 "execute.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 25 "execute.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "commit ");
+	{ ECPGtrans(__LINE__, NULL, "commit");
 #line 26 "execute.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
@@ -121,7 +121,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 
 	printf("Inserted %ld tuples via prepared execute\n", sqlca.sqlerrd[2]);
 
-	{ ECPGtrans(__LINE__, NULL, "commit ");
+	{ ECPGtrans(__LINE__, NULL, "commit");
 #line 45 "execute.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
@@ -136,11 +136,11 @@ if (sqlca.sqlcode < 0) sqlprint();}
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 49 "execute.pgc"
 
-	/* declare CUR  cursor  for $1 */
+	/* declare CUR cursor for $1 */
 #line 50 "execute.pgc"
 
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare CUR  cursor  for $1", 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare CUR cursor for $1", 
 	ECPGt_char_variable,(ECPGprepared_statement(NULL, "f", __LINE__)),(long)1,(long)1,(1)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
 #line 52 "execute.pgc"
@@ -168,10 +168,10 @@ if (sqlca.sqlcode < 0) sqlprint();}
 		   
 		
 #line 58 "execute.pgc"
- char  n  [ 8 ]   ,  l   = letter [ i ] [ 0 ] ;
+ char n [ 8 ] , l = letter [ i ] [ 0 ] ;
  
 #line 59 "execute.pgc"
- int  a   = amount [ i ] ;
+ int a = amount [ i ] ;
 /* exec sql end declare section */
 #line 60 "execute.pgc"
 
@@ -201,11 +201,11 @@ if (sqlca.sqlcode < 0) sqlprint();}
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 71 "execute.pgc"
 
-	/* declare CUR2  cursor  for $1 */
+	/* declare CUR2 cursor for $1 */
 #line 72 "execute.pgc"
 
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare CUR2  cursor  for $1", 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare CUR2 cursor for $1", 
 	ECPGt_char_variable,(ECPGprepared_statement(NULL, "f", __LINE__)),(long)1,(long)1,(1)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_const,"1",(long)1,(long)1,strlen("1"), 
@@ -235,10 +235,10 @@ if (sqlca.sqlcode < 0) sqlprint();}
 		   
 		
 #line 80 "execute.pgc"
- char  n  [ 8 ]   ,  l   = letter [ i ] [ 0 ] ;
+ char n [ 8 ] , l = letter [ i ] [ 0 ] ;
  
 #line 81 "execute.pgc"
- int  a   = amount [ i ] ;
+ int a = amount [ i ] ;
 /* exec sql end declare section */
 #line 82 "execute.pgc"
 
@@ -290,10 +290,10 @@ if (sqlca.sqlcode < 0) sqlprint();}
 		   
 		
 #line 99 "execute.pgc"
- char  n  [ 8 ]   ,  l   = letter [ i ] [ 0 ] ;
+ char n [ 8 ] , l = letter [ i ] [ 0 ] ;
  
 #line 100 "execute.pgc"
- int  a   = amount [ i ] ;
+ int a = amount [ i ] ;
 /* exec sql end declare section */
 #line 101 "execute.pgc"
 
@@ -308,13 +308,13 @@ if (sqlca.sqlcode < 0) sqlprint();}
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 107 "execute.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table test ", ECPGt_EOIT, ECPGt_EORT);
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table test", ECPGt_EOIT, ECPGt_EORT);
 #line 108 "execute.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 108 "execute.pgc"
 
-	{ ECPGtrans(__LINE__, NULL, "commit ");
+	{ ECPGtrans(__LINE__, NULL, "commit");
 #line 109 "execute.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}

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

@@ -2,13 +2,13 @@
 [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 25: query: create  table test ( name char  ( 8 )    , amount int   , letter char  ( 1 )    )    ; with 0 parameter(s) on connection main
+[NO_PID]: ecpg_execute on line 25: query: create table test ( name char ( 8 ) , amount int , letter char ( 1 ) ); with 0 parameter(s) on connection main
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 25: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 25: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 26: action "commit "; connection "main"
+[NO_PID]: ECPGtrans on line 26: action "commit"; connection "main"
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 29: query: insert into test (name, amount, letter) values ('db: ''r1''', 1, 'f'); with 0 parameter(s) on connection main
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -38,11 +38,11 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 41: OK: INSERT 0 4
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 45: action "commit "; connection "main"
+[NO_PID]: ECPGtrans on line 45: action "commit"; connection "main"
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGprepare on line 49: name f; query: "select * from test"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 52: query: declare CUR  cursor  for select * from test; with 0 parameter(s) on connection main
+[NO_PID]: ecpg_execute on line 52: query: declare CUR cursor for select * from test; with 0 parameter(s) on connection main
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 52: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -112,7 +112,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGprepare on line 71: name f; query: "select * from test where amount = $1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 74: query: declare CUR2  cursor  for select * from test where amount = $1; with 1 parameter(s) on connection main
+[NO_PID]: ecpg_execute on line 74: query: declare CUR2 cursor for select * from test where amount = $1; with 1 parameter(s) on connection main
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 74: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -158,13 +158,13 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGdeallocate on line 107: name f
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 108: query: drop table test ; with 0 parameter(s) on connection main
+[NO_PID]: ecpg_execute on line 108: query: drop table test; with 0 parameter(s) on connection main
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 108: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 108: OK: DROP TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ECPGtrans on line 109: action "commit "; connection "main"
+[NO_PID]: ECPGtrans on line 109: action "commit"; connection "main"
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGdeallocate on line 0: name i
 [NO_PID]: sqlca: code: 0, state: 00000

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

@@ -28,10 +28,10 @@ int main(int argc, char* argv[]) {
        
   
 #line 9 "fetch.pgc"
- char  str  [ 25 ]   ;
+ char str [ 25 ] ;
  
 #line 10 "fetch.pgc"
- int  i    ,  count   = 1 ;
+ int i , count = 1 ;
 /* exec sql end declare section */
 #line 11 "fetch.pgc"
 
@@ -48,7 +48,7 @@ int main(int argc, char* argv[]) {
 #line 17 "fetch.pgc"
 
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create  table My_Table ( Item1 int   , Item2 text    )    ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table My_Table ( Item1 int , Item2 text )", ECPGt_EOIT, ECPGt_EORT);
 #line 19 "fetch.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -58,7 +58,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 19 "fetch.pgc"
 
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into My_Table values ( 1 , 'text1' ) ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into My_Table values ( 1 , 'text1' )", ECPGt_EOIT, ECPGt_EORT);
 #line 21 "fetch.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -67,7 +67,7 @@ if (sqlca.sqlwarn[0] == 'W') sqlprint();
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 21 "fetch.pgc"
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into My_Table values ( 2 , 'text2' ) ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into My_Table values ( 2 , 'text2' )", ECPGt_EOIT, ECPGt_EORT);
 #line 22 "fetch.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -76,7 +76,7 @@ if (sqlca.sqlwarn[0] == 'W') sqlprint();
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 22 "fetch.pgc"
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into My_Table values ( 3 , 'text3' ) ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into My_Table values ( 3 , 'text3' )", ECPGt_EOIT, ECPGt_EORT);
 #line 23 "fetch.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -85,7 +85,7 @@ if (sqlca.sqlwarn[0] == 'W') sqlprint();
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 23 "fetch.pgc"
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into My_Table values ( 4 , 'text4' ) ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into My_Table values ( 4 , 'text4' )", ECPGt_EOIT, ECPGt_EORT);
 #line 24 "fetch.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -95,11 +95,11 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 24 "fetch.pgc"
 
 
-  /* declare C  cursor  for select  *  from My_Table    */
+  /* declare C cursor for select * from My_Table */
 #line 26 "fetch.pgc"
 
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare C  cursor  for select  *  from My_Table   ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare C cursor for select * from My_Table", ECPGt_EOIT, ECPGt_EORT);
 #line 28 "fetch.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -162,11 +162,11 @@ if (sqlca.sqlcode < 0) sqlprint();}
 
   printf("%d: %s\n", i, str);
 
-  /* declare D  cursor  for select  *  from My_Table where Item1 = $1    */
+  /* declare D cursor for select * from My_Table where Item1 = $1 */
 #line 42 "fetch.pgc"
 
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare D  cursor  for select  *  from My_Table where Item1 = $1   ", 
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare D cursor for select * from My_Table where Item1 = $1", 
 	ECPGt_const,"1",(long)1,(long)1,strlen("1"), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
 #line 44 "fetch.pgc"
@@ -210,7 +210,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 51 "fetch.pgc"
 
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table My_Table ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table My_Table", ECPGt_EOIT, ECPGt_EORT);
 #line 53 "fetch.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();

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

@@ -2,37 +2,37 @@
 [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 19: query: create  table My_Table ( Item1 int   , Item2 text    )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 19: query: create table My_Table ( Item1 int , Item2 text ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 19: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 19: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 21: query: insert into My_Table values ( 1 , 'text1' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 21: query: insert into My_Table values ( 1 , 'text1' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 21: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 21: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 22: query: insert into My_Table values ( 2 , 'text2' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 22: query: insert into My_Table values ( 2 , 'text2' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 22: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 22: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 23: query: insert into My_Table values ( 3 , 'text3' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 23: query: insert into My_Table values ( 3 , 'text3' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 23: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 23: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 24: query: insert into My_Table values ( 4 , 'text4' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 24: query: insert into My_Table values ( 4 , 'text4' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 24: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 24: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 28: query: declare C  cursor  for select  *  from My_Table   ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 28: query: declare C cursor for select * from My_Table; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 28: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -102,7 +102,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 39: RESULT: text4 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 44: query: declare D  cursor  for select  *  from My_Table where Item1 = $1   ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 44: query: declare D cursor for select * from My_Table where Item1 = $1; with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 44: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -134,7 +134,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 51: OK: CLOSE CURSOR
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 53: query: drop table My_Table ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 53: query: drop table My_Table; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 53: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000

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

@@ -25,7 +25,7 @@
 int main(int argc, char* argv[]) {
   
 #line 8 "func.pgc"
- char  text  [ 25 ]   ;
+ char text [ 25 ] ;
 
 #line 8 "func.pgc"
 
@@ -45,7 +45,7 @@ int main(int argc, char* argv[]) {
 #line 15 "func.pgc"
 
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create  table My_Table ( Item1 int   , Item2 text    )    ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table My_Table ( Item1 int , Item2 text )", ECPGt_EOIT, ECPGt_EORT);
 #line 17 "func.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -54,7 +54,7 @@ if (sqlca.sqlwarn[0] == 'W') sqlprint();
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 17 "func.pgc"
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create  table Log ( name text    , w text    )    ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table Log ( name text , w text )", ECPGt_EOIT, ECPGt_EORT);
 #line 18 "func.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -64,11 +64,11 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 18 "func.pgc"
 
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create  function My_Table_Check ( ) returns trigger   as $test$\
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create function My_Table_Check ( ) returns trigger as $test$\
     BEGIN\
 	INSERT INTO Log VALUES(TG_NAME, TG_WHEN);\
 	RETURN NEW;\
-    END; $test$ language plpgsql ", ECPGt_EOIT, ECPGt_EORT);
+    END; $test$ language plpgsql", ECPGt_EOIT, ECPGt_EORT);
 #line 26 "func.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -78,7 +78,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 26 "func.pgc"
 
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create trigger My_Table_Check_Trigger before insert on My_Table for each row execute procedure My_Table_Check (  )", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create trigger My_Table_Check_Trigger before insert on My_Table for each row execute procedure My_Table_Check ( )", ECPGt_EOIT, ECPGt_EORT);
 #line 32 "func.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -88,7 +88,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 32 "func.pgc"
 
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into My_Table values ( 1234 , 'Some random text' ) ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into My_Table values ( 1234 , 'Some random text' )", ECPGt_EOIT, ECPGt_EORT);
 #line 34 "func.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -97,7 +97,7 @@ if (sqlca.sqlwarn[0] == 'W') sqlprint();
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 34 "func.pgc"
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into My_Table values ( 5678 , 'The Quick Brown' ) ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into My_Table values ( 5678 , 'The Quick Brown' )", ECPGt_EOIT, ECPGt_EORT);
 #line 35 "func.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -106,7 +106,7 @@ if (sqlca.sqlwarn[0] == 'W') sqlprint();
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 35 "func.pgc"
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  name  from Log     limit 1 ", ECPGt_EOIT, 
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select name from Log limit 1", ECPGt_EOIT, 
 	ECPGt_char,(text),(long)25,(long)1,(25)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
 #line 36 "func.pgc"
@@ -119,7 +119,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 
   printf("Trigger %s fired.\n", text);
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop trigger My_Table_Check_Trigger on My_Table ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop trigger My_Table_Check_Trigger on My_Table", ECPGt_EOIT, ECPGt_EORT);
 #line 39 "func.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -128,7 +128,7 @@ if (sqlca.sqlwarn[0] == 'W') sqlprint();
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 39 "func.pgc"
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop function My_Table_Check ( ) ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop function My_Table_Check ( )", ECPGt_EOIT, ECPGt_EORT);
 #line 40 "func.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -137,7 +137,7 @@ if (sqlca.sqlwarn[0] == 'W') sqlprint();
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 40 "func.pgc"
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table Log ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table Log", ECPGt_EOIT, ECPGt_EORT);
 #line 41 "func.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -146,7 +146,7 @@ if (sqlca.sqlwarn[0] == 'W') sqlprint();
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 41 "func.pgc"
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table My_Table ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table My_Table", ECPGt_EOIT, ECPGt_EORT);
 #line 42 "func.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();

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

@@ -4,43 +4,43 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGsetcommit on line 13: action "on"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 17: query: create  table My_Table ( Item1 int   , Item2 text    )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 17: query: create table My_Table ( Item1 int , Item2 text ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 17: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 17: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 18: query: create  table Log ( name text    , w text    )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 18: query: create table Log ( name text , w text ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 18: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 18: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 20: query: create  function My_Table_Check ( ) returns trigger   as $test$    BEGIN	INSERT INTO Log VALUES(TG_NAME, TG_WHEN);	RETURN NEW;    END; $test$ language plpgsql ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 20: query: create function My_Table_Check ( ) returns trigger as $test$    BEGIN	INSERT INTO Log VALUES(TG_NAME, TG_WHEN);	RETURN NEW;    END; $test$ language plpgsql; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 20: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 20: OK: CREATE FUNCTION
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 28: query: create trigger My_Table_Check_Trigger before insert on My_Table for each row execute procedure My_Table_Check (  ); with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 28: query: create trigger My_Table_Check_Trigger before insert on My_Table for each row execute procedure My_Table_Check ( ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 28: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 28: OK: CREATE TRIGGER
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 34: query: insert into My_Table values ( 1234 , 'Some random text' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 34: query: insert into My_Table values ( 1234 , 'Some random text' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 34: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 34: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 35: query: insert into My_Table values ( 5678 , 'The Quick Brown' ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 35: query: insert into My_Table values ( 5678 , 'The Quick Brown' ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 35: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 35: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 36: query: select  name  from Log     limit 1 ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 36: query: select name from Log limit 1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 36: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -48,25 +48,25 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 36: RESULT: my_table_check_trigger offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 39: query: drop trigger My_Table_Check_Trigger on My_Table ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 39: query: drop trigger My_Table_Check_Trigger on My_Table; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 39: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 39: OK: DROP TRIGGER
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 40: query: drop function My_Table_Check ( ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 40: query: drop function My_Table_Check ( ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 40: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 40: OK: DROP FUNCTION
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 41: query: drop table Log ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 41: query: drop table Log; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 41: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 41: OK: DROP TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 42: query: drop table My_Table ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 42: query: drop table My_Table; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 42: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000

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

@@ -99,10 +99,10 @@ int main(int argc, char **argv)
 		   
 	
 #line 10 "indicators.pgc"
- int  intvar   = 5 ;
+ int intvar = 5 ;
  
 #line 11 "indicators.pgc"
- int  nullind   = - 1 ;
+ int nullind = - 1 ;
 /* exec sql end declare section */
 #line 12 "indicators.pgc"
 
@@ -116,25 +116,25 @@ int main(int argc, char **argv)
 #line 17 "indicators.pgc"
 
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create  table indicator_test ( \"id\" int   primary key   , \"str\" text    not null , val int   null )    ", ECPGt_EOIT, ECPGt_EORT);}
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table indicator_test ( \"id\" int primary key , \"str\" text not null , val int null )", ECPGt_EOIT, ECPGt_EORT);}
 #line 22 "indicators.pgc"
 
 	{ ECPGtrans(__LINE__, NULL, "commit work");}
 #line 23 "indicators.pgc"
 
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into indicator_test ( id  , str  , val  ) values ( 1 , 'Hello' , 0 ) ", ECPGt_EOIT, ECPGt_EORT);}
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into indicator_test ( id , str , val ) values ( 1 , 'Hello' , 0 )", ECPGt_EOIT, ECPGt_EORT);}
 #line 25 "indicators.pgc"
 
 
 	/* use indicator in insert */
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into indicator_test ( id  , str  , val  ) values ( 2 , 'Hi there' ,  $1  ) ", 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into indicator_test ( id , str , val ) values ( 2 , 'Hi there' , $1  )", 
 	ECPGt_int,&(intvar),(long)1,(long)1,sizeof(int), 
 	ECPGt_int,&(nullind),(long)1,(long)1,sizeof(int), ECPGt_EOIT, ECPGt_EORT);}
 #line 28 "indicators.pgc"
 
 	nullind = 0;
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into indicator_test ( id  , str  , val  ) values ( 3 , 'Good evening' ,  $1  ) ", 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into indicator_test ( id , str , val ) values ( 3 , 'Good evening' , $1  )", 
 	ECPGt_int,&(intvar),(long)1,(long)1,sizeof(int), 
 	ECPGt_int,&(nullind),(long)1,(long)1,sizeof(int), ECPGt_EOIT, ECPGt_EORT);}
 #line 30 "indicators.pgc"
@@ -144,18 +144,18 @@ int main(int argc, char **argv)
 
 
 	/* use indicators to get information about selects */
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  val  from indicator_test where id = 1  ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select val from indicator_test where id = 1", ECPGt_EOIT, 
 	ECPGt_int,&(intvar),(long)1,(long)1,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);}
 #line 34 "indicators.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  val  from indicator_test where id = 2  ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select val from indicator_test where id = 2", ECPGt_EOIT, 
 	ECPGt_int,&(intvar),(long)1,(long)1,sizeof(int), 
 	ECPGt_int,&(nullind),(long)1,(long)1,sizeof(int), ECPGt_EORT);}
 #line 35 "indicators.pgc"
 
 	printf("intvar: %d, nullind: %d\n", intvar, nullind);
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  val  from indicator_test where id = 3  ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select val from indicator_test where id = 3", ECPGt_EOIT, 
 	ECPGt_int,&(intvar),(long)1,(long)1,sizeof(int), 
 	ECPGt_int,&(nullind),(long)1,(long)1,sizeof(int), ECPGt_EORT);}
 #line 37 "indicators.pgc"
@@ -164,19 +164,19 @@ int main(int argc, char **argv)
 
 	/* use indicators for update */
 	intvar = 5; nullind = -1;
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "update indicator_test set val  =  $1   where id = 1 ", 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "update indicator_test set val = $1  where id = 1", 
 	ECPGt_int,&(intvar),(long)1,(long)1,sizeof(int), 
 	ECPGt_int,&(nullind),(long)1,(long)1,sizeof(int), ECPGt_EOIT, ECPGt_EORT);}
 #line 42 "indicators.pgc"
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  val  from indicator_test where id = 1  ", ECPGt_EOIT, 
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select val from indicator_test where id = 1", ECPGt_EOIT, 
 	ECPGt_int,&(intvar),(long)1,(long)1,sizeof(int), 
 	ECPGt_int,&(nullind),(long)1,(long)1,sizeof(int), ECPGt_EORT);}
 #line 43 "indicators.pgc"
 
 	printf("intvar: %d, nullind: %d\n", intvar, nullind);
 
-	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table indicator_test ", ECPGt_EOIT, ECPGt_EORT);}
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table indicator_test", ECPGt_EOIT, ECPGt_EORT);}
 #line 46 "indicators.pgc"
 
 	{ ECPGtrans(__LINE__, NULL, "commit work");}

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

@@ -4,7 +4,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGsetcommit on line 17: action "off"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 19: query: create  table indicator_test ( "id" int   primary key   , "str" text    not null , val int   null )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 19: query: create table indicator_test ( "id" int primary key , "str" text not null , val int null ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 19: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -12,13 +12,13 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGtrans on line 23: action "commit work"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 25: query: insert into indicator_test ( id  , str  , val  ) values ( 1 , 'Hello' , 0 ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 25: query: insert into indicator_test ( id , str , val ) values ( 1 , 'Hello' , 0 ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 25: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 25: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 28: query: insert into indicator_test ( id  , str  , val  ) values ( 2 , 'Hi there' ,  $1  ) ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 28: query: insert into indicator_test ( id , str , val ) values ( 2 , 'Hi there' , $1  ); with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 28: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -26,7 +26,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 28: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 30: query: insert into indicator_test ( id  , str  , val  ) values ( 3 , 'Good evening' ,  $1  ) ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 30: query: insert into indicator_test ( id , str , val ) values ( 3 , 'Good evening' , $1  ); with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 30: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -36,7 +36,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGtrans on line 31: action "commit work"; connection "regress1"
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 34: query: select  val  from indicator_test where id = 1  ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 34: query: select val from indicator_test where id = 1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 34: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -44,7 +44,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 34: RESULT: 0 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 35: query: select  val  from indicator_test where id = 2  ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 35: query: select val from indicator_test where id = 2; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 35: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -52,7 +52,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 35: RESULT:  offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 37: query: select  val  from indicator_test where id = 3  ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 37: query: select val from indicator_test where id = 3; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 37: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -60,7 +60,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 37: RESULT: 5 offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 42: query: update indicator_test set val  =  $1   where id = 1 ; with 1 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 42: query: update indicator_test set val = $1  where id = 1; with 1 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 42: using PQexecParams
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -68,7 +68,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 42: OK: UPDATE 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 43: query: select  val  from indicator_test where id = 1  ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 43: query: select val from indicator_test where id = 1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 43: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
@@ -76,7 +76,7 @@
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_get_data on line 43: RESULT:  offset: -1; array: yes
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 46: query: drop table indicator_test ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 46: query: drop table indicator_test; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 46: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000

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

@@ -27,7 +27,7 @@ int main(int argc, char* argv[]) {
   	  
   
 #line 9 "insupd.pgc"
- int  i1  [ 3 ]   ,  i2  [ 3 ]   ;
+ int i1 [ 3 ] , i2 [ 3 ] ;
 /* exec sql end declare section */
 #line 10 "insupd.pgc"
 
@@ -44,7 +44,7 @@ int main(int argc, char* argv[]) {
 #line 16 "insupd.pgc"
 
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create  table insupd_test ( a int   , b int   )    ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table insupd_test ( a int , b int )", ECPGt_EOIT, ECPGt_EORT);
 #line 18 "insupd.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -54,7 +54,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 18 "insupd.pgc"
 
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into insupd_test ( a  , b  ) values ( 1 , 1 ) ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into insupd_test ( a , b ) values ( 1 , 1 )", ECPGt_EOIT, ECPGt_EORT);
 #line 20 "insupd.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -63,7 +63,7 @@ if (sqlca.sqlwarn[0] == 'W') sqlprint();
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 20 "insupd.pgc"
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into insupd_test ( a  , b  ) values ( 2 , 2 ) ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into insupd_test ( a , b ) values ( 2 , 2 )", ECPGt_EOIT, ECPGt_EORT);
 #line 21 "insupd.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -72,7 +72,7 @@ if (sqlca.sqlwarn[0] == 'W') sqlprint();
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 21 "insupd.pgc"
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into insupd_test ( a  , b  ) values ( 3 , 3 ) ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into insupd_test ( a , b ) values ( 3 , 3 )", ECPGt_EOIT, ECPGt_EORT);
 #line 22 "insupd.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -82,7 +82,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 22 "insupd.pgc"
 
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "update insupd_test set a  = a + 1   ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "update insupd_test set a = a + 1", ECPGt_EOIT, ECPGt_EORT);
 #line 24 "insupd.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -91,7 +91,7 @@ if (sqlca.sqlwarn[0] == 'W') sqlprint();
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 24 "insupd.pgc"
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "update insupd_test set ( a  , b  ) = ( 5 , 5 )  where a = 4 ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "update insupd_test set ( a , b ) = ( 5 , 5 ) where a = 4", ECPGt_EOIT, ECPGt_EORT);
 #line 25 "insupd.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -100,7 +100,7 @@ if (sqlca.sqlwarn[0] == 'W') sqlprint();
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 25 "insupd.pgc"
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "update insupd_test set a  = 4  where a = 3 ", ECPGt_EOIT, ECPGt_EORT);
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "update insupd_test set a = 4 where a = 3", ECPGt_EOIT, ECPGt_EORT);
 #line 26 "insupd.pgc"
 
 if (sqlca.sqlwarn[0] == 'W') sqlprint();
@@ -110,7 +110,7 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 26 "insupd.pgc"
 ;
 
-  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select  a , b  from insupd_test    order by a  ", ECPGt_EOIT, 
+  { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select a , b from insupd_test order by a", ECPGt_EOIT, 
 	ECPGt_int,(i1),(long)1,(long)3,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_int,(i2),(long)1,(long)3,sizeof(int), 

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

@@ -2,49 +2,49 @@
 [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 18: query: create  table insupd_test ( a int   , b int   )    ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 18: query: create table insupd_test ( a int , b int ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 18: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 18: OK: CREATE TABLE
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 20: query: insert into insupd_test ( a  , b  ) values ( 1 , 1 ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 20: query: insert into insupd_test ( a , b ) values ( 1 , 1 ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 20: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 20: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 21: query: insert into insupd_test ( a  , b  ) values ( 2 , 2 ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 21: query: insert into insupd_test ( a , b ) values ( 2 , 2 ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 21: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 21: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 22: query: insert into insupd_test ( a  , b  ) values ( 3 , 3 ) ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 22: query: insert into insupd_test ( a , b ) values ( 3 , 3 ); with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 22: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 22: OK: INSERT 0 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 24: query: update insupd_test set a  = a + 1   ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 24: query: update insupd_test set a = a + 1; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 24: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 24: OK: UPDATE 3
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 25: query: update insupd_test set ( a  , b  ) = ( 5 , 5 )  where a = 4 ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 25: query: update insupd_test set ( a , b ) = ( 5 , 5 ) where a = 4; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 25: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 25: OK: UPDATE 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 26: query: update insupd_test set a  = 4  where a = 3 ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 26: query: update insupd_test set a = 4 where a = 3; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 26: OK: UPDATE 1
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 28: query: select  a , b  from insupd_test    order by a  ; with 0 parameter(s) on connection regress1
+[NO_PID]: ecpg_execute on line 28: query: select a , b from insupd_test order by a; with 0 parameter(s) on connection regress1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ecpg_execute on line 28: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000

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

@@ -27,7 +27,7 @@ int main(int argc, char* argv[]) {
        
   
 #line 9 "show.pgc"
- char  var  [ 25 ]  = "public" ;
+ char var [ 25 ] = "public" ;
 /* exec sql end declare section */
 #line 10 "show.pgc"