add option for show grant

pingcap · Apr 9, 2019 · a3c4982 · a3c4982
1 parent cdceeb2
commit a3c4982
Show file tree

Hide file tree

Showing 4 changed files with 2,879 additions and 2,821 deletions.
diff --git a/ast/dml.go b/ast/dml.go
@@ -1771,8 +1771,9 @@ type ShowStmt struct {
 	Column      *ColumnName // Used for `desc table column`.
 	Flag        int         // Some flag parsed from sql, such as FULL.
 	Full        bool
-	User        *auth.UserIdentity // Used for show grants/create user.
-	IfNotExists bool               // Used for `show create database if not exists`
+	User        *auth.UserIdentity   // Used for show grants/create user.
+	Roles       []*auth.RoleIdentity // Used for show grants .. using
+	IfNotExists bool                 // Used for `show create database if not exists`
 
 	// GlobalScope is used by `show variables` and `show bindings`
 	GlobalScope bool
@@ -1847,6 +1848,17 @@ func (n *ShowStmt) Restore(ctx *RestoreCtx) error {
 				return errors.Annotate(err, "An error occurred while restore ShowStmt.User")
 			}
 		}
+		if n.Roles != nil {
+			ctx.WriteKeyWord(" USING ")
+			for i, r := range n.Roles {
+				if err := r.Restore(ctx); err != nil {
+					return errors.Annotate(err, "An error occurred while restore ShowStmt.User")
+				}
+				if i != len(n.Roles)-1 {
+					ctx.WriteKeyWord(", ")
+				}
+			}
+		}
 	case ShowMasterStatus:
 		ctx.WriteKeyWord("MASTER STATUS")
 	case ShowProcessList: