changing can persist to validatecanepersist

Author: James Cor

enginetest/enginetests.go

@@ -5399,8 +5399,8 @@ type memoryPersister struct {
 
 var _ mysql_db.MySQLDbPersistence = &memoryPersister{}
 
-func (p *memoryPersister) CanPersist() bool {
-	return true
+func (p *memoryPersister) ValidateCanPersist() error {
+	return nil
 }
 
 func (p *memoryPersister) Persist(ctx *sql.Context, data []byte) error {

sql/mysql_db/mysql_db.go

@@ -32,7 +32,7 @@ import (
 
 // MySQLDbPersistence is used to determine the behavior of how certain tables in MySQLDb will be persisted.
 type MySQLDbPersistence interface {
-	CanPersist() bool
+	ValidateCanPersist() error
 	Persist(ctx *sql.Context, data []byte) error
 }
 
@@ -42,8 +42,8 @@ type NoopPersister struct{}
 var _ MySQLDbPersistence = &NoopPersister{}
 
 // CanPersist implements the MySQLDbPersistence interface
-func (p *NoopPersister) CanPersist() bool {
-	return true
+func (p *NoopPersister) ValidateCanPersist() error {
+	return nil
 }
 
 // Persist implements the MySQLDbPersistence interface
@@ -349,8 +349,8 @@ func (t *MySQLDb) Negotiate(c *mysql.Conn, user string, addr net.Addr) (mysql.Ge
 }
 
 // CanPersist calls the persister's CanPersist method
-func (t *MySQLDb) CanPersist() bool {
-	return t.persister.CanPersist()
+func (t *MySQLDb) ValidateCanPersist() error {
+	return t.persister.ValidateCanPersist()
 }
 
 // Persist passes along all changes to the integrator.

sql/plan/create_role.go

@@ -108,8 +108,8 @@ func (n *CreateRole) RowIter(ctx *sql.Context, row sql.Row) (sql.RowIter, error)
 	}
 
 	// Check if you can even persist in the first place
-	if !mysqlDb.CanPersist() {
-		return nil, fmt.Errorf("no privilege file specified, to persist users/grants run with --privilege-file=<file_path>")
+	if err := mysqlDb.ValidateCanPersist(); err != nil {
+		return nil, err
 	}
 
 	userTableData := mysqlDb.UserTable().Data()

sql/plan/create_user.go

@@ -101,8 +101,8 @@ func (n *CreateUser) RowIter(ctx *sql.Context, row sql.Row) (sql.RowIter, error)
 		return nil, sql.ErrDatabaseNotFound.New("mysql")
 	}
 	// Check if you can even persist in the first place
-	if !mysqlDb.CanPersist() {
-		return nil, fmt.Errorf("no privilege file specified, to persist users/grants run with --privilege-file=<file_path>")
+	if err := mysqlDb.ValidateCanPersist(); err != nil {
+		return nil, err
 	}
 	userTableData := mysqlDb.UserTable().Data()
 	for _, user := range n.Users {