Merge remote-tracking branch 'origin/main'

Author: ppoudyal-viant

lex.go

@@ -69,6 +69,7 @@ const (
 	dropIndexToken
 	deleteCode
 	withKeyword
+	recursiveKeyword
 	unionKeyword
 	globalKeyword
 	registerKeyword
@@ -133,7 +134,7 @@ var insertIntoKeywordMatcher = parsly.NewToken(insertIntoKeyword, "INSERT INTO",
 
 var insertValesKeywordMatcher = parsly.NewToken(insertValuesKeyword, "VALUES", matcher.NewKeyword("values", &option.Case{}))
 
-var binaryOperatorMatcher = parsly.NewToken(binaryOperator, "binary OPERATOR", matcher.NewSpacedSet([]string{"+", "!=", ">=", "<=", "=", "-", ">", "<", "*", "/", "in", "not in", "is not", "is", "like"}, &option.Case{}))
+var binaryOperatorMatcher = parsly.NewToken(binaryOperator, "binary OPERATOR", matcher.NewSpacedSet([]string{"+", "!=", "<>", ">=", "<=", "=", "-", ">", "<", "*", "/", "in", "not in", "is not", "is", "like"}, &option.Case{}))
 var assignOperatorMatcher = parsly.NewToken(assignOperator, "assign OPERATOR", matcher.NewSpacedSet([]string{"="}, &option.Case{}))
 
 var logicalOperatorMatcher = parsly.NewToken(logicalOperator, "AND|OR", matcher.NewSet([]string{"and", "or"}, &option.Case{}))
@@ -156,6 +157,7 @@ var placeholderMatcher = parsly.NewToken(placeholderTokenCode, "SELECTOR", smatc
 var literalMatcher = parsly.NewToken(literalCode, "LITERAL", matcher.NewNop())
 
 var withKeywordMatcher = parsly.NewToken(withKeyword, "WITH", matcher.NewKeyword("with", &option.Case{}))
+var recursiveKeywordMatcher = parsly.NewToken(recursiveKeyword, "RECURSIVE", matcher.NewKeyword("recursive", &option.Case{}))
 var unionMatcher = parsly.NewToken(unionKeyword, "UNION|UNION ALL", matcher.NewSpacedSet([]string{
 	"union all",
 	"union",

query.go

@@ -49,10 +49,20 @@ beginMatch:
 		if len(dest.WithSelects) > 0 {
 			return cursor.NewError(asKeywordMatcher, selectorMatcher)
 		}
+		allowRecursive := true
 	With:
 		withSelect := &query.WithSelect{X: &query.Select{}}
 		dest.WithSelects = append(dest.WithSelects, withSelect)
-		match = cursor.MatchAfterOptional(whitespaceMatcher, identifierMatcher)
+		if allowRecursive {
+			match = cursor.MatchAfterOptional(whitespaceMatcher, recursiveKeywordMatcher, identifierMatcher)
+			if match.Code == recursiveKeyword {
+				dest.WithRecursive = true
+				match = cursor.MatchAfterOptional(whitespaceMatcher, identifierMatcher)
+			}
+			allowRecursive = false
+		} else {
+			match = cursor.MatchAfterOptional(whitespaceMatcher, identifierMatcher)
+		}
 		if match.Code != identifierCode {
 			return cursor.NewError(identifierMatcher)
 		}

query/select.go

@@ -7,19 +7,20 @@ import (
 type (
 	//Select represent a select
 	Select struct {
-		List        List
-		From        From
-		Joins       []*Join
-		Qualify     *expr.Qualify
-		GroupBy     List
-		Having      *expr.Qualify
-		OrderBy     List
-		Window      *expr.Raw
-		Limit       *expr.Literal
-		Offset      *expr.Literal
-		Kind        string
-		Union       *Union
-		WithSelects WithSelects
+		List          List
+		From          From
+		Joins         []*Join
+		Qualify       *expr.Qualify
+		GroupBy       List
+		Having        *expr.Qualify
+		OrderBy       List
+		Window        *expr.Raw
+		Limit         *expr.Literal
+		Offset        *expr.Literal
+		Kind          string
+		Union         *Union
+		WithRecursive bool
+		WithSelects   WithSelects
 	}
 
 	//WithSelects represents with selects

query_test.go

@@ -72,6 +72,16 @@ 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 recursive syntax",
+				SQL:         `WITH RECURSIVE sub AS (SELECT 1 AS id FROM DUAL UNION ALL SELECT id + 1 AS id FROM sub WHERE id < 5) SELECT t.id FROM sub t WHERE 1=1`,
+				expect:      `WITH RECURSIVE sub AS (SELECT 1 AS id FROM DUAL UNION ALL SELECT id + 1 AS id FROM sub WHERE id < 5) SELECT t.id FROM sub t WHERE 1 = 1`,
+			},
+			{
+				description: "with recursive multi-cte",
+				SQL:         `WITH RECURSIVE sub AS (SELECT t.ID, t.PARENT_ID, t.NAME, t.ID AS LEVEL_ID FROM CI_TAXONOMY t UNION ALL SELECT c.ID, c.PARENT_ID, c.NAME, sub.LEVEL_ID FROM CI_TAXONOMY c JOIN sub ON c.PARENT_ID = sub.ID), level AS (SELECT t.ID, t.PROVIDER_ID, t.PARENT_ID, t.NAME, t.PROVIDER_KEY, t.DESCRIPTION, t.PROVIDER_FEE_ID, t.ADVERTISER_ID, t.CREATED, t.UPDATED, t.TARGETABLE, t.STATUS FROM CI_TAXONOMY t JOIN (SELECT DISTINCT LEVEL_ID FROM sub WHERE LOWER(sub.NAME) LIKE CONCAT('%', LOWER($Name), '%')) hit ON hit.LEVEL_ID = t.ID), parents AS (SELECT l.ID AS NODE_ID, p.ID AS CUR_ID, p.PARENT_ID AS NEXT_ID, p.NAME AS NAME, 1 AS DEPTH FROM level l JOIN CI_TAXONOMY p ON p.ID = l.PARENT_ID WHERE l.PARENT_ID IS NOT NULL AND l.PARENT_ID <> 0 UNION ALL SELECT parents.NODE_ID, p.ID AS CUR_ID, p.PARENT_ID AS NEXT_ID, p.NAME AS NAME, parents.DEPTH + 1 AS DEPTH FROM parents JOIN CI_TAXONOMY p ON p.ID = parents.NEXT_ID WHERE parents.NEXT_ID IS NOT NULL AND parents.NEXT_ID <> 0), parent_paths AS (SELECT NODE_ID, JSON_ARRAYAGG(NAME ORDER BY DEPTH ASC) AS PARENT_PATH FROM parents GROUP BY NODE_ID) SELECT l.ID, l.PROVIDER_ID, l.PARENT_ID, l.NAME, l.PROVIDER_KEY, l.DESCRIPTION, l.PROVIDER_FEE_ID, l.ADVERTISER_ID, l.CREATED, l.UPDATED, l.TARGETABLE, l.STATUS, (CASE l.Status WHEN 0 THEN 'Inactive' WHEN 1 THEN 'Active' WHEN 2 THEN 'Archived' ELSE '' END) AS STATUS_NAME, COALESCE(pp.PARENT_PATH, JSON_ARRAY()) AS PARENT_PATH, '' AS PROVIDER_THIRD_PARTY FROM level l LEFT JOIN parent_paths pp ON pp.NODE_ID = l.ID`,
+				expect:      `WITH RECURSIVE sub AS (SELECT t.ID, t.PARENT_ID, t.NAME, t.ID AS LEVEL_ID FROM CI_TAXONOMY t UNION ALL SELECT c.ID, c.PARENT_ID, c.NAME, sub.LEVEL_ID FROM CI_TAXONOMY c JOIN sub ON c.PARENT_ID = sub.ID), level AS (SELECT t.ID, t.PROVIDER_ID, t.PARENT_ID, t.NAME, t.PROVIDER_KEY, t.DESCRIPTION, t.PROVIDER_FEE_ID, t.ADVERTISER_ID, t.CREATED, t.UPDATED, t.TARGETABLE, t.STATUS FROM CI_TAXONOMY t JOIN (SELECT DISTINCT LEVEL_ID FROM sub WHERE LOWER(sub.NAME) LIKE CONCAT('%', LOWER($Name), '%')) hit ON hit.LEVEL_ID = t.ID), parents AS (SELECT l.ID AS NODE_ID, p.ID AS CUR_ID, p.PARENT_ID AS NEXT_ID, p.NAME AS NAME, 1 AS DEPTH FROM level l JOIN CI_TAXONOMY p ON p.ID = l.PARENT_ID WHERE l.PARENT_ID IS NOT NULL AND l.PARENT_ID <> 0 UNION ALL SELECT parents.NODE_ID, p.ID AS CUR_ID, p.PARENT_ID AS NEXT_ID, p.NAME AS NAME, parents.DEPTH + 1 AS DEPTH FROM parents JOIN CI_TAXONOMY p ON p.ID = parents.NEXT_ID WHERE parents.NEXT_ID IS NOT NULL AND parents.NEXT_ID <> 0), parent_paths AS (SELECT NODE_ID, JSON_ARRAYAGG(NAME ORDER BY DEPTH ASC) AS PARENT_PATH FROM parents GROUP BY NODE_ID) SELECT l.ID, l.PROVIDER_ID, l.PARENT_ID, l.NAME, l.PROVIDER_KEY, l.DESCRIPTION, l.PROVIDER_FEE_ID, l.ADVERTISER_ID, l.CREATED, l.UPDATED, l.TARGETABLE, l.STATUS, (CASE l.Status WHEN 0 THEN 'Inactive' WHEN 1 THEN 'Active' WHEN 2 THEN 'Archived' ELSE '' END) AS STATUS_NAME, COALESCE(pp.PARENT_PATH, JSON_ARRAY()) AS PARENT_PATH, '' AS PROVIDER_THIRD_PARTY FROM level l LEFT JOIN parent_paths pp ON pp.NODE_ID = l.ID`,
+			},
 			{
 				description: "with join alias",
 				SQL: `WITH audiences AS (SELECT 1 AS id)

stringify.go

@@ -32,7 +32,11 @@ func stringify(n node.Node, builder *bytes.Buffer) {
 		builder.WriteString(actual)
 	case *query.Select:
 		if len(actual.WithSelects) > 0 {
-			builder.WriteString("WITH ")
+			if actual.WithRecursive {
+				builder.WriteString("WITH RECURSIVE ")
+			} else {
+				builder.WriteString("WITH ")
+			}
 			for i, withSel := range actual.WithSelects {
 				if i > 0 {
 					builder.WriteString(", ")