Merge branch 'develop'

Author: omershelef

src/main/java/org/durid/sql/ast/statement/SQLExprTableSource.java

@@ -34,6 +34,10 @@ public SQLExprTableSource(SQLExpr expr){
 		this.tablename = expr.toString().replace(" ", "");
     }
 
+	public SQLExprTableSource(String tablename){
+		this.tablename = tablename;
+	}
+
     public SQLExpr getExpr() {
         return this.expr;
     }

src/main/java/org/durid/sql/parser/Lexer.java

@@ -67,10 +67,26 @@ public class Lexer {
 
     private int           varIndex     = -1;
 
+
     public Lexer(String input){
         this(input, true);
     }
 
+
+	public Lexer(String input, boolean skipComment){
+		this.skipComment = skipComment;
+
+		this.text = input;
+		this.pos = -1;
+
+		scanChar();
+	}
+
+
+	public Lexer(char[] input, int inputLength, boolean skipComment){
+		this(new String(input, 0, inputLength), skipComment);
+	}
+
     public final char charAt(int index) {
         if (index >= text.length()) {
             return EOI;
@@ -145,19 +161,6 @@ public void reset() {
         this.token = savePoint.token;
     }
 
-    public Lexer(String input, boolean skipComment){
-        this.skipComment = skipComment;
-
-        this.text = input;
-        this.pos = -1;
-
-        scanChar();
-    }
-
-    public Lexer(char[] input, int inputLength, boolean skipComment){
-        this(new String(input, 0, inputLength), skipComment);
-    }
-
     protected final void scanChar() {
         ch = charAt(++pos);
     }
@@ -375,6 +378,42 @@ public final void nextToken() {
 
     }
 
+
+	/**
+	 * Scan all values until first whitespace, spaces near ',' are ignored,
+	 * so values like 'hello , world' will capture as one token.
+	 * @return all names as string.
+	 */
+	public String scanNames() {
+		String restOfText = text.substring(pos);
+		String[] splittedText = restOfText.split(",");
+
+		StringBuilder names = new StringBuilder();
+		for (String textPart : splittedText) {
+			String trimmedTextPart = textPart.trim();
+
+			// is last part?
+			if(trimmedTextPart.contains(" ")) {
+				int whitespaceIndex = trimmedTextPart.indexOf(" ");
+				if(whitespaceIndex != -1) {
+					trimmedTextPart = trimmedTextPart.substring(0, whitespaceIndex);
+				}
+				names.append(trimmedTextPart);
+				while(isWhitespace(charAt(pos))) {
+					scanChar();
+				}
+				pos += whitespaceIndex + 1;
+				break;
+			}
+
+			names.append(trimmedTextPart + ",");
+			pos += textPart.length() + 1;
+		}
+
+		ch = charAt(pos);
+		return names.toString();
+	}
+
     private final void scanOperator() {
         switch (ch) {
             case '+':

src/main/java/org/durid/sql/parser/SQLSelectParser.java

@@ -212,9 +212,9 @@ public void parseFrom(SQLSelectQueryBlock queryBlock) {
             return;
         }
 
-        lexer.nextToken();
-
-        queryBlock.setFrom(parseTableSource());
+		SQLTableSource source = new SQLExprTableSource(lexer.scanNames());
+        queryBlock.setFrom(source);
+		lexer.nextToken();
     }
 
     public SQLTableSource parseTableSource() {

src/test/java/org/nlpcn/es4sql/MainTestSuite.java

@@ -52,6 +52,7 @@ public static void setUp() throws Exception {
 		loadBulk("src/test/resources/phrases.json");
 		loadBulk("src/test/resources/online.json");
 
+
 		searchDao = new SearchDao(client);
 		System.out.println("Finished the setup process...");
 	}

src/test/java/org/nlpcn/es4sql/QueryTest.java

@@ -35,6 +35,12 @@ public void multipleFromTest() throws IOException, SqlParseException, SQLFeature
 		Assert.assertEquals(1004, response.getTotalHits());
 	}
 
+	@Test
+	public void indexWithWildcardTest() throws IOException, SqlParseException, SQLFeatureNotSupportedException{
+		SearchHits response = query("SELECT * FROM elasticsearch-* LIMIT 1000");
+		assertThat(response.getTotalHits(), greaterThan(0L));
+	}
+
 
 	@Test
 	public void selectSpecificFields() throws IOException, SqlParseException, SQLFeatureNotSupportedException {
@@ -67,7 +73,7 @@ public void selectAliases() throws IOException, SqlParseException, SQLFeatureNot
 
 	@Test
 	public void equallityTest() throws SqlParseException, SQLFeatureNotSupportedException {
-		SearchHits response = query(String.format("select * from %s where city = 'Nogal' LIMIT 1000", TEST_INDEX));
+		SearchHits response = query(String.format("select * from %s/account where city = 'Nogal' LIMIT 1000", TEST_INDEX));
 		SearchHit[] hits = response.getHits();
 
 		// assert the results is correct according to accounts.json data.
@@ -80,7 +86,7 @@ public void equallityTest() throws SqlParseException, SQLFeatureNotSupportedExce
 	// in some cases, depends on the analasis, we might want choose better behavior for equallity.
 	@Test
 	public void equallityTest_phrase() throws SqlParseException, SQLFeatureNotSupportedException {
-		SearchHits response = query(String.format("SELECT * FROM %s WHERE phrase = 'quick fox here' LIMIT 1000", TEST_INDEX));
+		SearchHits response = query(String.format("SELECT * FROM %s/phrase WHERE phrase = 'quick fox here' LIMIT 1000", TEST_INDEX));
 		SearchHit[] hits = response.getHits();
 
 		// assert the results is correct according to accounts.json data.
@@ -228,7 +234,7 @@ public void notBetweenTest() throws IOException, SqlParseException, SQLFeatureNo
 
 	@Test
 	public void inTest() throws IOException, SqlParseException, SQLFeatureNotSupportedException{
-		SearchHits response = query(String.format("SELECT age FROM %s WHERE age IN (20, 22) LIMIT 1000", TEST_INDEX));
+		SearchHits response = query(String.format("SELECT age FROM %s/phrase WHERE age IN (20, 22) LIMIT 1000", TEST_INDEX));
 		SearchHit[] hits = response.getHits();
 		for(SearchHit hit : hits) {
 			int age = (int) hit.getSource().get("age");
@@ -239,7 +245,7 @@ public void inTest() throws IOException, SqlParseException, SQLFeatureNotSupport
 
 	@Test
 	public void inTestWithStrings() throws IOException, SqlParseException, SQLFeatureNotSupportedException{
-		SearchHits response = query(String.format("SELECT phrase FROM %s WHERE phrase IN ('quick fox here', 'fox brown') LIMIT 1000", TEST_INDEX));
+		SearchHits response = query(String.format("SELECT phrase FROM %s/phrase WHERE phrase IN ('quick fox here', 'fox brown') LIMIT 1000", TEST_INDEX));
 		SearchHit[] hits = response.getHits();
 		Assert.assertEquals(2, response.getTotalHits());
 		for(SearchHit hit : hits) {