Fixing MySQL query parsing bug for IoTRelation; adjusting MySQL queries for new inter...

diff --git a/iotjava/iotinstaller/TableRelation.java b/iotjava/iotinstaller/TableRelation.java
index 3b8f9accfa77b5448f7f0d5d7c622218ea060a65..f6babbb67cc54ac617ba1020051f8a2fddf0b297 100644 (file)
--- 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
                                // 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);
                                }
                        }
                                        this.setWhereCondition(strScan);
                                }
                        }

diff --git a/localconfig/mysql/alarmSet.config b/localconfig/mysql/alarmSet.config
index a321ced619ba2b19462c2389799abb12c03057ef..40e745a62cb7c46e722353092b3d62f23d57679e 100644 (file)
--- a/localconfig/mysql/alarmSet.config
+++ b/localconfig/mysql/alarmSet.config
@@ -1,3 +1,3 @@
 SELECT * FROM
 SELECT * FROM

-Alarm
+AlarmSmart

 ;
 ;

diff --git a/localconfig/mysql/audioRooms.config b/localconfig/mysql/audioRooms.config
index 61a95ee1d8fe3a998cb67654ad5d899747b1e29b..de84beb921dfd4a36e791b2443a4cde67fa1968b 100644 (file)
--- a/localconfig/mysql/audioRooms.config
+++ b/localconfig/mysql/audioRooms.config
@@ -1,5 +1,5 @@
 SELECT * FROM
 SELECT * FROM

-Room
+RoomSmart

 WHERE
 TYPE='AudioRoom'
 ;
 WHERE
 TYPE='AudioRoom'
 ;

diff --git a/localconfig/mysql/camSet.config b/localconfig/mysql/camSet.config
index 939eb25920867637736628c41a7338c7dc98bc46..5798c171313152480bc35c4628c6ee76e3206fbd 100644 (file)
--- a/localconfig/mysql/camSet.config
+++ b/localconfig/mysql/camSet.config
@@ -1,3 +1,5 @@
 SELECT * FROM
 SELECT * FROM

-Camera
+CameraSmart
+WHERE
+ID='CM1'

 ;
 ;

diff --git a/localconfig/mysql/cameraSet.config b/localconfig/mysql/cameraSet.config
index 7e16ba1bb869b3f07364ccc7f785af57105ce929..a061abc4313074cabb0c09aaaadaac1fbbadacaa 100644 (file)
--- a/localconfig/mysql/cameraSet.config
+++ b/localconfig/mysql/cameraSet.config
@@ -1,5 +1,5 @@
 SELECT * FROM\r
 SELECT * FROM\r

-Camera\r
+CameraSmart\r

 WHERE\r
 ID='CM1'\r
 ;\r
 WHERE\r
 ID='CM1'\r
 ;\r

diff --git a/localconfig/mysql/cameras.config b/localconfig/mysql/cameras.config
index 939eb25920867637736628c41a7338c7dc98bc46..083ca82d508383ba422b92ece18f86dac7b2b193 100644 (file)
--- a/localconfig/mysql/cameras.config
+++ b/localconfig/mysql/cameras.config
@@ -1,3 +1,3 @@
 SELECT * FROM
 SELECT * FROM

-Camera
+CameraSmart

 ;
 ;

diff --git a/localconfig/mysql/gpsSet.config b/localconfig/mysql/gpsSet.config
index cde5488ab76ef4502c9b5e17e5d7f4199b831253..10593599960c0f603e7bd097e07692def1b1a1b4 100644 (file)
--- a/localconfig/mysql/gpsSet.config
+++ b/localconfig/mysql/gpsSet.config
@@ -1,3 +1,3 @@
 SELECT * FROM\r
 SELECT * FROM\r

-GPSGateway\r
+GPSGatewaySmart\r

 ;\r
 ;\r

diff --git a/localconfig/mysql/gwSet.config b/localconfig/mysql/gwSet.config
index a506d4c8b551f7de8491c5fc6492d7ea4360fdb7..0dcca8cb816a95024638cef19c99f6bfbb8d03e0 100644 (file)
--- a/localconfig/mysql/gwSet.config
+++ b/localconfig/mysql/gwSet.config
@@ -1,3 +1,3 @@
 SELECT * FROM\r
 SELECT * FROM\r

-WeatherGateway\r
+WeatherGatewaySmart\r

 ;\r
 ;\r

diff --git a/localconfig/mysql/lawnCameraRelation.config b/localconfig/mysql/lawnCameraRelation.config
index 137a132f0e662cfb2810fecb35d52c0482c3902b..a7c9f339bbe124016c19f9d7eda1a6d1fc9377d8 100644 (file)
--- a/localconfig/mysql/lawnCameraRelation.config
+++ b/localconfig/mysql/lawnCameraRelation.config
@@ -1,6 +1,6 @@
 SELECT RELATION FROM\r
 FIRST\r
 SELECT RELATION FROM\r
 FIRST\r

