From 49d542b8953e4603e4c498a25bef4952b2c51a65 Mon Sep 17 00:00:00 2001 From: git-hulk Date: Thu, 10 Sep 2026 17:33:33 +0800 Subject: [PATCH] Fix token error handling in named type parameters parseColumnTypeWithNamedParams still uses tryConsumeTokenKind as a single-value function after the helper changed to return a token and an error. This prevents the merged trunk from compiling. Handle the error before checking whether a comma was consumed, matching the other callers. The existing named-type fixtures exercise parsing. --- parser/parser_column.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/parser/parser_column.go b/parser/parser_column.go index 6fe21b1..c4ae5af 100644 --- a/parser/parser_column.go +++ b/parser/parser_column.go @@ -1506,7 +1506,9 @@ func (p *Parser) parseColumnTypeWithNamedParams(name *Ident, leftParenPos Pos) ( Name: paramName, Value: value, }) - if p.tryConsumeTokenKind(TokenKindComma) == nil { + if token, err := p.tryConsumeTokenKind(TokenKindComma); err != nil { + return nil, err + } else if token == nil { break } }