Skip to content

Update keywords#15443

Merged
ti-chi-bot[bot] merged 2 commits into
pingcap:masterfrom
dveeden:keywords_update
Dec 5, 2023
Merged

Update keywords#15443
ti-chi-bot[bot] merged 2 commits into
pingcap:masterfrom
dveeden:keywords_update

Conversation

@dveeden
Copy link
Copy Markdown
Contributor

@dveeden dveeden commented Nov 23, 2023

What is changed, added or deleted? (Required)

  1. The scripts/check-keywords.sh script didn't check they "TiDBKeyword" section of "parser.y"
  2. The entries in the docs from the "TiDBKeyword" section were labeled as reserved, while that doesn't seem to be the case.
  3. Various missing keywords.

This shows the behavior for TIDB and DESC which are both listed as reserved keyword in the docs:

sql> CREATE TABLE TIDB(id INT);
Query OK, 0 rows affected (0.2196 sec)

sql> CREATE TABLE DESC(id INT);
ERROR: 1064 (42000): You have an error in your SQL syntax; check the manual that corresponds to your TiDB version for the right syntax to use line 1 column 17 near "DESC(id INT)" 

I would expect both to fail, but it looks like TIDB (from the "TiDBKeyword" list) isn't actually reserved.

Which TiDB version(s) do your changes apply to? (Required)

Tips for choosing the affected version(s):

By default, CHOOSE MASTER ONLY so your changes will be applied to the next TiDB major or minor releases. If your PR involves a product feature behavior change or a compatibility change, CHOOSE THE AFFECTED RELEASE BRANCH(ES) AND MASTER.

For details, see tips for choosing the affected versions.

  • master (the latest development version)
  • v7.5 (TiDB 7.5 versions)
  • v7.4 (TiDB 7.4 versions)
  • v7.3 (TiDB 7.3 versions)
  • v7.1 (TiDB 7.1 versions)
  • v6.5 (TiDB 6.5 versions)
  • v6.1 (TiDB 6.1 versions)
  • v5.4 (TiDB 5.4 versions)
  • v5.3 (TiDB 5.3 versions)
  • v5.2 (TiDB 5.2 versions)
  • v5.1 (TiDB 5.1 versions)
  • v5.0 (TiDB 5.0 versions)

What is the related PR or file link(s)?

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

@ti-chi-bot ti-chi-bot Bot added missing-translation-status This PR does not have translation status info. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 23, 2023
@ti-chi-bot ti-chi-bot Bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Dec 4, 2023
@Oreoxmt Oreoxmt self-assigned this Dec 4, 2023
@Oreoxmt Oreoxmt added the translation/doing This PR's assignee is translating this PR. label Dec 4, 2023
@ti-chi-bot ti-chi-bot Bot removed the missing-translation-status This PR does not have translation status info. label Dec 4, 2023
@ti-chi-bot ti-chi-bot Bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Dec 4, 2023
@ti-chi-bot
Copy link
Copy Markdown

ti-chi-bot Bot commented Dec 4, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-12-04 07:55:48.584378714 +0000 UTC m=+1427777.249604910: ☑️ agreed by tangenta.
  • 2023-12-04 09:16:18.236847923 +0000 UTC m=+1432606.902074119: ☑️ agreed by Oreoxmt.

@Oreoxmt
Copy link
Copy Markdown
Collaborator

Oreoxmt commented Dec 4, 2023

@dveeden Could you help confirm if this PR also apply to release-7.5?

@Oreoxmt Oreoxmt mentioned this pull request Dec 4, 2023
18 tasks
@Oreoxmt Oreoxmt added translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR. and removed translation/doing This PR's assignee is translating this PR. labels Dec 4, 2023
@dveeden
Copy link
Copy Markdown
Contributor Author

dveeden commented Dec 4, 2023

@dveeden Could you help confirm if this PR also apply to release-7.5?

Yes it does.

And also release-7.1. However that needs a careful merge as the pkg in this line of scripts/check-keywords.sh should not be used for 7.1

parser = Path("../tidb/pkg/parser/parser.y")

@dveeden dveeden added needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. labels Dec 4, 2023
@ti-chi-bot
Copy link
Copy Markdown

ti-chi-bot Bot commented Dec 4, 2023

@mjonss: adding LGTM is restricted to approvers and reviewers in OWNERS files.

Details

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@Oreoxmt
Copy link
Copy Markdown
Collaborator

Oreoxmt commented Dec 5, 2023

/approve

@ti-chi-bot
Copy link
Copy Markdown

ti-chi-bot Bot commented Dec 5, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Oreoxmt

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot Bot added the approved label Dec 5, 2023
@ti-chi-bot ti-chi-bot Bot merged commit 8ddb538 into pingcap:master Dec 5, 2023
@ti-chi-bot
Copy link
Copy Markdown
Member

In response to a cherrypick label: new pull request created to branch release-7.5: #15593.

@ti-chi-bot ti-chi-bot mentioned this pull request Dec 5, 2023
16 tasks
@ti-chi-bot
Copy link
Copy Markdown
Member

In response to a cherrypick label: new pull request created to branch release-7.1: #15594.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved lgtm needs-cherry-pick-release-7.1 Should cherry pick this PR to release-7.1 branch. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. translation/done This PR has been translated from English into Chinese and updated to pingcap/docs-cn in a PR.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants