Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions parser/parser_column.go
Original file line number Diff line number Diff line change
Expand Up @@ -744,12 +744,18 @@ func (p *Parser) parseSelectItem() (*SelectItem, error) {
}

var alias *Ident
if p.tryConsumeKeywords(KeywordAs) {
switch {
case p.tryConsumeKeywords(KeywordAs):
alias, err = p.parseIdent()
if err != nil {
return nil, err
}
} else {
case p.lastTokenKind() == TokenKindKeyword && !p.matchKeyword(KeywordFrom):
alias, err = p.parseIdent()
if err != nil {
return nil, err
}
default:
alias = p.tryParseIdent()
}

Expand Down
28 changes: 0 additions & 28 deletions parser/parser_query.go
Original file line number Diff line number Diff line change
Expand Up @@ -1009,34 +1009,6 @@ func (p *Parser) parseCTEStmt(pos Pos) (*CTEStmt, error) {
}, nil
}

func (p *Parser) tryParseColumnAliases() ([]*Ident, error) {
if !p.matchTokenKind(TokenKindLParen) {
return nil, nil
}
if err := p.expectTokenKind(TokenKindLParen); err != nil {
return nil, err
}

aliasList := make([]*Ident, 0)
for {
ident, err := p.parseIdent()
if err != nil {
return nil, err
}
aliasList = append(aliasList, ident)
if p.matchTokenKind(TokenKindRParen) {
break
}
if err := p.expectTokenKind(TokenKindComma); err != nil {
return nil, err
}
}
if err := p.expectTokenKind(TokenKindRParen); err != nil {
return nil, err
}
return aliasList, nil
}

func (p *Parser) tryParseSampleClause(pos Pos) (*SampleClause, error) {
if !p.matchKeyword(KeywordSample) {
return nil, nil
Expand Down
5 changes: 5 additions & 0 deletions parser/testdata/query/format/select_keyword_alias_no_as.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-- Origin SQL:
SELECT 'Joe' name FROM users

-- Format SQL:
SELECT 'Joe' AS name FROM users;
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
[
{
"SelectPos": 0,
"StatementEnd": 28,
"With": null,
"Top": null,
"HasDistinct": false,
"SelectItems": [
{
"Expr": {
"LiteralPos": 8,
"LiteralEnd": 11,
"Literal": "Joe"
},
"Modifiers": [],
"Alias": {
"Name": "name",
"QuoteType": 1,
"NamePos": 13,
"NameEnd": 17
}
}
],
"From": {
"FromPos": 18,
"Expr": {
"Table": {
"TablePos": 23,
"TableEnd": 28,
"Alias": null,
"Expr": {
"Database": null,
"Table": {
"Name": "users",
"QuoteType": 1,
"NamePos": 23,
"NameEnd": 28
}
},
"HasFinal": false
},
"StatementEnd": 28,
"SampleRatio": null,
"HasFinal": false
}
},
"ArrayJoin": null,
"Window": null,
"Prewhere": null,
"Where": null,
"GroupBy": null,
"WithTotal": false,
"Having": null,
"OrderBy": null,
"LimitBy": null,
"Limit": null,
"Settings": null,
"Format": null,
"UnionAll": null,
"UnionDistinct": null,
"Except": null
}
]
1 change: 1 addition & 0 deletions parser/testdata/query/select_keyword_alias_no_as.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SELECT 'Joe' name FROM users