src/utils/raSqlQuery/rqlParse.c 1.8

Index: src/utils/raSqlQuery/rqlParse.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/utils/raSqlQuery/rqlParse.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -B -U 4 -r1.7 -r1.8
--- src/utils/raSqlQuery/rqlParse.c	22 Nov 2009 03:38:59 -0000	1.7
+++ src/utils/raSqlQuery/rqlParse.c	22 Nov 2009 05:28:52 -0000	1.8
@@ -492,9 +492,9 @@
    char *tok = tokenizerNext(tkz);
    if (tok == NULL)
        break;
    char c = *tok;
-   if (c == '?' || c == '*' || isalpha(c) || c == '_')
+   if (c == '?' || c == '*' || isalpha(c) || c == '_' || c == '/' || c == '.')
        {
        if (firstTime)
 	   dyStringAppend(buf, tok);
        else
@@ -588,16 +588,20 @@
     if (sameString(from, "from"))
         {
 	for (;;)
 	    {
-	    char *table = tokenizerNext(tkz);
+	    struct dyString *buf = dyStringNew(0);
+	    char *table = rqlParseFieldSpec(tkz, buf);
 	    slNameAddTail(&rql->tableList, table);
 	    char *comma = tokenizerNext(tkz);
+	    if (comma == NULL)
+	        break;
 	    if (comma[0] != ',')
 	        {
 		tokenizerReuse(tkz);
 		break;
 		}
+	    dyStringFree(&buf);
 	    }
 	}
     else
         tokenizerReuse(tkz);