Commit 7f6e021c authored by Thomas G. Lockhart's avatar Thomas G. Lockhart

Allow LIKE and ILIKE as TokenId (and hence ColId) to make sure that they

 are allowed in the func_name production. Otherwise, we can't define
 more like() and ilike() functions for new data types.
parent 12e1c9ef
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.182 2000/08/06 18:05:21 thomas Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.183 2000/08/07 06:54:51 thomas Exp $
* *
* HISTORY * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
...@@ -5539,6 +5539,10 @@ UserId: ColId { $$ = $1; }; ...@@ -5539,6 +5539,10 @@ UserId: ColId { $$ = $1; };
* allowed as identifiers, but are acceptable as ColLabels: * allowed as identifiers, but are acceptable as ColLabels:
* BETWEEN, IN, IS, ISNULL, NOTNULL, OVERLAPS * BETWEEN, IN, IS, ISNULL, NOTNULL, OVERLAPS
* Thanks to Tom Lane for pointing this out. - thomas 2000-03-29 * Thanks to Tom Lane for pointing this out. - thomas 2000-03-29
* Allow LIKE and ILIKE as TokenId (and ColId) to make sure that they
* are allowed in the func_name production. Otherwise, we can't define
* more like() and ilike() functions for new data types.
* - thomas 2000-08-07
*/ */
ColId: generic { $$ = $1; } ColId: generic { $$ = $1; }
| datetime { $$ = $1; } | datetime { $$ = $1; }
...@@ -5597,6 +5601,7 @@ TokenId: ABSOLUTE { $$ = "absolute"; } ...@@ -5597,6 +5601,7 @@ TokenId: ABSOLUTE { $$ = "absolute"; }
| FUNCTION { $$ = "function"; } | FUNCTION { $$ = "function"; }
| GRANT { $$ = "grant"; } | GRANT { $$ = "grant"; }
| HANDLER { $$ = "handler"; } | HANDLER { $$ = "handler"; }
| ILIKE { $$ = "ilike"; }
| IMMEDIATE { $$ = "immediate"; } | IMMEDIATE { $$ = "immediate"; }
| INCREMENT { $$ = "increment"; } | INCREMENT { $$ = "increment"; }
| INDEX { $$ = "index"; } | INDEX { $$ = "index"; }
...@@ -5609,6 +5614,7 @@ TokenId: ABSOLUTE { $$ = "absolute"; } ...@@ -5609,6 +5614,7 @@ TokenId: ABSOLUTE { $$ = "absolute"; }
| LANGUAGE { $$ = "language"; } | LANGUAGE { $$ = "language"; }
| LANCOMPILER { $$ = "lancompiler"; } | LANCOMPILER { $$ = "lancompiler"; }
| LEVEL { $$ = "level"; } | LEVEL { $$ = "level"; }
| LIKE { $$ = "like"; }
| LOCATION { $$ = "location"; } | LOCATION { $$ = "location"; }
| MATCH { $$ = "match"; } | MATCH { $$ = "match"; }
| MAXVALUE { $$ = "maxvalue"; } | MAXVALUE { $$ = "maxvalue"; }
...@@ -5735,7 +5741,6 @@ ColLabel: ColId { $$ = $1; } ...@@ -5735,7 +5741,6 @@ ColLabel: ColId { $$ = $1; }
| GLOBAL { $$ = "global"; } | GLOBAL { $$ = "global"; }
| GROUP { $$ = "group"; } | GROUP { $$ = "group"; }
| HAVING { $$ = "having"; } | HAVING { $$ = "having"; }
| ILIKE { $$ = "ilike"; }
| INITIALLY { $$ = "initially"; } | INITIALLY { $$ = "initially"; }
| IN { $$ = "in"; } | IN { $$ = "in"; }
| INNER_P { $$ = "inner"; } | INNER_P { $$ = "inner"; }
...@@ -5747,7 +5752,6 @@ ColLabel: ColId { $$ = $1; } ...@@ -5747,7 +5752,6 @@ ColLabel: ColId { $$ = $1; }
| JOIN { $$ = "join"; } | JOIN { $$ = "join"; }
| LEADING { $$ = "leading"; } | LEADING { $$ = "leading"; }
| LEFT { $$ = "left"; } | LEFT { $$ = "left"; }
| LIKE { $$ = "like"; }
| LISTEN { $$ = "listen"; } | LISTEN { $$ = "listen"; }
| LOAD { $$ = "load"; } | LOAD { $$ = "load"; }
| LOCAL { $$ = "local"; } | LOCAL { $$ = "local"; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment