Skip to content

Commit 4b23702

Browse files
committed
Fix parser/parseSelect13 out data
Signed-off-by: William Desportes <[email protected]>
1 parent dec0a22 commit 4b23702

1 file changed

Lines changed: 43 additions & 34 deletions

File tree

tests/data/parser/parseSelect13.out

Lines changed: 43 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,15 @@
1515
"parseLabel",
1616
"parseUnknown"
1717
],
18+
"KEYWORD_NAME_INDICATORS": [
19+
"FROM",
20+
"SET",
21+
"WHERE"
22+
],
23+
"OPERATOR_NAME_INDICATORS": [
24+
",",
25+
"."
26+
],
1827
"str": "SELECT post.*, post.username AS postusername, post.ipaddress AS ip, IF(post.visible = 2, 1, 0) AS isdeleted, user.*, userfield.*, usertextfield.*, icon.title as icontitle, icon.iconpath, avatar.avatarpath, NOT ISNULL(customavatar.userid) AS hascustomavatar, customavatar.dateline AS avatardateline,customavatar.width AS avwidth,customavatar.height AS avheight, spamlog.postid AS spamlog_postid, deletionlog.userid AS del_userid, deletionlog.username AS del_username, deletionlog.reason AS del_reason, editlog.userid AS edit_userid, editlog.username AS edit_username, editlog.dateline AS edit_dateline, editlog.reason AS edit_reason, editlog.hashistory, postparsed.pagetext_html, postparsed.hasimages, sigparsed.signatureparsed, sigparsed.hasimages AS sighasimages, sigpic.userid AS sigpic, sigpic.dateline AS sigpicdateline, sigpic.width AS sigpicwidth, sigpic.height AS sigpicheight, IF(displaygroupid=0, user.usergroupid, displaygroupid) AS displaygroupid, infractiongroupid , post_icon_list.icon_id_list, post_icon_list.is_auto AS icon_is_auto, approvedlog.modid AS approvedmodid, approvedlog.dateline AS approveddateline, approvedlog.status AS approvedstatus, approvedlog.info AS approvedinfo, movedlog.modid AS movedmodid, movedlog.dateline AS moveddateline, movedlog.status AS movedstatus, movedlog.info AS movedinfo, ( SELECT useragent FROM session WHERE userid=post.userid AND lastactivity > 1644859580 ORDER BY lastactivity DESC LIMIT 1 ) AS useragent, IF ( user.userid IS NOT NULL, (SELECT COUNT(usernoteid) FROM usernote AS usernote WHERE usernote.userid=user.userid AND usernote.priority>=0), 0 ) AS usernotecount , deletionlog.dateline AS del_dateline, scheduled_approval.defer_time AS vbpmal_approval_defer_time, additional_user_data.last_year_message_count, additional_user_data.last_year_reputation, additional_user_data.last_year_groan_count, paid_post_activation.activation_id AS paid_post_activation_id, alm_Model_UserData.credits FROM post AS post LEFT JOIN user AS user ON(user.userid = post.userid) LEFT JOIN userfield AS userfield ON(userfield.userid = user.userid) LEFT JOIN usertextfield AS usertextfield ON(usertextfield.userid = user.userid) LEFT JOIN icon AS icon ON(icon.iconid = post.iconid) LEFT JOIN avatar AS avatar ON(avatar.avatarid = user.avatarid) LEFT JOIN customavatar AS customavatar ON(customavatar.userid = user.userid) LEFT JOIN spamlog AS spamlog ON(spamlog.postid = post.postid) LEFT JOIN deletionlog AS deletionlog ON(post.postid = deletionlog.primaryid AND deletionlog.type = 'post') LEFT JOIN editlog AS editlog ON(editlog.postid = post.postid) LEFT JOIN postparsed AS postparsed ON(postparsed.postid = post.postid AND postparsed.styleid = 23 AND postparsed.languageid = 5) LEFT JOIN sigparsed AS sigparsed ON(sigparsed.userid = user.userid AND sigparsed.styleid = 23 AND sigparsed.languageid = 5) LEFT JOIN sigpic AS sigpic ON(sigpic.userid = post.userid) LEFT JOIN vbppim_post_icon_list AS post_icon_list ON post_icon_list.post_id=post.postid LEFT JOIN vbpmal_log AS approvedlog ON (approvedlog.itemid=post.postid AND approvedlog.action='postapprove') LEFT JOIN vbpmal_log AS movedlog ON (movedlog.itemid=post.postid AND movedlog.action='postmove') LEFT JOIN vbpmal_scheduled_post_approval AS scheduled_approval ON scheduled_approval.post_id = post.postid LEFT JOIN vbpsmt_additional_user_data AS additional_user_data ON additional_user_data.userid=post.userid LEFT JOIN market_pp_post_activation_mapping AS paid_post_activation ON paid_post_activation.post_id = post.postid LEFT JOIN alm_Model_UserData AS alm_Model_UserData ON alm_Model_UserData.user_id=user.userid WHERE post.postid IN (0,3254399,3254508,3254743,3254817,3254969,3255328,3255582,3257603,3257873,3258126,3258150,3258254,3258272,3258311,3260767,3260770,3260776,3261180,3261263,3261317,3261318) ORDER BY post.dateline",
1928
"len": 3834,
2029
"last": 3834,
@@ -448,9 +457,9 @@
448457
"@type": "PhpMyAdmin\\SqlParser\\Token",
449458
"token": "user",
450459
"value": "user",
451-
"keyword": "USER",
452-
"type": 1,
453-
"flags": 33,
460+
"keyword": "user",
461+
"type": 0,
462+
"flags": 0,
454463
"position": 109
455464
},
456465
{
@@ -2401,9 +2410,9 @@
24012410
"@type": "PhpMyAdmin\\SqlParser\\Token",
24022411
"token": "user",
24032412
"value": "user",
2404-
"keyword": "USER",
2405-
"type": 1,
2406-
"flags": 33,
2413+
"keyword": "user",
2414+
"type": 0,
2415+
"flags": 0,
24072416
"position": 906
24082417
},
24092418
{
@@ -3751,9 +3760,9 @@
37513760
"@type": "PhpMyAdmin\\SqlParser\\Token",
37523761
"token": "user",
37533762
"value": "user",
3754-
"keyword": "USER",
3755-
"type": 1,
3756-
"flags": 33,
3763+
"keyword": "user",
3764+
"type": 0,
3765+
"flags": 0,
37573766
"position": 1467
37583767
},
37593768
{
@@ -4030,9 +4039,9 @@
40304039
"@type": "PhpMyAdmin\\SqlParser\\Token",
40314040
"token": "user",
40324041
"value": "user",
4033-
"keyword": "USER",
4034-
"type": 1,
4035-
"flags": 33,
4042+
"keyword": "user",
4043+
"type": 0,
4044+
"flags": 0,
40364045
"position": 1566
40374046
},
40384047
{
@@ -4822,9 +4831,9 @@
48224831
"@type": "PhpMyAdmin\\SqlParser\\Token",
48234832
"token": "user",
48244833
"value": "user",
4825-
"keyword": "USER",
4826-
"type": 1,
4827-
"flags": 33,
4834+
"keyword": "user",
4835+
"type": 0,
4836+
"flags": 0,
48284837
"position": 1994
48294838
},
48304839
{
@@ -5065,9 +5074,9 @@
50655074
"@type": "PhpMyAdmin\\SqlParser\\Token",
50665075
"token": "user",
50675076
"value": "user",
5068-
"keyword": "USER",
5069-
"type": 1,
5070-
"flags": 33,
5077+
"keyword": "user",
5078+
"type": 0,
5079+
"flags": 0,
50715080
"position": 2076
50725081
},
50735082
{
@@ -5254,9 +5263,9 @@
52545263
"@type": "PhpMyAdmin\\SqlParser\\Token",
52555264
"token": "user",
52565265
"value": "user",
5257-
"keyword": "USER",
5258-
"type": 1,
5259-
"flags": 33,
5266+
"keyword": "user",
5267+
"type": 0,
5268+
"flags": 0,
52605269
"position": 2156
52615270
},
52625271
{
@@ -5632,9 +5641,9 @@
56325641
"@type": "PhpMyAdmin\\SqlParser\\Token",
56335642
"token": "user",
56345643
"value": "user",
5635-
"keyword": "USER",
5636-
"type": 1,
5637-
"flags": 33,
5644+
"keyword": "user",
5645+
"type": 0,
5646+
"flags": 0,
56385647
"position": 2271
56395648
},
56405649
{
@@ -5821,9 +5830,9 @@
58215830
"@type": "PhpMyAdmin\\SqlParser\\Token",
58225831
"token": "user",
58235832
"value": "user",
5824-
"keyword": "USER",
5825-
"type": 1,
5826-
"flags": 33,
5833+
"keyword": "user",
5834+
"type": 0,
5835+
"flags": 0,
58275836
"position": 2350
58285837
},
58295838
{
@@ -7036,9 +7045,9 @@
70367045
"@type": "PhpMyAdmin\\SqlParser\\Token",
70377046
"token": "user",
70387047
"value": "user",
7039-
"keyword": "USER",
7040-
"type": 1,
7041-
"flags": 33,
7048+
"keyword": "user",
7049+
"type": 0,
7050+
"flags": 0,
70427051
"position": 2778
70437052
},
70447053
{
@@ -8764,9 +8773,9 @@
87648773
"@type": "PhpMyAdmin\\SqlParser\\Token",
87658774
"token": "user",
87668775
"value": "user",
8767-
"keyword": "USER",
8768-
"type": 1,
8769-
"flags": 33,
8776+
"keyword": "user",
8777+
"type": 0,
8778+
"flags": 0,
87708779
"position": 3607
87718780
},
87728781
{
@@ -9931,7 +9940,7 @@
99319940
"XOR": 1
99329941
},
99339942
"database": null,
9934-
"table": null,
9943+
"table": "user",
99359944
"column": null,
99369945
"expr": "user.*",
99379946
"alias": null,

0 commit comments

Comments
 (0)