CR

Author: disq

parser/ast.go

@@ -5201,7 +5201,7 @@ func (s *SelectQuery) Accept(visitor ASTVisitor) error {
 }
 
 type DistinctOn struct {
-	Exprs         []Expr
+	Idents        []*NestedIdentifier
 	DistinctOnPos Pos
 	DistinctOnEnd Pos
 }
@@ -5217,8 +5217,8 @@ func (s *DistinctOn) End() Pos {
 func (s *DistinctOn) Accept(visitor ASTVisitor) error {
 	visitor.Enter(s)
 	defer visitor.Leave(s)
-	for _, expr := range s.Exprs {
-		if err := expr.Accept(visitor); err != nil {
+	for _, ident := range s.Idents {
+		if err := ident.Accept(visitor); err != nil {
 			return err
 		}
 	}

parser/format.go

@@ -1344,11 +1344,11 @@ func (d *DictionarySourceClause) FormatSQL(formatter *Formatter) {
 
 func (s *DistinctOn) FormatSQL(formatter *Formatter) {
 	formatter.WriteString("ON (")
-	for i, expr := range s.Exprs {
+	for i, ident := range s.Idents {
 		if i > 0 {
 			formatter.WriteString(", ")
 		}
-		formatter.WriteExpr(expr)
+		formatter.WriteExpr(ident)
 	}
 	formatter.WriteByte(')')
 }

parser/parser_query.go

@@ -89,28 +89,28 @@ func (p *Parser) parseDistinctOn(pos Pos) (*DistinctOn, error) {
 		return nil, err
 	}
 
-	expr, err := p.parseExpr(p.Pos())
+	col, err := p.ParseNestedIdentifier(p.Pos())
 	if err != nil {
 		return nil, err
 	}
-	exprs := []Expr{expr}
+	idents := []*NestedIdentifier{col}
 
 	for p.matchTokenKind(TokenKindComma) {
 		_ = p.lexer.consumeToken()
 
-		expr, err = p.parseExpr(p.Pos())
+		col, err = p.ParseNestedIdentifier(p.Pos())
 		if err != nil {
 			return nil, err
 		}
-		exprs = append(exprs, expr)
+		idents = append(idents, col)
 	}
 
 	if err := p.expectTokenKind(TokenKindRParen); err != nil {
 		return nil, err
 	}
 
 	return &DistinctOn{
-		Exprs:         exprs,
+		Idents:        idents,
 		DistinctOnPos: pos,
 		DistinctOnEnd: p.Pos(),
 	}, nil

parser/testdata/query/output/select_with_distinct_on_dotted_columns.sql.golden.json

@@ -6,38 +6,34 @@
     "Top": null,
     "HasDistinct": true,
     "DistinctOn": {
-      "Exprs": [
+      "Idents": [
         {
-          "Fields": [
-            {
-              "Name": "t",
-              "QuoteType": 1,
-              "NamePos": 20,
-              "NameEnd": 21
-            },
-            {
-              "Name": "id",
-              "QuoteType": 1,
-              "NamePos": 22,
-              "NameEnd": 24
-            }
-          ]
+          "Ident": {
+            "Name": "t",
+            "QuoteType": 1,
+            "NamePos": 20,
+            "NameEnd": 21
+          },
+          "DotIdent": {
+            "Name": "id",
+            "QuoteType": 1,
+            "NamePos": 22,
+            "NameEnd": 24
+          }
         },
         {
-          "Fields": [
-            {
-              "Name": "t",
-              "QuoteType": 1,
-              "NamePos": 26,
-              "NameEnd": 27
-            },
-            {
-              "Name": "name",
-              "QuoteType": 1,
-              "NamePos": 28,
-              "NameEnd": 32
-            }
-          ]
+          "Ident": {
+            "Name": "t",
+            "QuoteType": 1,
+            "NamePos": 26,
+            "NameEnd": 27
+          },
+          "DotIdent": {
+            "Name": "name",
+            "QuoteType": 1,
+            "NamePos": 28,
+            "NameEnd": 32
+          }
         }
       ],
       "DistinctOnPos": 16,

parser/testdata/query/output/select_with_distinct_on_keyword.sql.golden.json

@@ -6,18 +6,24 @@
     "Top": null,
     "HasDistinct": true,
     "DistinctOn": {
-      "Exprs": [
+      "Idents": [
         {
-          "Name": "album",
-          "QuoteType": 1,
-          "NamePos": 19,
-          "NameEnd": 24
+          "Ident": {
+            "Name": "album",
+            "QuoteType": 1,
+            "NamePos": 19,
+            "NameEnd": 24
+          },
+          "DotIdent": null
         },
         {
-          "Name": "artist",
-          "QuoteType": 1,
-          "NamePos": 25,
-          "NameEnd": 31
+          "Ident": {
+            "Name": "artist",
+            "QuoteType": 1,
+            "NamePos": 25,
+            "NameEnd": 31
+          },
+          "DotIdent": null
         }
       ],
       "DistinctOnPos": 16,

parser/walk.go

@@ -1503,8 +1503,8 @@ func Walk(node Expr, fn WalkFunc) bool {
 			return false
 		}
 	case *DistinctOn:
-		for _, expr := range n.Exprs {
-			if !Walk(expr, fn) {
+		for _, ident := range n.Idents {
+			if !Walk(ident, fn) {
 				return false
 			}
 		}