src/utils/raSqlQuery/rqlParse.c 1.6

1.6 2009/11/22 02:54:37 kent
Parsing out (and ignoring) optional from clause.
Index: src/utils/raSqlQuery/rqlParse.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/utils/raSqlQuery/rqlParse.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -B -U 4 -r1.5 -r1.6
--- src/utils/raSqlQuery/rqlParse.c	22 Nov 2009 02:45:33 -0000	1.5
+++ src/utils/raSqlQuery/rqlParse.c	22 Nov 2009 02:54:37 -0000	1.6
@@ -578,8 +578,28 @@
     }
 else
     errAbort("Unknown RQL command '%s line %d of %s\n", rql->command, lf->lineIx, lf->fileName);
     
+char *from = tokenizerNext(tkz);
+if (from != NULL)
+    {
+    if (sameString(from, "from"))
+        {
+	for (;;)
+	    {
+	    char *table = tokenizerNext(tkz);
+	    slNameAddTail(&rql->tableList, table);
+	    char *comma = tokenizerNext(tkz);
+	    if (comma[0] != ',')
+	        {
+		tokenizerReuse(tkz);
+		break;
+		}
+	    }
+	}
+    else
+        tokenizerReuse(tkz);
+    }
 char *where = tokenizerNext(tkz);
 if (where != NULL)
     {
     if (!sameString(where, "where"))