8000 Merge quoted_identifier in identifier · JavaScriptor/js-sql-parser@cf6db04 · GitHub
[go: up one dir, main page]

Skip to content

Commit cf6db04

Browse files
committed
Merge quoted_identifier in identifier
1 parent b32a6cc commit cf6db04

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

src/sqlParser.jison

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ UNION return 'UNION'
126126

127127
[a-zA-Z_\u4e00-\u9fa5][a-zA-Z0-9_\u4e00-\u9fa5]* return 'IDENTIFIER'
128128
\. return 'DOT'
129-
['"][a-zA-Z_\u4e00-\u9fa5][a-zA-Z0-9_\u4e00-\u9fa5]*["'] return 'QUOTED_IDENTIFIER'
130-
([`])(?:(?=(\\?))\2.)*?\1 return 'QUOTED_IDENTIFIER'
129+
['"][a-zA-Z_\u4e00-\u9fa5][a-zA-Z0-9_\u4e00-\u9fa5]*["'] return 'IDENTIFIER'
130+
([`])(?:(?=(\\?))\2.)*?\1 return 'IDENTIFIER'
131131

132132
<<EOF>> return 'EOF'
133133
. return 'INVALID'
@@ -280,8 +280,6 @@ selectExprAliasOpt
280280
: { $$ = {alias: null, hasAs: null} }
281281
| AS IDENTIFIER { $$ = {alias: $2, hasAs: true} }
282282
| IDENTIFIER { $$ = {alias: $1, hasAs: false} }
283-
| AS QUOTED_IDENTIFIER { $$ = {alias: $2, hasAs: true} }
284-
| QUOTED_IDENTIFIER { $$ = {alias: $1, hasAs: false} }
285283
| AS STRING { $$ = {alias: $2, hasAs: true} }
286284
| STRING { $$ = {alias: $2, hasAs: false} }
287285
;
@@ -328,14 +326,6 @@ identifier_list
328326
: identifier { $$ = { type: 'IdentifierList', value: [ $1 ] } }
329327
| identifier_list ',' identifier { $$ = $1; $1.value.push($3); }
330328
;
331-
quoted_identifier
332-
: QUOTED_IDENTIFIER { $$ = { type: 'Identifier', value: $1 } }
333-
| quoted_identifier DOT QUOTED_IDENTIFIER { $$ = $1; $1.value += '.' + $3 }
334-
;
335-
quoted_identifier_list
336-
: quoted_identifier { $$ = { type: 'IdentifierList', value: [ $1 ] } }
337-
| quoted_identifier_list ',' quoted_identifier { $$ = $1; $1.value.push($3); }
338-
;
339329
case_expr_opt
340330
: { $$ = null }
341331
| expr { $$ = $1 }
@@ -361,7 +351,6 @@ simple_expr_prefix
361351
simple_expr
362352
: literal { $$ = $1 }
363353
| identifier { $$ = $1 }
364-
| quoted_identifier { $$ = $1 }
365354
| function_call { $$ = $1 }
366355
| simple_expr_prefix { $$ = $1 }
367356
| '(' expr_list ')' { $$ = { type: 'SimpleExprParentheses', value: $2 } }

0 commit comments

Comments
 (0)
0