Mercurial > urweb
diff src/monoize.sml @ 2224:5709482a2afd
Merge.
| author | Ziv Scully <ziv@mit.edu> |
|---|---|
| date | Thu, 11 Dec 2014 02:05:41 -0500 |
| parents | 9410959d296f 0d48cfb59b29 |
| children | e10881cd92da |
line wrap: on
line diff
--- a/src/monoize.sml Sat Nov 29 04:34:41 2014 -0500 +++ b/src/monoize.sml Thu Dec 11 02:05:41 2014 -0500 @@ -2003,9 +2003,9 @@ strcat [gf "Rows", (L'.ECase (gf "OrderBy", [((L'.PPrim (Prim.String (Prim.Normal, "")), loc), str ""), - ((L'.PWild, loc), + ((L'.PVar ("orderby", s), loc), strcat [str " ORDER BY ", - gf "OrderBy"])], + (L'.ERel 0, loc)])], {disc = s, result = s}), loc), gf "Limit", gf "Offset"]), loc), fm) @@ -2114,8 +2114,8 @@ [((L'.PPrim (Prim.String (Prim.Normal, #trueString (Settings.currentDbms ()))), loc), str ""), - ((L'.PWild, loc), - strcat [str " WHERE ", gf "Where"])], + ((L'.PVar ("where", s), loc), + strcat [str " WHERE ", (L'.ERel 0, loc)])], {disc = s, result = s}), loc), @@ -2143,8 +2143,8 @@ [((L'.PPrim (Prim.String (Prim.Normal, #trueString (Settings.currentDbms ()))), loc), str ""), - ((L'.PWild, loc), - strcat [str " HAVING ", gf "Having"])], + ((L'.PVar ("having", s), loc), + strcat [str " HAVING ", (L'.ERel 0, loc)])], {disc = s, result = s}), loc) ]), loc),