From 7dd1ea43a6a2e207e03139a3a569a8f09e85ac23 Mon Sep 17 00:00:00 2001 From: kennyboy55 Date: Tue, 11 Apr 2017 22:45:10 +0200 Subject: [PATCH] Fix queries --- mean-app/server/routes/thingapi.js | 6 +++--- mean-app/server/routes/webapi.js | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mean-app/server/routes/thingapi.js b/mean-app/server/routes/thingapi.js index 7962bce..4e041d9 100644 --- a/mean-app/server/routes/thingapi.js +++ b/mean-app/server/routes/thingapi.js @@ -86,13 +86,13 @@ var parseTelegram = function(data, callback){ connection.query( - 'INSERT INTO measurement (device, TOE1, TOE2, TTE1, TTE2, HT, HOV, HTV, time) VALUES (?, ?, ?, ?, ?, ?, ?, ?, NOW())', [device, toe1, toe2, tte1, tte2, ht, hov, htv], + 'INSERT INTO `measurement` (`device`, `TOE1`, `TOE2`, `TTE1`, `TTE2`, `HT`, `HOV`, `HTV`, `time`) VALUES (?, ?, ?, ?, ?, ?, ?, ?, NOW())', [device, toe1, toe2, tte1, tte2, ht, hov, htv], function (error, results, fields) { if (error) throw error; connection.query( - 'INSERT INTO device (SN, name, API) VALUES (?, "New device", 42)', [device], + 'INSERT INTO `device` (`SN`, `name`, `API`) VALUES (?, "New device", 42)', [device], function (error, results, fields) { callback(); @@ -108,7 +108,7 @@ var parseTelegram = function(data, callback){ router.post('/telegram', function(req, res){ connection.query( - 'INSERT INTO telegram (time, data) VALUES (NOW(), ?)', [req.body.datagram], + 'INSERT INTO `telegram` (`time`, `data`) VALUES (NOW(), ?)', [req.body.datagram], function (error, results, fields) { if (error) throw error; diff --git a/mean-app/server/routes/webapi.js b/mean-app/server/routes/webapi.js index 605e835..35d6452 100644 --- a/mean-app/server/routes/webapi.js +++ b/mean-app/server/routes/webapi.js @@ -12,7 +12,7 @@ router.all('*', function(req, res){ router.get('/device', function(req, res){ connection.query( - 'SELECT SN, name, desc FROM device', + 'SELECT `SN`, `name`, `desc` FROM `device`;', function (error, results, fields) { if (error) throw error; @@ -109,7 +109,7 @@ router.get('/data/:device/:year1-:month1-:day1/:year2-:month2-:day2', function(r let date2 = year2 + "-" + month2 + "-" + day2 + " 23:59:59"; connection.query( - 'SELECT s.* FROM ( SELECT TOE1, TOE2, TTE1, TTE2, HOV, HTV, HT, time FROM measurement WHERE device = ? AND time >= ? AND time <= ? ORDER BY time DESC LIMIT 0,250 ) s ORDER BY s.time ASC', [devid, date1, date2], + 'SELECT s.* FROM ( SELECT `TOE1`, `TOE2`, `TTE1`, `TTE2`, `HOV`, `HTV`, `HT`, `time` FROM `measurement` WHERE `device` = ? AND `time` >= ? AND `time` <= ? ORDER BY `time` DESC LIMIT 0,250 ) s ORDER BY s.time ASC;', [devid, date1, date2], function (error, results, fields) { if (error) throw error; @@ -183,7 +183,7 @@ router.get('/data/:device', function(req, res) { let devid = req.params.device; connection.query( - 'SELECT s.* FROM ( SELECT TOE1, TOE2, TTE1, TTE2, HOV, HTV, HT, time FROM measurement WHERE device = ? ORDER BY time DESC LIMIT 0,250 ) s ORDER BY s.time ASC', [devid], + 'SELECT s.* FROM ( SELECT `TOE1`, `TOE2`, `TTE1`, `TTE2`, `HOV`, `HTV`, `HT`, `time` FROM `measurement` WHERE `device` = ? ORDER BY `time` DESC LIMIT 0,250 ) s ORDER BY s.time ASC;', [devid], function (error, results, fields) { if (error) throw error; @@ -203,7 +203,7 @@ router.get('/usage/:device', function(req, res) { let devid = req.params.device; connection.query( - 'SELECT TOE1, TOE2, TTE1, TTE2, HOV, HTV, HT, tarief1, tarief2 FROM measurement, device WHERE measurement.device = device.SN AND measurement.device = ? ORDER BY time DESC LIMIT 0,1', [devid], + 'SELECT `TOE1`, `TOE2`, `TTE1`, `TTE2`, `HOV`, `HTV`, `HT`, `tarief1`, `tarief2` FROM `measurement`, `device` WHERE measurement.`device` = device.`SN` AND measurement.`device` = ? ORDER BY `time` DESC LIMIT 0,1;', [devid], function (error, results, fields) { if (error) throw error; @@ -223,7 +223,7 @@ router.get('/name/:device', function(req, res) { let devid = req.params.device; connection.query( - 'SELECT name FROM device WHERE SN = ?', [devid], + 'SELECT `name` FROM `device` WHERE `SN` = ?', [devid], function (error, results, fields) { if (error) throw error;