changeset 2093:c647f113ba3e

New antiquote syntax for ORDER BY
author Adam Chlipala <adam@chlipala.net>
date Tue, 23 Dec 2014 12:24:38 -0500
parents d4eb9b6729f8
children 0d898b086bbe
files doc/manual.tex src/urweb.grm
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/doc/manual.tex	Tue Dec 23 11:23:27 2014 -0500
+++ b/doc/manual.tex	Tue Dec 23 12:24:38 2014 -0500
@@ -2263,7 +2263,7 @@
   \textrm{Pre-queries} & q &::=& \mt{SELECT} \; [\mt{DISTINCT}] \; P \; \mt{FROM} \; F,^+ \; [\mt{WHERE} \; E] \; [\mt{GROUP} \; \mt{BY} \; p,^+] \; [\mt{HAVING} \; E] \\
   &&& \mid q \; R \; q \mid \{\{\{e\}\}\} \\
   \textrm{Relational operators} & R &::=& \mt{UNION} \mid \mt{INTERSECT} \mid \mt{EXCEPT} \\
-  \textrm{$\mt{ORDER \; BY}$ items} & O &::=& \mt{RANDOM} [()] \mid \hat{E} \; [o] \mid \hat{E} \; [o], O
+  \textrm{$\mt{ORDER \; BY}$ items} & O &::=& \mt{RANDOM} [()] \mid \hat{E} \; [o] \mid \hat{E} \; [o], O \mid \{\{\{e\}\}\}
 \end{array}$$
 
 $$\begin{array}{rrcll}
--- a/src/urweb.grm	Tue Dec 23 11:23:27 2014 -0500
+++ b/src/urweb.grm	Tue Dec 23 12:24:38 2014 -0500
@@ -2235,6 +2235,7 @@
                                                 (CWild (KRecord (KType, dummy), dummy), dummy)),
                                          dummy)
        | ORDER BY obexps                (obexps)
+       | ORDER BY LBRACE LBRACE LBRACE eexp RBRACE RBRACE RBRACE (eexp)
 
 obitem : sqlexp diropt                  (sqlexp, diropt)