mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reversed my incorrect fix.

Browse Source
This commit is contained in:
Michael Meskes 2003-05-20 11:05:27 +00:00
parent edcf9c237c
commit dc554458ad
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/interfaces/ecpg/ChangeLog
View File

@ -1422,6 +1422,16 @@ Fri May 16 11:45:50 CEST 2003
Fri May 16 13:32:10 CEST 2003
- Made double variables work again.
Mon May 19 09:22:40 CEST 2003
- Fixed exec sql ifdef command.
Tue May 20 11:47:00 CEST 2003
- Reversed my fix for ifdef. It was the example, not ecpg which was
incorrect.
- Changed DBPATH variable to PG_DBPATH.
- Set ecpg version to 2.12.0.
- Set ecpg library to 3.4.2.
- Set pgtypes library to 1.0.0

7
src/interfaces/ecpg/ecpglib/connect.c
View File

@ -1,4 +1,4 @@
/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.4 2003/05/02 14:43:25 meskes Exp $ */
/* $Header: /cvsroot/pgsql/src/interfaces/ecpg/ecpglib/connect.c,v 1.5 2003/05/20 11:05:27 meskes Exp $ */
#include "postgres_fe.h"
@ -264,8 +264,9 @@ ECPGconnect_informix(int lineno, const char *name, const char *user, const char
char *informix_name = (char *)name, *envname;
/* Informix uses an environment variable DBPATH that overrides
* the connection parameters given here */
envname = getenv("DBPATH");
* the connection parameters given here.
* We do the same with PG_DBPATH as the syntax is different. */
envname = getenv("PG_DBPATH");
if (envname)
informix_name = envname;
return (ECPGconnect(lineno, informix_name, user, passwd, connection_name, autocommit));

4
src/interfaces/ecpg/preproc/pgc.l
View File

@ -12,7 +12,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.108 2003/05/19 07:19:57 meskes Exp $
* $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/pgc.l,v 1.109 2003/05/20 11:05:27 meskes Exp $
*
*-------------------------------------------------------------------------
*/
@ -905,7 +905,7 @@ cppline {space}*#(.*\\{space})+.*
<xskip>{other} { /* ignore */ }
<xcond>{identifier}{space}* {
<xcond>{identifier}{space}*';' {
if ( preproc_tos >= MAX_NESTED_IF-1 ) {
mmerror(PARSE_ERROR, ET_FATAL, "Too many nested 'EXEC SQL IFDEF' conditions");
}