-Lawn\r
+LawnSmart\r

 OTHER\r
 OTHER\r

-Camera\r
+CameraSmart\r

 ;\r
 ;\r

diff --git a/localconfig/mysql/lawnMoistureSensorRelation.config b/localconfig/mysql/lawnMoistureSensorRelation.config
index 5a72f7950f342258cf3e973962cb868b165142a3..d441f4f9507806c6b8f592b01a2199f98d0ee796 100644 (file)
--- a/localconfig/mysql/lawnMoistureSensorRelation.config
+++ b/localconfig/mysql/lawnMoistureSensorRelation.config
@@ -1,6 +1,6 @@
 SELECT RELATION FROM\r
 FIRST\r
 SELECT RELATION FROM\r
 FIRST\r

-Lawn\r
+LawnSmart\r

 OTHER\r
 OTHER\r

-MoistureSensor\r
+MoistureSensorSmart\r

 ;\r
 ;\r

diff --git a/localconfig/mysql/lawnSet.config b/localconfig/mysql/lawnSet.config
index c507f89f044e11b9662041d402bdf1a78a282347..58fb02e5d51de0f33b0dfaa1bc11e5ee43b63630 100644 (file)
--- a/localconfig/mysql/lawnSet.config
+++ b/localconfig/mysql/lawnSet.config
@@ -1,3 +1,3 @@
 SELECT * FROM\r
 SELECT * FROM\r

-Lawn\r
+LawnSmart\r

 ;\r
 ;\r

diff --git a/localconfig/mysql/lawnSprinklerRelation.config b/localconfig/mysql/lawnSprinklerRelation.config
index 9be34c7dc993aabb8ee7853aa05fe38fd982a342..5da73187f27bdd50ac7fd3aadbf92c260f912f23 100644 (file)
--- a/localconfig/mysql/lawnSprinklerRelation.config
+++ b/localconfig/mysql/lawnSprinklerRelation.config
@@ -1,8 +1,8 @@
 SELECT RELATION FROM\r
 FIRST\r
 SELECT RELATION FROM\r
 FIRST\r

-Lawn\r
+LawnSmart\r

 OTHER\r
 OTHER\r

-Sprinkler\r
+SprinklerSmart\r

 WHERE\r
 WHERE\r

-ID_DESTINATION='SP2'\r
+ID_DESTINATION='SP1'\r

 ;\r
 ;\r

diff --git a/localconfig/mysql/mainRoomLightBulbs.config b/localconfig/mysql/mainRoomLightBulbs.config
index 11171b07f81b6f0a1a108bdb908347c7bfd9bf4d..19bf4529cff8b18ac1710e3d61d95bc380a7fd21 100644 (file)
--- a/localconfig/mysql/mainRoomLightBulbs.config
+++ b/localconfig/mysql/mainRoomLightBulbs.config
@@ -1,3 +1,3 @@
 SELECT * FROM
 SELECT * FROM

-LightBulb
+LightBulbSmart

 ;
 ;

diff --git a/localconfig/mysql/moistureSensorsSet.config b/localconfig/mysql/moistureSensorsSet.config
index ef7d5a79e0df00debd6be8619c2b16189754d9e8..2ca21e2529b6780eec69439bd3bedab8e0e921db 100644 (file)
--- a/localconfig/mysql/moistureSensorsSet.config
+++ b/localconfig/mysql/moistureSensorsSet.config
@@ -1,3 +1,3 @@
 SELECT * FROM\r
 SELECT * FROM\r

-MoistureSensor\r
+MoistureSensorSmart\r

 ;\r
 ;\r

diff --git a/localconfig/mysql/roomCameraRel.config b/localconfig/mysql/roomCameraRel.config
index 32978153fcfb8aff074b59293882269d9c318757..231f2cd3c5b04b012ea5d3dfb5c8d5f51852d1c4 100644 (file)
--- a/localconfig/mysql/roomCameraRel.config
+++ b/localconfig/mysql/roomCameraRel.config
@@ -1,6 +1,8 @@
 SELECT RELATION FROM
 FIRST
 SELECT RELATION FROM
 FIRST

-Room
+RoomSmart

 OTHER
 OTHER

-Camera
+CameraSmart
+WHERE
+TYPE_SOURCE LIKE 'LabRoom%' 

 ;
 ;

