Skip to content

Fix duplicate items in CREATE USER and ALTER USER (#21089) #21091

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

Merged
merged 2 commits into from
Nov 20, 2025
+0 −12
Merged

Fix duplicate items in CREATE USER and ALTER USER (#21089) #21091

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
c938a33
This is an automated cherry-pick of #21089
qiancai Nov 20, 2025
d778125
resolve conflicts
qiancai Nov 20, 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 )*

=======
>>>>>>> ab5d7f2b64 (Fix duplicate items in CREATE USER and ALTER USER (#21089))
Username ::=
StringName ('@' StringName | singleAtIdentifier)? | 'CURRENT_USER' OptionalBraces

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

=======
>>>>>>> ab5d7f2b64 (Fix duplicate items in CREATE USER and ALTER USER (#21089))
UserSpec ::=
Username AuthOption

Expand Down