Skip to content

Fix duplicate items in CREATE USER and ALTER USER (#21939) #22019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: release-8.1
Choose a base branch
from
+0 −12
Open

Fix duplicate items in CREATE USER and ALTER USER (#21939) #22019

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
472967f
This is an automated cherry-pick of #21939
dveeden Nov 6, 2025
d13b84a
Fix merge conflict
dveeden Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions sql-statements/sql-statement-alter-user.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,15 @@ UserSpecList ::=
UserSpec ::=
Username AuthOption

<<<<<<< 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

Copy link

@gemini-code-assist gemini-code-assist bot Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

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

  1. Avoid unnecessary words and repetition. ↩

Expand Down
3 changes: 3 additions & 0 deletions sql-statements/sql-statement-create-user.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,15 @@ IfNotExists ::=
UserSpecList ::=
UserSpec ( ',' UserSpec )*

<<<<<<< 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

Copy link

@gemini-code-assist gemini-code-assist bot Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

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

  1. Avoid unnecessary words and repetition. ↩

Expand Down