diff options
| author | Michael Meskes <meskes@postgresql.org> | 2003-05-20 11:05:27 +0000 |
|---|---|---|
| committer | Michael Meskes <meskes@postgresql.org> | 2003-05-20 11:05:27 +0000 |
| commit | dc554458ad0aa810e6b0fd21fe672842cd11599b (patch) | |
| tree | 6189638dc7e40ffcff81691eae0755bc0d234624 | |
| parent | edcf9c237c137a7e299703f5f64d05f427372ab1 (diff) | |
| download | postgresql-dc554458ad0aa810e6b0fd21fe672842cd11599b.tar.gz postgresql-dc554458ad0aa810e6b0fd21fe672842cd11599b.zip | |
Reversed my incorrect fix.
| -rw-r--r-- | src/interfaces/ecpg/ChangeLog | 10 | ||||
| -rw-r--r-- | src/interfaces/ecpg/ecpglib/connect.c | 7 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/pgc.l | 4 |
3 files changed, 16 insertions, 5 deletions
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog index 0762cba44b3..5dd7977cea9 100644 --- a/src/interfaces/ecpg/ChangeLog +++ b/src/interfaces/ecpg/ChangeLog @@ -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 diff --git a/src/interfaces/ecpg/ecpglib/connect.c b/src/interfaces/ecpg/ecpglib/connect.c index 99c94a10bbf..0c8ac72f182 100644 --- a/src/interfaces/ecpg/ecpglib/connect.c +++ b/src/interfaces/ecpg/ecpglib/connect.c @@ -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)); diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l index b06ede0fce6..77ba3666df9 100644 --- a/src/interfaces/ecpg/preproc/pgc.l +++ b/src/interfaces/ecpg/preproc/pgc.l @@ -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"); } |