diff options
| author | Bruce Momjian | 1998-10-16 04:40:39 +0000 |
|---|---|---|
| committer | Bruce Momjian | 1998-10-16 04:40:39 +0000 |
| commit | 06edbafd4bae8da6ce9988452e48d3748764db58 (patch) | |
| tree | 34ee918bfc0959ad897aae7388f79d52f5d37b0a | |
| parent | baa2f9998ca392c3057cbe4c72a5a4b4c2c55bc0 (diff) | |
Here's a patch. It also includes the latest parser changes.
Michael
| -rw-r--r-- | src/interfaces/ecpg/ChangeLog | 7 | ||||
| -rw-r--r-- | src/interfaces/ecpg/lib/Makefile.in | 4 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/Makefile | 2 | ||||
| -rw-r--r-- | src/interfaces/ecpg/preproc/preproc.y | 9 |
4 files changed, 17 insertions, 5 deletions
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog index b431a0b6058..c4bce8e9e7e 100644 --- a/src/interfaces/ecpg/ChangeLog +++ b/src/interfaces/ecpg/ChangeLog @@ -348,4 +348,11 @@ Wed Sep 30 12:15:10 CEST 1998 - Synced preproc.y with gram.y yet again. - Set version to 2.4.3 +Mon Okt 12 12:36:04 CEST 1998 + - Synced preproc.y with gram.y yet again. + +Thu Okt 15 10:05:04 CEST 1998 + + - Synced preproc.y with gram.y yet again. + - Set version to 2.4.4 diff --git a/src/interfaces/ecpg/lib/Makefile.in b/src/interfaces/ecpg/lib/Makefile.in index 310a801332e..d9f7d7c763a 100644 --- a/src/interfaces/ecpg/lib/Makefile.in +++ b/src/interfaces/ecpg/lib/Makefile.in @@ -104,7 +104,7 @@ ecpglib.o : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h typename.o : typename.c ../include/ecpgtype.h $(CC) $(CFLAGS) -I../include $(PQ_INCLUDE) -c $< -o $@ -ecpglib.sho.o : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h +ecpglib.sho : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h $(CC) $(CFLAGS) $(CFLAGS_SL) -I../include $(PQ_INCLUDE) -c $< -o $@ -typename.sho.o : typename.c ../include/ecpgtype.h +typename.sho : typename.c ../include/ecpgtype.h $(CC) $(CFLAGS) $(CFLAGS_SL) -I../include $(PQ_INCLUDE) -c $< -o $@ diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile index 6b385ee39d5..fd4a305f00b 100644 --- a/src/interfaces/ecpg/preproc/Makefile +++ b/src/interfaces/ecpg/preproc/Makefile @@ -3,7 +3,7 @@ include $(SRCDIR)/Makefile.global MAJOR_VERSION=2 MINOR_VERSION=4 -PATCHLEVEL=3 +PATCHLEVEL=4 CFLAGS+=-I../include -DMAJOR_VERSION=$(MAJOR_VERSION) \ -DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \ diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y index 387ba1e1439..ef3b954b188 100644 --- a/src/interfaces/ecpg/preproc/preproc.y +++ b/src/interfaces/ecpg/preproc/preproc.y @@ -2153,6 +2153,10 @@ UnlistenStmt: UNLISTEN relation_name { $$ = cat2_str(make1_str("unlisten"), $2); } + | UNLISTEN '*' + { + $$ = make1_str("unlisten *"); + } ; /***************************************************************************** @@ -3796,9 +3800,9 @@ AexprConst: Iconst } ; -ParamNo: PARAM +ParamNo: PARAM opt_indirection { - $$ = make_name(); + $$ = cat2_str(make_name(), $2); } ; @@ -3896,6 +3900,7 @@ ColId: ident { $$ = $1; } | STDIN { $$ = make1_str("stdin"); } | STDOUT { $$ = make1_str("stdout"); } | TIME { $$ = make1_str("time"); } + | TIMESTAMP { $$ = make1_str("timestamp"); } | TIMEZONE_HOUR { $$ = make1_str("timezone_hour"); } | TIMEZONE_MINUTE { $$ = make1_str("timezone_minute"); } | TRIGGER { $$ = make1_str("trigger"); } |