From: Eugene Crosser <crosser@average.org>
Date: Wed, 23 Dec 2015 15:10:19 +0000 (+0300)
Subject: fix select ordering
X-Git-Url: http://www.average.org/gitweb/?p=pulsecounter.git;a=commitdiff_plain;h=38ec11855134116dff6d9642b73207ca3134fcb2;hp=fcca95634eda4df11fc367c294e34203ad3bc934;ds=sidebyside

fix select ordering
---

diff --git a/web/query.cgi b/web/query.cgi
index 690eb9a..f45c844 100755
--- a/web/query.cgi
+++ b/web/query.cgi
@@ -48,16 +48,14 @@ cgiMain = do
     "select to_seconds(timestamp) as time, value+adj as value from \
        \(select c.timestamp timestamp, c.value value, \
          \(select sum(value) from coldadj a where a.timestamp <= c.timestamp \
-         \) adj from coldcnt c \
-           \where timestamp between ? and ? order by timestamp \
-       \) t;" (slo, shi)
+         \) adj from coldcnt c where timestamp between ? and ? \
+       \) t order by timestamp;" (slo, shi)
   hot <- liftIO $ query conn
     "select to_seconds(timestamp) as time, value+adj as value from \
        \(select c.timestamp timestamp, c.value value, \
          \(select sum(value) from hotadj a where a.timestamp <= c.timestamp \
-         \) adj from hotcnt c \
-           \where timestamp between ? and ? order by timestamp \
-       \) t;" (slo, shi)
+         \) adj from hotcnt c where timestamp between ? and ? \
+       \) t order by timestamp;" (slo, shi)
   [(ccold, chot)] <- liftIO $ query_ conn
     "select lcold+acold as cold, lhot+ahot as hot from \
     \(select value as lcold from coldcnt order by timestamp desc limit 1) cc, \