With clause support extended,added test cases.

Author: ppoudyal-viant

join.go

@@ -8,7 +8,6 @@ import (
 
 func parseJoin(cursor *parsly.Cursor, join *query.Join, dest *query.Select, expectOn bool) error {
 	match := cursor.MatchAfterOptional(whitespaceMatcher, parenthesesMatcher, exprMatcher, selectorMatcher)
-	var skipAlias bool
 	switch match.Code {
 	case parenthesesCode:
 		join.With = expr.NewRaw(match.Text(cursor))
@@ -18,17 +17,9 @@ func parseJoin(cursor *parsly.Cursor, join *query.Join, dest *query.Select, expe
 		if match.Code == parenthesesCode {
 			identityOrAlias += match.Text(cursor)
 		}
-		withSelect := dest.WithSelects.Select(identityOrAlias)
-		if withSelect != nil {
-			join.With = expr.NewSelector(identityOrAlias)
-			join.Alias = ""
-			skipAlias = true
-		} else {
-			join.With = expr.NewSelector(identityOrAlias)
-			skipAlias = false
-		}
+		join.With = expr.NewSelector(identityOrAlias)
 	}
-	if join.Alias == "" && !skipAlias {
+	if join.Alias == "" {
 		join.Alias = discoverAlias(cursor)
 	}
 	match = cursor.MatchAfterOptional(whitespaceMatcher, commentBlockMatcher, onKeywordMatcher)

query.go

@@ -94,18 +94,15 @@ beginMatch:
 		case fromKeyword:
 			dest.From = query.From{}
 			match = cursor.MatchAfterOptional(whitespaceMatcher, tableMatcher, parenthesesMatcher)
-			var skipAlias bool
 			switch match.Code {
 			case tableTokenCode:
 				identityOrAlias := match.Text(cursor)
 				withSelect := dest.WithSelects.Select(identityOrAlias)
 				if withSelect != nil {
 					dest.From.X = expr.NewSelector(identityOrAlias)
 					dest.From.Alias = ""
-					skipAlias = true
 				} else {
 					dest.From.X = expr.NewSelector(identityOrAlias)
-					skipAlias = false
 				}
 			case parenthesesCode:
 				dest.From.X = expr.NewRaw(match.Text(cursor))
@@ -120,7 +117,7 @@ beginMatch:
 				}
 				rawNode.X = subSelect
 			}
-			if dest.From.Alias == "" && !skipAlias {
+			if dest.From.Alias == "" {
 				dest.From.Alias = discoverAlias(cursor)
 			}
 			match = cursor.MatchAfterOptional(whitespaceMatcher, commentBlockMatcher)

query_test.go

@@ -72,6 +72,12 @@ func TestParseSelect(t *testing.T) {
 				SELECT p.*, v.* FROM p JOIN v ON p.VENDOR_ID = v.ID`,
 				expect: `WITH p AS (SELECT * FROM product), v AS (SELECT * FROM vendor) SELECT p.*, v.* FROM p JOIN v ON p.VENDOR_ID = v.ID`,
 			},
+			{
+				description: "with join alias",
+				SQL: `WITH audiences AS (SELECT 1 AS id)
+  				SELECT ar.id FROM foo f JOIN audiences ar ON ar.id = f.id`,
+				expect: `WITH audiences AS (SELECT 1 AS id) SELECT ar.id FROM foo f JOIN audiences ar ON ar.id = f.id`,
+			},
 
 			{
 				description: "group by",