From: rtrimana Date: Fri, 6 Jan 2017 17:02:26 +0000 (-0800) Subject: Fixing MySQL query parsing bug for IoTRelation; adjusting MySQL queries for new inter... X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=a430f267f987c130bbf28b76d695062084ba093c;p=iot2.git Fixing MySQL query parsing bug for IoTRelation; adjusting MySQL queries for new interfaces; backing up database --- diff --git a/iotjava/iotinstaller/TableRelation.java b/iotjava/iotinstaller/TableRelation.java index 3b8f9ac..f6babbb 100644 --- a/iotjava/iotinstaller/TableRelation.java +++ b/iotjava/iotinstaller/TableRelation.java @@ -207,7 +207,12 @@ public class TableRelation extends TableSet { // Scan WHERE for either IoTSet or IoTRelation if (strScan.equals("WHERE")) { // The next token is definitely the WHERE statement - strScan = scanFile.next(); + strScan = ""; + String strWhere = scanFile.next(); + while (!strWhere.equals(";")) { + strScan = strScan + " " + strWhere; + strWhere = scanFile.next(); + } this.setWhereCondition(strScan); } } diff --git a/localconfig/mysql/alarmSet.config b/localconfig/mysql/alarmSet.config index a321ced..40e745a 100644 --- a/localconfig/mysql/alarmSet.config +++ b/localconfig/mysql/alarmSet.config @@ -1,3 +1,3 @@ SELECT * FROM -Alarm +AlarmSmart ; diff --git a/localconfig/mysql/audioRooms.config b/localconfig/mysql/audioRooms.config index 61a95ee..de84beb 100644 --- a/localconfig/mysql/audioRooms.config +++ b/localconfig/mysql/audioRooms.config @@ -1,5 +1,5 @@ SELECT * FROM -Room +RoomSmart WHERE TYPE='AudioRoom' ; diff --git a/localconfig/mysql/camSet.config b/localconfig/mysql/camSet.config index 939eb25..5798c17 100644 --- a/localconfig/mysql/camSet.config +++ b/localconfig/mysql/camSet.config @@ -1,3 +1,5 @@ SELECT * FROM -Camera +CameraSmart +WHERE +ID='CM1' ; diff --git a/localconfig/mysql/cameraSet.config b/localconfig/mysql/cameraSet.config index 7e16ba1..a061abc 100644 --- a/localconfig/mysql/cameraSet.config +++ b/localconfig/mysql/cameraSet.config @@ -1,5 +1,5 @@ SELECT * FROM -Camera +CameraSmart WHERE ID='CM1' ; diff --git a/localconfig/mysql/cameras.config b/localconfig/mysql/cameras.config index 939eb25..083ca82 100644 --- a/localconfig/mysql/cameras.config +++ b/localconfig/mysql/cameras.config @@ -1,3 +1,3 @@ SELECT * FROM -Camera +CameraSmart ; diff --git a/localconfig/mysql/gpsSet.config b/localconfig/mysql/gpsSet.config index cde5488..1059359 100644 --- a/localconfig/mysql/gpsSet.config +++ b/localconfig/mysql/gpsSet.config @@ -1,3 +1,3 @@ SELECT * FROM -GPSGateway +GPSGatewaySmart ; diff --git a/localconfig/mysql/gwSet.config b/localconfig/mysql/gwSet.config index a506d4c..0dcca8c 100644 --- a/localconfig/mysql/gwSet.config +++ b/localconfig/mysql/gwSet.config @@ -1,3 +1,3 @@ SELECT * FROM -WeatherGateway +WeatherGatewaySmart ; diff --git a/localconfig/mysql/lawnCameraRelation.config b/localconfig/mysql/lawnCameraRelation.config index 137a132..a7c9f33 100644 --- a/localconfig/mysql/lawnCameraRelation.config +++ b/localconfig/mysql/lawnCameraRelation.config @@ -1,6 +1,6 @@ SELECT RELATION FROM FIRST -Lawn +LawnSmart OTHER -Camera +CameraSmart ; diff --git a/localconfig/mysql/lawnMoistureSensorRelation.config b/localconfig/mysql/lawnMoistureSensorRelation.config index 5a72f79..d441f4f 100644 --- a/localconfig/mysql/lawnMoistureSensorRelation.config +++ b/localconfig/mysql/lawnMoistureSensorRelation.config @@ -1,6 +1,6 @@ SELECT RELATION FROM FIRST -Lawn +LawnSmart OTHER -MoistureSensor +MoistureSensorSmart ; diff --git a/localconfig/mysql/lawnSet.config b/localconfig/mysql/lawnSet.config index c507f89..58fb02e 100644 --- a/localconfig/mysql/lawnSet.config +++ b/localconfig/mysql/lawnSet.config @@ -1,3 +1,3 @@ SELECT * FROM -Lawn +LawnSmart ; diff --git a/localconfig/mysql/lawnSprinklerRelation.config b/localconfig/mysql/lawnSprinklerRelation.config index 9be34c7..5da7318 100644 --- a/localconfig/mysql/lawnSprinklerRelation.config +++ b/localconfig/mysql/lawnSprinklerRelation.config @@ -1,8 +1,8 @@ SELECT RELATION FROM FIRST -Lawn +LawnSmart OTHER -Sprinkler +SprinklerSmart WHERE -ID_DESTINATION='SP2' +ID_DESTINATION='SP1' ; diff --git a/localconfig/mysql/mainRoomLightBulbs.config b/localconfig/mysql/mainRoomLightBulbs.config index 11171b0..19bf452 100644 --- a/localconfig/mysql/mainRoomLightBulbs.config +++ b/localconfig/mysql/mainRoomLightBulbs.config @@ -1,3 +1,3 @@ SELECT * FROM -LightBulb +LightBulbSmart ; diff --git a/localconfig/mysql/moistureSensorsSet.config b/localconfig/mysql/moistureSensorsSet.config index ef7d5a7..2ca21e2 100644 --- a/localconfig/mysql/moistureSensorsSet.config +++ b/localconfig/mysql/moistureSensorsSet.config @@ -1,3 +1,3 @@ SELECT * FROM -MoistureSensor +MoistureSensorSmart ; diff --git a/localconfig/mysql/roomCameraRel.config b/localconfig/mysql/roomCameraRel.config index 3297815..231f2cd 100644 --- a/localconfig/mysql/roomCameraRel.config +++ b/localconfig/mysql/roomCameraRel.config @@ -1,6 +1,8 @@ SELECT RELATION FROM FIRST -Room +RoomSmart OTHER -Camera +CameraSmart +WHERE +TYPE_SOURCE LIKE 'LabRoom%' ; diff --git a/localconfig/mysql/roomMainBulbRel.config b/localconfig/mysql/roomMainBulbRel.config index 5f82a4b..1b94d14 100644 --- a/localconfig/mysql/roomMainBulbRel.config +++ b/localconfig/mysql/roomMainBulbRel.config @@ -1,6 +1,8 @@ SELECT RELATION FROM FIRST -Room +RoomSmart OTHER -LightBulb +LightBulbSmart +WHERE +TYPE_SOURCE LIKE 'LabRoom%' ; diff --git a/localconfig/mysql/roomSensorRelation.config b/localconfig/mysql/roomSensorRelation.config index 52a7dce..4ca1794 100644 --- a/localconfig/mysql/roomSensorRelation.config +++ b/localconfig/mysql/roomSensorRelation.config @@ -1,6 +1,6 @@ SELECT RELATION FROM FIRST -Room +RoomSmart OTHER -SmartthingsSensor +SmartthingsSensorSmart ; diff --git a/localconfig/mysql/roomSet.config b/localconfig/mysql/roomSet.config index 6f5dc60..873a333 100644 --- a/localconfig/mysql/roomSet.config +++ b/localconfig/mysql/roomSet.config @@ -1,5 +1,5 @@ SELECT * FROM -Room +RoomSmart WHERE TYPE='HomeRoom' ; diff --git a/localconfig/mysql/roomSpeakerRel.config b/localconfig/mysql/roomSpeakerRel.config index 3f88688..5f40cbd 100644 --- a/localconfig/mysql/roomSpeakerRel.config +++ b/localconfig/mysql/roomSpeakerRel.config @@ -1,6 +1,6 @@ SELECT RELATION FROM FIRST -Room +RoomSmart OTHER -Speaker +SpeakerSmart ; diff --git a/localconfig/mysql/rooms.config b/localconfig/mysql/rooms.config index a085212..0749e75 100644 --- a/localconfig/mysql/rooms.config +++ b/localconfig/mysql/rooms.config @@ -1,5 +1,5 @@ SELECT * FROM -Room +RoomSmart WHERE TYPE='LabRoom' ; diff --git a/localconfig/mysql/smartSensorsSet.config b/localconfig/mysql/smartSensorsSet.config index be13609..68774b6 100644 --- a/localconfig/mysql/smartSensorsSet.config +++ b/localconfig/mysql/smartSensorsSet.config @@ -1,3 +1,3 @@ SELECT * FROM -SmartthingsSensor +SmartthingsSensorSmart ; diff --git a/localconfig/mysql/speakerSet.config b/localconfig/mysql/speakerSet.config index 7ebde92..2a8eacf 100644 --- a/localconfig/mysql/speakerSet.config +++ b/localconfig/mysql/speakerSet.config @@ -1,3 +1,3 @@ SELECT * FROM -Speaker +SpeakerSmart ; diff --git a/others/Mysql/IoTMain.gz b/others/Mysql/IoTMain.gz index 0c9918c..1842ea2 100644 Binary files a/others/Mysql/IoTMain.gz and b/others/Mysql/IoTMain.gz differ