From 472967fdc87323445c9932672a6cedfbec7c58c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Thu, 6 Nov 2025 10:48:23 +0100 Subject: [PATCH 1/2] This is an automated cherry-pick of #21939 Signed-off-by: ti-chi-bot --- sql-statements/sql-statement-alter-user.md | 3 +++ sql-statements/sql-statement-create-user.md | 3 +++ 2 files changed, 6 insertions(+) diff --git a/sql-statements/sql-statement-alter-user.md b/sql-statements/sql-statement-alter-user.md index c3ce7145c0350..94c4cb78297f7 100644 --- a/sql-statements/sql-statement-alter-user.md +++ b/sql-statements/sql-statement-alter-user.md @@ -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 diff --git a/sql-statements/sql-statement-create-user.md b/sql-statements/sql-statement-create-user.md index 241740a8d5a5d..0f43f6f10e2cf 100644 --- a/sql-statements/sql-statement-create-user.md +++ b/sql-statements/sql-statement-create-user.md @@ -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 From d13b84aaef01fbc0e74cd10966c94ee528336a96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= Date: Thu, 6 Nov 2025 10:57:15 +0100 Subject: [PATCH 2/2] Fix merge conflict --- sql-statements/sql-statement-alter-user.md | 9 --------- sql-statements/sql-statement-create-user.md | 9 --------- 2 files changed, 18 deletions(-) diff --git a/sql-statements/sql-statement-alter-user.md b/sql-statements/sql-statement-alter-user.md index 94c4cb78297f7..bf61a31aecf8b 100644 --- a/sql-statements/sql-statement-alter-user.md +++ b/sql-statements/sql-statement-alter-user.md @@ -19,15 +19,6 @@ 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 diff --git a/sql-statements/sql-statement-create-user.md b/sql-statements/sql-statement-create-user.md index 0f43f6f10e2cf..e323b34eb107d 100644 --- a/sql-statements/sql-statement-create-user.md +++ b/sql-statements/sql-statement-create-user.md @@ -19,15 +19,6 @@ 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