aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/src/sgml/syntax.sgml12
-rw-r--r--src/backend/parser/gram.y2
2 files changed, 13 insertions, 1 deletions
diff --git a/doc/src/sgml/syntax.sgml b/doc/src/sgml/syntax.sgml
index 37817d06384..4dfbbd08626 100644
--- a/doc/src/sgml/syntax.sgml
+++ b/doc/src/sgml/syntax.sgml
@@ -1066,6 +1066,18 @@ CAST ( '<replaceable>string</replaceable>' AS <replaceable>type</replaceable> )
</row>
<row>
+ <entry><token>COLLATE</token></entry>
+ <entry>left</entry>
+ <entry>collation selection</entry>
+ </row>
+
+ <row>
+ <entry><token>AT</token></entry>
+ <entry>left</entry>
+ <entry><literal>AT TIME ZONE</literal>, <literal>AT LOCAL</literal></entry>
+ </row>
+
+ <row>
<entry><token>^</token></entry>
<entry>left</entry>
<entry>exponentiation</entry>
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index c224df4eccc..8c00b119ec4 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -858,7 +858,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
%left '*' '/' '%'
%left '^'
/* Unary Operators */
-%left AT /* sets precedence for AT TIME ZONE */
+%left AT /* sets precedence for AT TIME ZONE, AT LOCAL */
%left COLLATE
%right UMINUS
%left '[' ']'