X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=iotjava%2Fiotinstaller%2FTableRelation.java;h=57d0d91d3bafff51bc6cd2c4022ca937c6532fc8;hb=7e8c0cabb7057ad561adbb8b6cc2a0fd5c41bbf4;hp=3b8f9accfa77b5448f7f0d5d7c622218ea060a65;hpb=7a27eab091d560ca1222d3a2652da56c97456980;p=iot2.git

diff --git a/iotjava/iotinstaller/TableRelation.java b/iotjava/iotinstaller/TableRelation.java
index 3b8f9ac..57d0d91 100644
--- a/iotjava/iotinstaller/TableRelation.java
+++ b/iotjava/iotinstaller/TableRelation.java
@@ -16,7 +16,7 @@ import iotruntime.master.RuntimeOutput;
  * @version     1.0
  * @since       2016-02-29
  */
-public class TableRelation extends TableSet {
+public final class TableRelation extends TableSet {
 
 	/**
 	 * TableRelation class properties
@@ -97,8 +97,6 @@ public class TableRelation extends TableSet {
 
 			try {
 				String strCommand = "SELECT " + strTableName + ".* "
-														/*+ strOtherTableName + ".*, "
-														 + STR_COMM_TABLE_NAME + ".ACCESS "*/
 														+ "FROM "
 														+ strTableName + ", "
 														+ strOtherTableName + ", "
@@ -143,7 +141,6 @@ public class TableRelation extends TableSet {
 			try {
 				String strCommand = "SELECT "/*+ strTableName + ".*, "*/
 														+ strOtherTableName + ".* "
-														/*+ STR_COMM_TABLE_NAME + ".ACCESS "*/
 														+ "FROM "
 														+ strTableName + ", "
 														+ strOtherTableName + ", "
@@ -207,7 +204,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);
 				}
 			}