summaryrefslogtreecommitdiff
path: root/src/cjr_print.sml
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2010-02-25 14:55:35 -0500
committerGravatar Adam Chlipala <adamc@hcoop.net>2010-02-25 14:55:35 -0500
commit118054678805f2498b8eac0d4685d6977f4493ae (patch)
tree858682c59acf239f88de1874a1282cbed9e925b7 /src/cjr_print.sml
parentefd10dd6326e15a3841ad0d28ba81bbbadeb304b (diff)
Use COALESCE to hide NULL results of aggregate functions; fix bug with improper ordering of query result columns
Diffstat (limited to 'src/cjr_print.sml')
-rw-r--r--src/cjr_print.sml4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cjr_print.sml b/src/cjr_print.sml
index fae01db1..f0038de6 100644
--- a/src/cjr_print.sml
+++ b/src/cjr_print.sml
@@ -1657,8 +1657,8 @@ fun p_exp' par env (e, loc) =
map (fn (x', t) => ("__uwf_" ^ ident x ^ ".__uwf_" ^ ident x', t)) xts)
tables
- val outputs = exps @ tables
- val outputs = ListMergeSort.sort (fn ((s1, _), (s2, _)) => String.compare (s1, s2) = GREATER) outputs
+ val sort = ListMergeSort.sort (fn ((s1, _), (s2, _)) => String.compare (s1, s2) = GREATER)
+ val outputs = sort exps @ sort tables
val wontLeakStrings = notLeaky env true state
val wontLeakAnything = notLeaky env false state