Applied test suite update by Joachim Wieland <joe@mcknight.de>.

1 files changed, 71 insertions, 66 deletions

diff --git a/src/interfaces/ecpg/test/expected/sql-desc.c b/src/interfaces/ecpg/test/expected/sql-desc.c
index 106fd6d0c8..aef542de85 100644
--- a/src/interfaces/ecpg/test/expected/sql-desc.c
+++ b/src/interfaces/ecpg/test/expected/sql-desc.c
@@ -33,6 +33,7 @@ main(void)
 	      
 	      
 	   
+	  
 	
 #line 8 "desc.pgc"
  char * stmt1   = "INSERT INTO test1 VALUES (?, ?)" ;
@@ -54,102 +55,105 @@ main(void)
  
 #line 15 "desc.pgc"
  int  val2null   = - 1 ;
-/* exec sql end declare section */
+ 
 #line 16 "desc.pgc"
+ int  ind1    ,  ind2    ;
+/* exec sql end declare section */
+#line 17 "desc.pgc"
 
 
 	ECPGdebug(1, stderr);
 
 	ECPGallocate_desc(__LINE__, "indesc");
-#line 20 "desc.pgc"
+#line 21 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();
-#line 20 "desc.pgc"
+#line 21 "desc.pgc"
 
 	ECPGallocate_desc(__LINE__, "outdesc");
