[tor-commits] [metrics-web/master] The order is SELECT-FROM-WHERE...

[karsten at torproject.org]

commit 1bf662cbf57dc65e5730f9bbf1624141babdf4ee
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Fri Aug 3 14:49:43 2012 +0200

    The order is SELECT-FROM-WHERE...
---
 rserve/csv.R |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rserve/csv.R b/rserve/csv.R
index 57f728d..280d7b6 100644
--- a/rserve/csv.R
+++ b/rserve/csv.R
@@ -284,8 +284,8 @@ export_connbidirect <- function(path) {
   con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db)
   q <- paste("SELECT DATE(statsend) AS date, source, belownum AS below,",
       "readnum AS read, writenum AS write, bothnum AS \"both\"",
-      "WHERE DATE(statsend) < current_date - 1",
-      "FROM connbidirect ORDER BY 1, 2")
+      "FROM connbidirect WHERE DATE(statsend) < current_date - 1",
+      "ORDER BY 1, 2")
   rs <- dbSendQuery(con, q)
   c <- fetch(rs, n = -1)
   dbDisconnect(con)