edgeql: Keyword cleanup and constraint relaxation.
@@ -16,9 +16,9 @@ edgeql_keywords = {
"aggregate": ("AGGREGATE", UNRESERVED_KEYWORD),
"all": ("ALL", RESERVED_KEYWORD),
"alter": ("ALTER", RESERVED_KEYWORD),
- "and": ("AND", RESERVED_KEYWORD),
+ "and": ("AND", UNRESERVED_KEYWORD),
"any": ("ANY", RESERVED_KEYWORD),
- "as": ("AS", RESERVED_KEYWORD),
+ "as": ("AS", UNRESERVED_KEYWORD),
"asc": ("ASC", RESERVED_KEYWORD),
"atom": ("ATOM", UNRESERVED_KEYWORD),
"attribute": ("ATTRIBUTE", UNRESERVED_KEYWORD),
@@ -34,11 +34,10 @@ edgeql_keywords = {
"drop": ("DROP", RESERVED_KEYWORD),
"else": ("ELSE", UNRESERVED_KEYWORD),
"empty": ("EMPTY", RESERVED_KEYWORD),
- "except": ("EXCEPT", RESERVED_KEYWORD),
+ "except": ("EXCEPT", UNRESERVED_KEYWORD),
"exists": ("EXISTS", RESERVED_KEYWORD),
"event": ("EVENT", UNRESERVED_KEYWORD),
"false": ("FALSE", RESERVED_KEYWORD),
- "filter": ("FILTER", UNRESERVED_KEYWORD),
"final": ("FINAL", UNRESERVED_KEYWORD),
"first": ("FIRST", UNRESERVED_KEYWORD),
"for": ("FOR", UNRESERVED_KEYWORD),
@@ -49,29 +48,24 @@ edgeql_keywords = {
"having": ("HAVING", RESERVED_KEYWORD),
"if": ("IF", UNRESERVED_KEYWORD),
"ilike": ("ILIKE", UNRESERVED_KEYWORD),
- "in": ("IN", RESERVED_KEYWORD),
+ "in": ("IN", UNRESERVED_KEYWORD),
"index": ("INDEX", UNRESERVED_KEYWORD),
"inherit": ("INHERIT", UNRESERVED_KEYWORD),
"inheriting": ("INHERITING", UNRESERVED_KEYWORD),
- "inout": ("INOUT", UNRESERVED_KEYWORD),
"insert": ("INSERT", RESERVED_KEYWORD),
- "intersect": ("INTERSECT", RESERVED_KEYWORD),
+ "intersect": ("INTERSECT", UNRESERVED_KEYWORD),
"is": ("IS", UNRESERVED_KEYWORD),
"last": ("LAST", UNRESERVED_KEYWORD),
"like": ("LIKE", UNRESERVED_KEYWORD),
"limit": ("LIMIT", RESERVED_KEYWORD),
"link": ("LINK", UNRESERVED_KEYWORD),
"migration": ("MIGRATION", UNRESERVED_KEYWORD),
- "mod": ("MOD", RESERVED_KEYWORD),
"module": ("MODULE", UNRESERVED_KEYWORD),
- "no": ("NO", UNRESERVED_KEYWORD),
"not": ("NOT", RESERVED_KEYWORD),
- "of": ("OF", UNRESERVED_KEYWORD),
"offset": ("OFFSET", RESERVED_KEYWORD),
"operator": ("OPERATOR", UNRESERVED_KEYWORD),
- "or": ("OR", RESERVED_KEYWORD),
+ "or": ("OR", UNRESERVED_KEYWORD),
"order": ("ORDER", RESERVED_KEYWORD),
- "out": ("OUT", UNRESERVED_KEYWORD),
"over": ("OVER", RESERVED_KEYWORD),
"partition": ("PARTITION", RESERVED_KEYWORD),
"policy": ("POLICY", RESERVED_KEYWORD),
