Changed test case slightly so it doesn't have an unused typedef.

Michael Meskes · Michael Meskes · commit 5f8f8cbec59a · 2013-11-03T15:41:57.000+01:00
diff --git a/src/interfaces/ecpg/test/expected/preproc-define.c b/src/interfaces/ecpg/test/expected/preproc-define.c
@@ -125,39 +125,43 @@ if (sqlca.sqlcode < 0) sqlprint();}
 	for (i=0, j=sqlca.sqlerrd[2]; i<j; i++)
 	{
 		/* exec sql begin declare section */
-		    
+		 
+		   
 		   
 		
 #line 48 "define.pgc"
- char n [ 8 ] , l = letter [ i ] [ 0 ] ;
+ string n ;
  
 #line 49 "define.pgc"
+ char l = letter [ i ] [ 0 ] ;
+ 
+#line 50 "define.pgc"
  int a = amount [ i ] ;
 /* exec sql end declare section */
-#line 50 "define.pgc"
+#line 51 "define.pgc"
 
 
 		strncpy(n, name[i],  8);
 		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);
-#line 56 "define.pgc"
+#line 57 "define.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 56 "define.pgc"
+#line 57 "define.pgc"
 
 	{ ECPGtrans(__LINE__, NULL, "commit");
-#line 57 "define.pgc"
+#line 58 "define.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 57 "define.pgc"
+#line 58 "define.pgc"
 
 	{ ECPGdisconnect(__LINE__, "CURRENT");
-#line 58 "define.pgc"
+#line 59 "define.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 58 "define.pgc"
+#line 59 "define.pgc"
 
 
 	return (0);
diff --git a/src/interfaces/ecpg/test/expected/preproc-define.stderr b/src/interfaces/ecpg/test/expected/preproc-define.stderr
@@ -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 57: 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]: ecpg_execute on line 57: using PQexec
 [NO_PID]: sqlca: code: 0, state: 00000
-[NO_PID]: ecpg_execute on line 56: OK: DROP TABLE
+[NO_PID]: ecpg_execute on line 57: 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 58: 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
diff --git a/src/interfaces/ecpg/test/preproc/define.pgc b/src/interfaces/ecpg/test/preproc/define.pgc
@@ -45,7 +45,8 @@ exec sql end declare section;
 	for (i=0, j=sqlca.sqlerrd[2]; i<j; i++)
 	{
 		exec sql begin declare section;
-		char n[8], l = letter[i][0];
+		string n;
+		char l = letter[i][0];
 		int a = amount[i];
 		exec sql end declare section;
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,8 @@ exec sql end declare section;`
`45`	`45`	`for (i=0, j=sqlca.sqlerrd[2]; i<j; i++)`
`46`	`46`	`{`
`47`	`47`	`exec sql begin declare section;`
`48`		`- char n[8], l = letter[i][0];`
	`48`	`+ string n;`
	`49`	`+ char l = letter[i][0];`
`49`	`50`	`int a = amount[i];`
`50`	`51`	`exec sql end declare section;`
`51`	`52`