-#line 21 "desc.pgc"
+#line 22 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();
-#line 21 "desc.pgc"
+#line 22 "desc.pgc"
 
 
 	{ ECPGset_desc(__LINE__, "indesc", 1,ECPGd_data,
 	ECPGt_int,&(val1),(long)1,(long)1,sizeof(int), ECPGd_EODT);
 
-#line 23 "desc.pgc"
+#line 24 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 23 "desc.pgc"
+#line 24 "desc.pgc"
 
 	{ ECPGset_desc(__LINE__, "indesc", 2,ECPGd_data,
 	ECPGt_char,&(val2),(long)-1,(long)1,(-1)*sizeof(char), ECPGd_indicator,
 	ECPGt_int,&(val2i),(long)1,(long)1,sizeof(int), ECPGd_EODT);
 
-#line 24 "desc.pgc"
+#line 25 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 24 "desc.pgc"
+#line 25 "desc.pgc"
 
 
 	{ ECPGconnect(__LINE__, 0, "regress1" , NULL,NULL , NULL, 0); 
-#line 26 "desc.pgc"
+#line 27 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 26 "desc.pgc"
+#line 27 "desc.pgc"
 
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, "create  table test1 ( a int   , b text   )    ", ECPGt_EOIT, ECPGt_EORT);
-#line 28 "desc.pgc"
-
-if (sqlca.sqlcode < 0) sqlprint();}
-#line 28 "desc.pgc"
-
-	{ ECPGprepare(__LINE__, "foo1" , stmt1);
 #line 29 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 29 "desc.pgc"
 
-	{ ECPGprepare(__LINE__, "foo2" , stmt2);
+	{ ECPGprepare(__LINE__, "foo1" , stmt1);
 #line 30 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 30 "desc.pgc"
 
-	{ ECPGprepare(__LINE__, "foo3" , stmt3);
+	{ ECPGprepare(__LINE__, "foo2" , stmt2);
 #line 31 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
 #line 31 "desc.pgc"
 
+	{ ECPGprepare(__LINE__, "foo3" , stmt3);
+#line 32 "desc.pgc"
+
+if (sqlca.sqlcode < 0) sqlprint();}
+#line 32 "desc.pgc"
+
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, "?", 
 	ECPGt_char_variable,(ECPGprepared_statement("foo1")),(long)1,(long)1,(1)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_descriptor, "indesc", 0L, 0L, 0L, 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
-#line 33 "desc.pgc"
+#line 34 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 33 "desc.pgc"
+#line 34 "desc.pgc"
 
 
 	{ ECPGset_desc(__LINE__, "indesc", 1,ECPGd_data,
 	ECPGt_const,"2",(long)1,(long)1,strlen("2"), ECPGd_EODT);
 
-#line 35 "desc.pgc"
+#line 36 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 35 "desc.pgc"
+#line 36 "desc.pgc"
 
 	{ ECPGset_desc(__LINE__, "indesc", 2,ECPGd_data,
 	ECPGt_char,&(val2),(long)-1,(long)1,(-1)*sizeof(char), ECPGd_indicator,
 	ECPGt_int,&(val2null),(long)1,(long)1,sizeof(int), ECPGd_EODT);
 
-#line 36 "desc.pgc"
+#line 37 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 36 "desc.pgc"
+#line 37 "desc.pgc"
 
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, "?", 
@@ -157,28 +161,28 @@ if (sqlca.sqlcode < 0) sqlprint();}
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_descriptor, "indesc", 0L, 0L, 0L, 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
-#line 38 "desc.pgc"
+#line 39 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 38 "desc.pgc"
+#line 39 "desc.pgc"
 
 
 	{ ECPGset_desc(__LINE__, "indesc", 1,ECPGd_data,
 	ECPGt_int,&(val1),(long)1,(long)1,sizeof(int), ECPGd_EODT);
 
-#line 40 "desc.pgc"
+#line 41 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 40 "desc.pgc"
+#line 41 "desc.pgc"
 
 	{ ECPGset_desc(__LINE__, "indesc", 2,ECPGd_data,
 	ECPGt_char,&(val2),(long)-1,(long)1,(-1)*sizeof(char), ECPGd_indicator,
 	ECPGt_int,&(val2i),(long)1,(long)1,sizeof(int), ECPGd_EODT);
 
-#line 41 "desc.pgc"
+#line 42 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 41 "desc.pgc"
+#line 42 "desc.pgc"
 
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, "?", 
@@ -188,83 +192,84 @@ if (sqlca.sqlcode < 0) sqlprint();}
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, 
 	ECPGt_descriptor, "outdesc", 0L, 0L, 0L, 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
-#line 43 "desc.pgc"
+#line 44 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 43 "desc.pgc"
+#line 44 "desc.pgc"
 
 
 	{ ECPGget_desc(__LINE__, "outdesc", 1,ECPGd_data,
 	ECPGt_char,&(val2output),(long)-1,(long)1,(-1)*sizeof(char), ECPGd_EODT);
 
-#line 45 "desc.pgc"
+#line 46 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 45 "desc.pgc"
+#line 46 "desc.pgc"
 
 	printf("output = %s\n", val2output);
 
 	/* declare c1  cursor  for ? */
-#line 48 "desc.pgc"
+#line 49 "desc.pgc"
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, "declare c1  cursor  for ?", 
 	ECPGt_char_variable,(ECPGprepared_statement("foo2")),(long)1,(long)1,(1)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_descriptor, "indesc", 0L, 0L, 0L, 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
-#line 49 "desc.pgc"
+#line 50 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 49 "desc.pgc"
+#line 50 "desc.pgc"
 
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, "fetch next from c1", ECPGt_EOIT, 
 	ECPGt_int,&(val1output),(long)1,(long)1,sizeof(int), 
-	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
+	ECPGt_int,&(ind1),(long)1,(long)1,sizeof(int), 
 	ECPGt_char,&(val2output),(long)-1,(long)1,(-1)*sizeof(char), 
-	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
-#line 51 "desc.pgc"
+	ECPGt_int,&(ind2),(long)1,(long)1,sizeof(int), ECPGt_EORT);
+#line 52 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 51 "desc.pgc"
+#line 52 "desc.pgc"
 
-	printf("val1=%d val2=%s\n", val1output, val2output);
+	printf("val1=%d (ind1: %d) val2=%s (ind2: %d)\n",
+		val1output, ind1, val2output, ind2);
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, "close c1", ECPGt_EOIT, ECPGt_EORT);
-#line 54 "desc.pgc"
+#line 56 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 54 "desc.pgc"
+#line 56 "desc.pgc"
 
 
 	{ ECPGset_desc_header(__LINE__, "indesc", (int)(1));
 
-#line 56 "desc.pgc"
+#line 58 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 56 "desc.pgc"
+#line 58 "desc.pgc"
 
 	{ ECPGset_desc(__LINE__, "indesc", 1,ECPGd_data,
 	ECPGt_const,"2",(long)1,(long)1,strlen("2"), ECPGd_EODT);
 
-#line 57 "desc.pgc"
+#line 59 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 57 "desc.pgc"
+#line 59 "desc.pgc"
 
 
 	/* declare c2  cursor  for ? */
-#line 59 "desc.pgc"
+#line 61 "desc.pgc"
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, "declare c2  cursor  for ?", 
 	ECPGt_char_variable,(ECPGprepared_statement("foo3")),(long)1,(long)1,(1)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_descriptor, "indesc", 0L, 0L, 0L, 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
-#line 60 "desc.pgc"
+#line 62 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 60 "desc.pgc"
+#line 62 "desc.pgc"
 
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, "fetch next from c2", ECPGt_EOIT, 
@@ -272,18 +277,18 @@ if (sqlca.sqlcode < 0) sqlprint();}
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_char,&(val2output),(long)-1,(long)1,(-1)*sizeof(char), 
 	ECPGt_int,&(val2i),(long)1,(long)1,sizeof(int), ECPGt_EORT);
-#line 62 "desc.pgc"
+#line 64 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 62 "desc.pgc"
+#line 64 "desc.pgc"
 
 	printf("val1=%d val2=%s\n", val1output, val2i ? "null" : val2output);
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, "close c2", ECPGt_EOIT, ECPGt_EORT);
-#line 65 "desc.pgc"
+#line 67 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 65 "desc.pgc"
+#line 67 "desc.pgc"
 
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, "select  *  from test1 where a = 2  ", ECPGt_EOIT, 
@@ -291,37 +296,37 @@ if (sqlca.sqlcode < 0) sqlprint();}
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_char,&(val2output),(long)-1,(long)1,(-1)*sizeof(char), 
 	ECPGt_int,&(val2i),(long)1,(long)1,sizeof(int), ECPGt_EORT);
-#line 67 "desc.pgc"
+#line 69 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 67 "desc.pgc"
+#line 69 "desc.pgc"
 
 	printf("val1=%d val2=%s\n", val1output, val2i ? "null" : val2output);
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, "drop table test1 ", ECPGt_EOIT, ECPGt_EORT);
-#line 70 "desc.pgc"
+#line 72 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 70 "desc.pgc"
+#line 72 "desc.pgc"
 
 	{ ECPGdisconnect(__LINE__, "CURRENT");
-#line 71 "desc.pgc"
+#line 73 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 71 "desc.pgc"
+#line 73 "desc.pgc"
 
 
 	ECPGdeallocate_desc(__LINE__, "indesc");
-#line 73 "desc.pgc"
+#line 75 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();
-#line 73 "desc.pgc"
+#line 75 "desc.pgc"
 
 	ECPGdeallocate_desc(__LINE__, "outdesc");
-#line 74 "desc.pgc"
+#line 76 "desc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();
-#line 74 "desc.pgc"
+#line 76 "desc.pgc"
 
 
 	return 0;