*** empty log message ***

Michael Meskes · Michael Meskes · commit c05abfb1a845 · 2000-02-25T15:26:12.000Z
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
@@ -828,5 +828,9 @@ Tue Feb 22 13:48:18 CET 2000
 Wed Feb 23 17:08:28 CET 2000
 
 	- Even more clean ups.
+
+Fri Feb 25 16:13:11 CET 2000
+
+	- Fixed some bugs I created when I cleaned up, thanks Christof.
 	- Set library version to 3.1.0.
 	- Set ecpg version to 2.7.0.
diff --git a/src/interfaces/ecpg/include/ecpglib.h b/src/interfaces/ecpg/include/ecpglib.h
@@ -37,7 +37,6 @@ extern		"C"
 	char *ecpg_strdup(const char *, int);
 	const char *ECPGtype_name(enum ECPGttype);
 	
-
 /* and some vars */
 	extern struct auto_mem *auto_allocs;
 
diff --git a/src/interfaces/ecpg/lib/descriptor.c b/src/interfaces/ecpg/lib/descriptor.c
@@ -47,7 +47,6 @@ ECPGDynamicType(Oid type)
 	}
 }
 
-#if 0
 static unsigned int
 ECPGDynamicType_DDT(Oid type)
 {
@@ -61,7 +60,7 @@ ECPGDynamicType_DDT(Oid type)
 			return SQL3_DDT_ILLEGAL;
 	}
 }
-#endif
+
 
 bool
 ECPGget_desc_header(int lineno, char * desc_name, int *count)
@@ -260,6 +259,12 @@ ECPGget_desc(int lineno, char *desc_name, int index, ...)
 	        		ECPGlog("ECPGget_desc: TYPE = %d\n", ECPGDynamicType(PQftype(ECPGresult, index)));
                         	break;
 
+                        case ECPGd_di_code:
+                        	if (!get_int_item(lineno, var, vartype, ECPGDynamicType_DDT(PQftype(ECPGresult, index))))
+	        			return (false);
+	        			
+	        		ECPGlog("ECPGget_desc: TYPE = %d\n", ECPGDynamicType_DDT(PQftype(ECPGresult, index)));
+                        	break;
 			case ECPGd_data:
 				if (!get_data(ECPGresult, 0, index, lineno, vartype, ECPGt_NO_INDICATOR, var, NULL, varcharsize, offset))
 					return (false);                        	
diff --git a/src/interfaces/ecpg/preproc/output.c b/src/interfaces/ecpg/preproc/output.c
@@ -120,6 +120,7 @@ output_statement(char * stmt, int mode, char *descriptor)
 	mode |= 2;
 	whenever_action(mode);
 	free(stmt);
+	free(descriptor);
 	if (connection != NULL)
 		free(connection);
 }
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
@@ -491,11 +491,7 @@ stmt:  AlterTableStmt			{ output_statement($1, 0, NULL); }
 						free($1);
 					} 
 		| ECPGExecute		{	output_statement($1, 0, NULL); }
-		| ECPGFetchDescStmt	{
-					 	output_statement($1.str, 1, $1.name);
-						free($1.str);
-						free($1.name);
-					}
+		| ECPGFetchDescStmt	{ 	output_statement($1.str, 1, $1.name); }
 		| ECPGFree		{
 						fprintf(yyout, "{ ECPGdeallocate(__LINE__, \"%s\");", $1);
 

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,6 @@ ECPGDynamicType(Oid type)`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`		`-#if 0`
`51`	`50`	`static unsigned int`
`52`	`51`	`ECPGDynamicType_DDT(Oid type)`
`53`	`52`	`{`
`@@ -61,7 +60,7 @@ ECPGDynamicType_DDT(Oid type)`
`61`	`60`	`return SQL3_DDT_ILLEGAL;`
`62`	`61`	`}`
`63`	`62`	`}`
`64`		`-#endif`
	`63`	`+`
`65`	`64`
`66`	`65`	`bool`
`67`	`66`	`ECPGget_desc_header(int lineno, char * desc_name, int *count)`
`@@ -260,6 +259,12 @@ ECPGget_desc(int lineno, char *desc_name, int index, ...)`
`260`	`259`	`ECPGlog("ECPGget_desc: TYPE = %d\n", ECPGDynamicType(PQftype(ECPGresult, index)));`
`261`	`260`	`break;`
`262`	`261`
	`262`	`+ case ECPGd_di_code:`
	`263`	`+ if (!get_int_item(lineno, var, vartype, ECPGDynamicType_DDT(PQftype(ECPGresult, index))))`
	`264`	`+ return (false);`
	`265`	`+`
	`266`	`+ ECPGlog("ECPGget_desc: TYPE = %d\n", ECPGDynamicType_DDT(PQftype(ECPGresult, index)));`
	`267`	`+ break;`
`263`	`268`	`case ECPGd_data:`
`264`	`269`	`if (!get_data(ECPGresult, 0, index, lineno, vartype, ECPGt_NO_INDICATOR, var, NULL, varcharsize, offset))`
`265`	`270`	`return (false);`
Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,7 @@ output_statement(char * stmt, int mode, char *descriptor)`
`120`	`120`	`mode \|= 2;`
`121`	`121`	`whenever_action(mode);`
`122`	`122`	`free(stmt);`
	`123`	`+ free(descriptor);`
`123`	`124`	`if (connection != NULL)`
`124`	`125`	`free(connection);`
`125`	`126`	`}`