diff options
author | Ziv Scully <ziv@mit.edu> | 2014-12-11 02:05:41 -0500 |
---|---|---|
committer | Ziv Scully <ziv@mit.edu> | 2014-12-11 02:05:41 -0500 |
commit | 7a2739b18042953cdfc608a5d9c96237c97cebba (patch) | |
tree | f9598f40d97e26581e6f9f4cb910f5e335f7b0e1 /src/monoize.sml | |
parent | 219524359a25417b9e140130ab77a9a330c41012 (diff) | |
parent | d47f51e33733c851a53feb308ddaee3924910371 (diff) |
Merge.
Diffstat (limited to 'src/monoize.sml')
-rw-r--r-- | src/monoize.sml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/monoize.sml b/src/monoize.sml index fa69b3af..4034e3ed 100644 --- a/src/monoize.sml +++ b/src/monoize.sml @@ -2003,9 +2003,9 @@ fun monoExp (env, st, fm) (all as (e, loc)) = 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 @@ fun monoExp (env, st, fm) (all as (e, loc)) = [((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 @@ fun monoExp (env, st, fm) (all as (e, loc)) = [((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), |