Skip to content

Commit d564482

Browse files
xteraoxterao
committed
Parser test case fix
1 parent 6972dd9 commit d564482

File tree

1 file changed

+50
-31
lines changed

1 file changed

+50
-31
lines changed

‎src/test/testData/sql/parser/SQLParser.txt‎

Lines changed: 50 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,11 @@ SQL File(0,1275)
4646
PsiWhiteSpace(' ')(259,260)
4747
SqlElMultiplyExprImpl(EL_MULTIPLY_EXPR)(260,291)
4848
SqlElFieldAccessExprImpl(EL_FIELD_ACCESS_EXPR)(260,285)
49-
SqlElPrimaryExprImpl(EL_PRIMARY_EXPR)(260,268)
49+
SqlElIdExprImpl(EL_ID_EXPR)(260,268)
5050
PsiElement(SqlTokenType.EL_IDENTIFIER)('employee')(260,268)
5151
PsiElement(SqlTokenType..)('.')(268,269)
52-
PsiElement(SqlTokenType.EL_IDENTIFIER)('numberOfProjects')(269,285)
52+
SqlElIdExprImpl(EL_ID_EXPR)(269,285)
53+
PsiElement(SqlTokenType.EL_IDENTIFIER)('numberOfProjects')(269,285)
5354
PsiWhiteSpace(' ')(285,286)
5455
PsiElement(SqlTokenType.*)('*')(286,287)
5556
PsiWhiteSpace(' ')(287,289)
@@ -117,10 +118,11 @@ SQL File(0,1275)
117118
PsiElement(SqlTokenType./*)('/*')(485,487)
118119
PsiWhiteSpace(' ')(487,488)
119120
SqlElFieldAccessExprImpl(EL_FIELD_ACCESS_EXPR)(488,499)
120-
SqlElPrimaryExprImpl(EL_PRIMARY_EXPR)(488,492)
121+
SqlElIdExprImpl(EL_ID_EXPR)(488,492)
121122
PsiElement(SqlTokenType.EL_IDENTIFIER)('user')(488,492)
122123
PsiElement(SqlTokenType..)('.')(492,493)
123-
PsiElement(SqlTokenType.EL_IDENTIFIER)('userId')(493,499)
124+
SqlElIdExprImpl(EL_ID_EXPR)(493,499)
125+
PsiElement(SqlTokenType.EL_IDENTIFIER)('userId')(493,499)
124126
PsiWhiteSpace(' ')(499,500)
125127
PsiElement(SqlTokenType.*/)('*/')(500,502)
126128
PsiElement(SqlTokenType.NUMBER)('0')(502,503)
@@ -137,10 +139,11 @@ SQL File(0,1275)
137139
PsiElement(SqlTokenType./*)('/*')(527,529)
138140
PsiWhiteSpace(' ')(529,530)
139141
SqlElFieldAccessExprImpl(EL_FIELD_ACCESS_EXPR)(530,549)
140-
SqlElPrimaryExprImpl(EL_PRIMARY_EXPR)(530,538)
142+
SqlElIdExprImpl(EL_ID_EXPR)(530,538)
141143
PsiElement(SqlTokenType.EL_IDENTIFIER)('employee')(530,538)
142144
PsiElement(SqlTokenType..)('.')(538,539)
143-
PsiElement(SqlTokenType.EL_IDENTIFIER)('employeeId')(539,549)
145+
SqlElIdExprImpl(EL_ID_EXPR)(539,549)
146+
PsiElement(SqlTokenType.EL_IDENTIFIER)('employeeId')(539,549)
144147
PsiWhiteSpace(' ')(549,550)
145148
PsiElement(SqlTokenType.*/)('*/')(550,552)
146149
PsiElement(SqlTokenType.NUMBER)('0')(552,553)
@@ -157,7 +160,7 @@ SQL File(0,1275)
157160
PsiElement(SqlTokenType./*)('/*')(576,578)
158161
PsiWhiteSpace(' ')(578,579)
159162
SqlElAddExprImpl(EL_ADD_EXPR)(579,596)
160-
SqlElPrimaryExprImpl(EL_PRIMARY_EXPR)(579,592)
163+
SqlElIdExprImpl(EL_ID_EXPR)(579,592)
161164
PsiElement(SqlTokenType.EL_IDENTIFIER)('referenceDate')(579,592)
162165
PsiWhiteSpace(' ')(592,593)
163166
PsiElement(SqlTokenType.+)('+')(593,594)
@@ -175,14 +178,16 @@ SQL File(0,1275)
175178
PsiWhiteSpace(' ')(620,621)
176179
SqlElFunctionCallExprImpl(EL_FUNCTION_CALL_EXPR)(621,655)
177180
PsiElement(SqlTokenType.@)('@')(621,622)
178-
PsiElement(SqlTokenType.EL_IDENTIFIER)('isNotBlank')(622,632)
181+
SqlElIdExprImpl(EL_ID_EXPR)(622,632)
182+
PsiElement(SqlTokenType.EL_IDENTIFIER)('isNotBlank')(622,632)
179183
SqlElParametersImpl(EL_PARAMETERS)(632,655)
180184
PsiElement(SqlTokenType.()('(')(632,633)
181185
SqlElFieldAccessExprImpl(EL_FIELD_ACCESS_EXPR)(633,654)
182-
SqlElPrimaryExprImpl(EL_PRIMARY_EXPR)(633,641)
186+
SqlElIdExprImpl(EL_ID_EXPR)(633,641)
183187
PsiElement(SqlTokenType.EL_IDENTIFIER)('employee')(633,641)
184188
PsiElement(SqlTokenType..)('.')(641,642)
185-
PsiElement(SqlTokenType.EL_IDENTIFIER)('departmentId')(642,654)
189+
SqlElIdExprImpl(EL_ID_EXPR)(642,654)
190+
PsiElement(SqlTokenType.EL_IDENTIFIER)('departmentId')(642,654)
186191
PsiElement(SqlTokenType.))(')')(654,655)
187192
PsiWhiteSpace(' ')(655,656)
188193
PsiElement(SqlTokenType.*/)('*/')(656,658)
@@ -193,12 +198,14 @@ SQL File(0,1275)
193198
PsiElement(SqlTokenType.%if)('%if')(664,667)
194199
PsiWhiteSpace(' ')(667,668)
195200
SqlElFieldAccessExprImpl(EL_FIELD_ACCESS_EXPR)(668,707)
196-
SqlElPrimaryExprImpl(EL_PRIMARY_EXPR)(668,676)
201+
SqlElIdExprImpl(EL_ID_EXPR)(668,676)
197202
PsiElement(SqlTokenType.EL_IDENTIFIER)('employee')(668,676)
198203
PsiElement(SqlTokenType..)('.')(676,677)
199-
PsiElement(SqlTokenType.EL_IDENTIFIER)('departmentId')(677,689)
204+
SqlElIdExprImpl(EL_ID_EXPR)(677,689)
205+
PsiElement(SqlTokenType.EL_IDENTIFIER)('departmentId')(677,689)
200206
PsiElement(SqlTokenType..)('.')(689,690)
201-
PsiElement(SqlTokenType.EL_IDENTIFIER)('startsWith')(690,700)
207+
SqlElIdExprImpl(EL_ID_EXPR)(690,700)
208+
PsiElement(SqlTokenType.EL_IDENTIFIER)('startsWith')(690,700)
202209
SqlElParametersImpl(EL_PARAMETERS)(700,707)
203210
PsiElement(SqlTokenType.()('(')(700,701)
204211
SqlElPrimaryExprImpl(EL_PRIMARY_EXPR)(701,706)
@@ -221,10 +228,11 @@ SQL File(0,1275)
221228
PsiWhiteSpace(' ')(739,740)
222229
SqlElAddExprImpl(EL_ADD_EXPR)(740,766)
223230
SqlElFieldAccessExprImpl(EL_FIELD_ACCESS_EXPR)(740,761)
224-
SqlElPrimaryExprImpl(EL_PRIMARY_EXPR)(740,748)
231+
SqlElIdExprImpl(EL_ID_EXPR)(740,748)
225232
PsiElement(SqlTokenType.EL_IDENTIFIER)('employee')(740,748)
226233
PsiElement(SqlTokenType..)('.')(748,749)
227-
PsiElement(SqlTokenType.EL_IDENTIFIER)('departmentId')(749,761)
234+
SqlElIdExprImpl(EL_ID_EXPR)(749,761)
235+
PsiElement(SqlTokenType.EL_IDENTIFIER)('departmentId')(749,761)
228236
PsiWhiteSpace(' ')(761,762)
229237
PsiElement(SqlTokenType.+)('+')(762,763)
230238
PsiWhiteSpace(' ')(763,765)
@@ -241,10 +249,11 @@ SQL File(0,1275)
241249
PsiWhiteSpace(' ')(788,789)
242250
SqlElGeExprImpl(EL_GE_EXPR)(789,819)
243251
SqlElFieldAccessExprImpl(EL_FIELD_ACCESS_EXPR)(789,814)
244-
SqlElPrimaryExprImpl(EL_PRIMARY_EXPR)(789,797)
252+
SqlElIdExprImpl(EL_ID_EXPR)(789,797)
245253
PsiElement(SqlTokenType.EL_IDENTIFIER)('employee')(789,797)
246254
PsiElement(SqlTokenType..)('.')(797,798)
247-
PsiElement(SqlTokenType.EL_IDENTIFIER)('numberOfProjects')(798,814)
255+
SqlElIdExprImpl(EL_ID_EXPR)(798,814)
256+
PsiElement(SqlTokenType.EL_IDENTIFIER)('numberOfProjects')(798,814)
248257
PsiWhiteSpace(' ')(814,815)
249258
PsiElement(SqlTokenType.>=)('>=')(815,817)
250259
PsiWhiteSpace(' ')(817,818)
@@ -283,15 +292,17 @@ SQL File(0,1275)
283292
SqlElForDirectiveImpl(EL_FOR_DIRECTIVE)(912,946)
284293
PsiElement(SqlTokenType.%for)('%for')(912,916)
285294
PsiWhiteSpace(' ')(916,917)
286-
PsiElement(SqlTokenType.EL_IDENTIFIER)('child')(917,922)
295+
SqlElIdExprImpl(EL_ID_EXPR)(917,922)
296+
PsiElement(SqlTokenType.EL_IDENTIFIER)('child')(917,922)
287297
PsiWhiteSpace(' ')(922,923)
288298
PsiElement(SqlTokenType.:)(':')(923,924)
289299
PsiWhiteSpace(' ')(924,925)
290300
SqlElFieldAccessExprImpl(EL_FIELD_ACCESS_EXPR)(925,946)
291-
SqlElPrimaryExprImpl(EL_PRIMARY_EXPR)(925,933)
301+
SqlElIdExprImpl(EL_ID_EXPR)(925,933)
292302
PsiElement(SqlTokenType.EL_IDENTIFIER)('employee')(925,933)
293303
PsiElement(SqlTokenType..)('.')(933,934)
294-
PsiElement(SqlTokenType.EL_IDENTIFIER)('departmentId')(934,946)
304+
SqlElIdExprImpl(EL_ID_EXPR)(934,946)
305+
PsiElement(SqlTokenType.EL_IDENTIFIER)('departmentId')(934,946)
295306
PsiWhiteSpace(' ')(946,947)
296307
PsiElement(SqlTokenType.*/)('*/')(947,949)
297308
PsiWhiteSpace('\n ')(949,953)
@@ -300,7 +311,7 @@ SQL File(0,1275)
300311
SqlElIfDirectiveImpl(EL_IF_DIRECTIVE)(955,974)
301312
PsiElement(SqlTokenType.%if)('%if')(955,958)
302313
PsiWhiteSpace(' ')(958,960)
303-
SqlElPrimaryExprImpl(EL_PRIMARY_EXPR)(960,974)
314+
SqlElIdExprImpl(EL_ID_EXPR)(960,974)
304315
PsiElement(SqlTokenType.EL_IDENTIFIER)('child_has_next')(960,974)
305316
PsiWhiteSpace(' ')(974,975)
306317
PsiElement(SqlTokenType.*/)('*/')(975,977)
@@ -317,10 +328,11 @@ SQL File(0,1275)
317328
PsiElement(SqlTokenType./*)('/*')(1005,1007)
318329
PsiWhiteSpace(' ')(1007,1008)
319330
SqlElFieldAccessExprImpl(EL_FIELD_ACCESS_EXPR)(1008,1023)
320-
SqlElPrimaryExprImpl(EL_PRIMARY_EXPR)(1008,1013)
331+
SqlElIdExprImpl(EL_ID_EXPR)(1008,1013)
321332
PsiElement(SqlTokenType.EL_IDENTIFIER)('child')(1008,1013)
322333
PsiElement(SqlTokenType..)('.')(1013,1014)
323-
PsiElement(SqlTokenType.EL_IDENTIFIER)('projectId')(1014,1023)
334+
SqlElIdExprImpl(EL_ID_EXPR)(1014,1023)
335+
PsiElement(SqlTokenType.EL_IDENTIFIER)('projectId')(1014,1023)
324336
PsiWhiteSpace(' ')(1023,1024)
325337
PsiElement(SqlTokenType.*/)('*/')(1024,1026)
326338
PsiElement(SqlTokenType.NUMBER)('0')(1026,1027)
@@ -330,15 +342,17 @@ SQL File(0,1275)
330342
SqlElForDirectiveImpl(EL_FOR_DIRECTIVE)(1033,1054)
331343
PsiElement(SqlTokenType.%for)('%for')(1033,1037)
332344
PsiWhiteSpace(' ')(1037,1038)
333-
PsiElement(SqlTokenType.EL_IDENTIFIER)('p')(1038,1039)
345+
SqlElIdExprImpl(EL_ID_EXPR)(1038,1039)
346+
PsiElement(SqlTokenType.EL_IDENTIFIER)('p')(1038,1039)
334347
PsiWhiteSpace(' ')(1039,1040)
335348
PsiElement(SqlTokenType.:)(':')(1040,1041)
336349
PsiWhiteSpace(' ')(1041,1042)
337350
SqlElFieldAccessExprImpl(EL_FIELD_ACCESS_EXPR)(1042,1054)
338-
SqlElPrimaryExprImpl(EL_PRIMARY_EXPR)(1042,1047)
351+
SqlElIdExprImpl(EL_ID_EXPR)(1042,1047)
339352
PsiElement(SqlTokenType.EL_IDENTIFIER)('child')(1042,1047)
340353
PsiElement(SqlTokenType..)('.')(1047,1048)
341-
PsiElement(SqlTokenType.EL_IDENTIFIER)('member')(1048,1054)
354+
SqlElIdExprImpl(EL_ID_EXPR)(1048,1054)
355+
PsiElement(SqlTokenType.EL_IDENTIFIER)('member')(1048,1054)
342356
PsiWhiteSpace(' ')(1054,1055)
343357
PsiElement(SqlTokenType.*/)('*/')(1055,1057)
344358
PsiWhiteSpace('\n ')(1057,1061)
@@ -356,15 +370,20 @@ SQL File(0,1275)
356370
SqlElStaticFieldAccessExprImpl(EL_STATIC_FIELD_ACCESS_EXPR)(1078,1122)
357371
PsiElement(SqlTokenType.@)('@')(1078,1079)
358372
SqlElClassImpl(EL_CLASS)(1079,1104)
359-
PsiElement(SqlTokenType.EL_IDENTIFIER)('example')(1079,1086)
373+
SqlElIdExprImpl(EL_ID_EXPR)(1079,1086)
374+
PsiElement(SqlTokenType.EL_IDENTIFIER)('example')(1079,1086)
360375
PsiElement(SqlTokenType..)('.')(1086,1087)
361-
PsiElement(SqlTokenType.EL_IDENTIFIER)('entity')(1087,1093)
376+
SqlElIdExprImpl(EL_ID_EXPR)(1087,1093)
377+
PsiElement(SqlTokenType.EL_IDENTIFIER)('entity')(1087,1093)
362378
PsiElement(SqlTokenType..)('.')(1093,1094)
363-
PsiElement(SqlTokenType.EL_IDENTIFIER)('StaticType')(1094,1104)
379+
SqlElIdExprImpl(EL_ID_EXPR)(1094,1104)
380+
PsiElement(SqlTokenType.EL_IDENTIFIER)('StaticType')(1094,1104)
364381
PsiElement(SqlTokenType.@)('@')(1104,1105)
365-
PsiElement(SqlTokenType.EL_IDENTIFIER)('PARAM1')(1105,1111)
382+
SqlElIdExprImpl(EL_ID_EXPR)(1105,1111)
383+
PsiElement(SqlTokenType.EL_IDENTIFIER)('PARAM1')(1105,1111)
366384
PsiElement(SqlTokenType..)('.')(1111,1112)
367-
PsiElement(SqlTokenType.EL_IDENTIFIER)('getValue')(1112,1120)
385+
SqlElIdExprImpl(EL_ID_EXPR)(1112,1120)
386+
PsiElement(SqlTokenType.EL_IDENTIFIER)('getValue')(1112,1120)
368387
SqlElParametersImpl(EL_PARAMETERS)(1120,1122)
369388
PsiElement(SqlTokenType.()('(')(1120,1121)
370389
PsiElement(SqlTokenType.))(')')(1121,1122)

0 commit comments

Comments
 (0)