From 3340943f5e9d17653b38e35bab359376459c6aa2 Mon Sep 17 00:00:00 2001
From: kennyboy55 <kennyboy@live.nl>
Date: Tue, 11 Apr 2017 11:46:23 +0200
Subject: [PATCH] Enable multiple statements

---
 mean-app/server/db.js            | 3 ++-
 mean-app/server/routes/webapi.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mean-app/server/db.js b/mean-app/server/db.js
index 2098ac2..b6bba90 100644
--- a/mean-app/server/db.js
+++ b/mean-app/server/db.js
@@ -4,7 +4,8 @@ var connection = mysql.createConnection({
   user     : 'root',
   password : 'asdf1239',
   database : 'smarthome',
-  timezone : 'utc'
+  timezone : 'utc',
+  multipleStatements: true
 });
 
 connection.connect(function(err) {
diff --git a/mean-app/server/routes/webapi.js b/mean-app/server/routes/webapi.js
index 2570975..5ce176b 100644
--- a/mean-app/server/routes/webapi.js
+++ b/mean-app/server/routes/webapi.js
@@ -158,7 +158,7 @@ router.get('/data/:device/group/:group', function(req, res) {
   }
 
   connection.query(
-    'SET @i:= 0; SELECT MIN(grp.`time`) AS t, AVG(grp.`HOV`) AS HOV, AVG(grp.`HTV`) AS HTV FROM (SELECT @i:=@i+1 AS `rownum`, FLOOR(@i/?) AS `datagrp`, `time`, `HOV`, `HTV` FROM `measurement` WHERE `device` = ? ORDER BY `time` DESC ) grp GROUP BY `datagrp`', [groupdiv, devid],
+    'SET @i:= 0; SELECT MIN(grp.`time`) AS time, AVG(grp.`HOV`) AS HOV, AVG(grp.`HTV`) AS HTV FROM (SELECT @i:=@i+1 AS `rownum`, FLOOR(@i/?) AS `datagrp`, `time`, `HOV`, `HTV` FROM `measurement` WHERE `device` = ? ORDER BY `time` DESC ) grp GROUP BY `datagrp`;', [groupdiv, devid],
                      function (error, results, fields) {
    if (error) throw error;