Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 5d4b940

Browse files
author
Michael Meskes
committed
Sync parser yet again.
1 parent 36aa85d commit 5d4b940

File tree

3 files changed

+15
-34
lines changed

3 files changed

+15
-34
lines changed

src/interfaces/ecpg/ChangeLog

+4
Original file line numberDiff line numberDiff line change
@@ -1142,5 +1142,9 @@ Fri Oct 19 16:32:06 CEST 2001
11421142
Sun Oct 21 14:19:42 CEST 2001
11431143

11441144
- Synced preproc.y with gram.y.
1145+
1146+
Fri Nov 2 16:16:25 CET 2001
1147+
1148+
- Synced preproc.y with gram.y.
11451149
- Set ecpg version to 2.9.0.
11461150
- Set library version to 3.3.0.

src/interfaces/ecpg/TODO

-26
This file was deleted.

src/interfaces/ecpg/preproc/preproc.y

+11-8
Original file line numberDiff line numberDiff line change
@@ -2679,17 +2679,20 @@ OptUseOp: USING all_Op { $$ = cat2_str(make_str("using"), $2); }
26792679
| /*EMPTY*/ { $$ = EMPTY; }
26802680
;
26812681

2682-
select_limit: LIMIT select_offset_value ',' select_limit_value
2683-
{ $$ = cat_str(4, make_str("limit"), $2, make_str(","), $4); }
2684-
| LIMIT select_limit_value OFFSET select_offset_value
2682+
select_limit: LIMIT select_limit_value OFFSET select_offset_value
26852683
{ $$ = cat_str(4, make_str("limit"), $2, make_str("offset"), $4); }
2686-
| LIMIT select_limit_value
2687-
{ $$ = cat2_str(make_str("limit"), $2); }
2688-
| OFFSET select_offset_value LIMIT select_limit_value
2684+
| OFFSET select_offset_value LIMIT select_limit_value
26892685
{ $$ = cat_str(4, make_str("offset"), $2, make_str("limit"), $4); }
2690-
| OFFSET select_offset_value
2686+
| LIMIT select_limit_value
2687+
{ $$ = cat2_str(make_str("limit"), $2); }
2688+
| OFFSET select_offset_value
26912689
{ $$ = cat2_str(make_str("offset"), $2); }
2692-
;
2690+
| LIMIT select_limit_value ',' select_offset_value
2691+
{ $$ = cat_str(4, make_str("limit"), $2, make_str(","), $4); }
2692+
/* enable this in 7.3, bjm 2001-10-22
2693+
{ mmerror(ET_NOTICE, "No longer supported LIMIT #,# syntax passed to backend."); }
2694+
*/
2695+
;
26932696

26942697
opt_select_limit: select_limit { $$ = $1; }
26952698
| /*EMPTY*/ { $$ = EMPTY; }

0 commit comments

Comments
 (0)