diff --git a/localconfig/mysql/roomMainBulbRel.config b/localconfig/mysql/roomMainBulbRel.config
index 5f82a4b58a9e1ec6201f2a7baa5dc4ad986ce7e3..1b94d1492913ad15e1bccb5ba532f124e0200966 100644 (file)
--- a/localconfig/mysql/roomMainBulbRel.config
+++ b/localconfig/mysql/roomMainBulbRel.config
@@ -1,6 +1,8 @@
 SELECT RELATION FROM
 FIRST
 SELECT RELATION FROM
 FIRST

-Room
+RoomSmart

 OTHER
 OTHER

-LightBulb
+LightBulbSmart
+WHERE
+TYPE_SOURCE LIKE 'LabRoom%' 

 ;
 ;

diff --git a/localconfig/mysql/roomSensorRelation.config b/localconfig/mysql/roomSensorRelation.config
index 52a7dce131518ec4a3cecc8be3244448c80720c9..4ca17948b1d2a5959a247f8284da624bb10b72f3 100644 (file)
--- a/localconfig/mysql/roomSensorRelation.config
+++ b/localconfig/mysql/roomSensorRelation.config
@@ -1,6 +1,6 @@
 SELECT RELATION FROM
 FIRST
 SELECT RELATION FROM
 FIRST

-Room
+RoomSmart

 OTHER
 OTHER

-SmartthingsSensor
+SmartthingsSensorSmart

 ;
 ;

diff --git a/localconfig/mysql/roomSet.config b/localconfig/mysql/roomSet.config
index 6f5dc607b45eb598b92dfdb09892d5277ea5cf73..873a3335779e26a34785342aec79219d1a4a7cdd 100644 (file)
--- a/localconfig/mysql/roomSet.config
+++ b/localconfig/mysql/roomSet.config
@@ -1,5 +1,5 @@
 SELECT * FROM
 SELECT * FROM

-Room
+RoomSmart

 WHERE
 TYPE='HomeRoom'
 ;
 WHERE
 TYPE='HomeRoom'
 ;

diff --git a/localconfig/mysql/roomSpeakerRel.config b/localconfig/mysql/roomSpeakerRel.config
index 3f886888dc92f72680c8efb485612f384fdeef3b..5f40cbd1727f0d1e5528c7d8fb2fd69fe21c4436 100644 (file)
--- a/localconfig/mysql/roomSpeakerRel.config
+++ b/localconfig/mysql/roomSpeakerRel.config
@@ -1,6 +1,6 @@
 SELECT RELATION FROM
 FIRST
 SELECT RELATION FROM
 FIRST

-Room
+RoomSmart

 OTHER
 OTHER

-Speaker
+SpeakerSmart

 ;
 ;

diff --git a/localconfig/mysql/rooms.config b/localconfig/mysql/rooms.config
index a0852123913162a9f122de1829321a9cd95c99bd..0749e7514d83a8f96e46d43680b58934287b8de0 100644 (file)
--- a/localconfig/mysql/rooms.config
+++ b/localconfig/mysql/rooms.config
@@ -1,5 +1,5 @@
 SELECT * FROM
 SELECT * FROM

-Room
+RoomSmart

 WHERE
 TYPE='LabRoom'
 ;
 WHERE
 TYPE='LabRoom'
 ;

diff --git a/localconfig/mysql/smartSensorsSet.config b/localconfig/mysql/smartSensorsSet.config
index be13609376f46cb153047a72a24ef269d739dae6..68774b608c05ed8501227a5b92bdeaf6b5782f6c 100644 (file)
--- a/localconfig/mysql/smartSensorsSet.config
+++ b/localconfig/mysql/smartSensorsSet.config
@@ -1,3 +1,3 @@
 SELECT * FROM
 SELECT * FROM

-SmartthingsSensor
+SmartthingsSensorSmart

 ;
 ;

diff --git a/localconfig/mysql/speakerSet.config b/localconfig/mysql/speakerSet.config
index 7ebde92b4297a139006ab84de4b18029a52d1a2c..2a8eacf7de7cf3a6440b746832195472e809db92 100644 (file)
--- a/localconfig/mysql/speakerSet.config
+++ b/localconfig/mysql/speakerSet.config
@@ -1,3 +1,3 @@
 SELECT * FROM\r
 SELECT * FROM\r

-Speaker\r
+SpeakerSmart\r

 ;\r
 ;\r

diff --git a/others/Mysql/IoTMain.gz b/others/Mysql/IoTMain.gz
index 0c9918cbd035331e598ac8cf61d242efc79c8881..1842ea2bc9b8029af4f6ccb908a16e909c6a3e0c 100644 (file)
Binary files a/others/Mysql/IoTMain.gz and b/others/Mysql/IoTMain.gz differ