Fix duplicate items in CREATE USER and ALTER USER (#21939) #22019
Conversation
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
ti-chi-bot
added
do-not-merge/hold
|
@dveeden This PR has conflicts, I have hold it. |
|
@ti-chi-bot: ## If you want to know how to resolve it, please read the guide in TiDB Dev Guide. 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 ti-community-infra/tichi repository. |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Summary of ChangesHello @ti-chi-bot, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed! This pull request focuses on refining the documentation for SQL user management commands. It resolves an issue where grammar definitions for Highlights
Using Gemini Code AssistThe full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips. Invoking Gemini You can request assistance from Gemini at any point by creating a comment using either
Customization To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a Limitations & Feedback Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here. You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension. Footnotes
|
ti-chi-bot
bot
added
size/XS
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request effectively resolves merge conflicts and removes duplicate EBNF syntax definitions in the CREATE USER and ALTER USER documentation files. This cleanup significantly improves the clarity and correctness of the SQL statement synopses by eliminating redundant content.
| <<<<<<< HEAD | ||
| RequireClauseOpt ::= | ||
| ( 'REQUIRE' 'NONE' | 'REQUIRE' 'SSL' | 'REQUIRE' 'X509' | 'REQUIRE' RequireList )? | ||
| RequireList ::= | ||
| ( "ISSUER" stringLit | "SUBJECT" stringLit | "CIPHER" stringLit | "SAN" stringLit | "TOKEN_ISSUER" stringLit )* | ||
| ======= | ||
| >>>>>>> 1b5366d40f (Fix duplicate items in CREATE USER and ALTER USER (#21939)) | ||
| Username ::= | ||
| StringName ('@' StringName | singleAtIdentifier)? | 'CURRENT_USER' OptionalBraces | ||
There was a problem hiding this comment.
These lines represent merge conflict markers and a duplicate definition of RequireClauseOpt and RequireList. Removing them correctly resolves the conflict and improves the clarity of the syntax definition by eliminating redundancy 1.
Style Guide References
Footnotes
-
Avoid unnecessary words and repetition. ↩
| <<<<<<< HEAD | ||
| RequireClauseOpt ::= | ||
| ( 'REQUIRE' 'NONE' | 'REQUIRE' 'SSL' | 'REQUIRE' 'X509' | 'REQUIRE' RequireList )? | ||
| RequireList ::= | ||
| ( "ISSUER" stringLit | "SUBJECT" stringLit | "CIPHER" stringLit | "SAN" stringLit | "TOKEN_ISSUER" stringLit )* | ||
| ======= | ||
| >>>>>>> 1b5366d40f (Fix duplicate items in CREATE USER and ALTER USER (#21939)) | ||
| UserSpec ::= | ||
| Username AuthOption | ||
There was a problem hiding this comment.
These lines represent merge conflict markers and a duplicate definition of RequireClauseOpt and RequireList. Removing them correctly resolves the conflict and improves the clarity of the syntax definition by eliminating redundancy 1.
Style Guide References
Footnotes
-
Avoid unnecessary words and repetition. ↩
ti-chi-bot
bot
added
size/S
2 participants
This is an automated cherry-pick of #21939
First-time contributors' checklist
What is changed, added or deleted? (Required)
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.
What is the related PR or file link(s)?
Do your changes match any of the following descriptions?