diff --git a/store/sqlstore/role_store.go b/store/sqlstore/role_store.go
index e1902a35ed..fda0ac483e 100644
--- a/store/sqlstore/role_store.go
+++ b/store/sqlstore/role_store.go
@@ -120,9 +120,22 @@ func (s *SqlRoleStore) Save(role *model.Role) (*model.Role, error) {
 
 	dbRole := NewRoleFromModel(role)
 	dbRole.UpdateAt = model.GetMillis()
-	if rowsChanged, err := s.GetMaster().Update(dbRole); err != nil {
+
+	res, err := s.GetMasterX().NamedExec(`UPDATE Roles
+		SET UpdateAt=:UpdateAt, DeleteAt=:DeleteAt, CreateAt=:CreateAt,  Name=:Name, DisplayName=:DisplayName,
+		Description=:Description, Permissions=:Permissions, SchemeManaged=:SchemeManaged, BuiltIn=:BuiltIn
+		 WHERE Id=:Id`, &dbRole)
+
+	if err != nil {
 		return nil, errors.Wrap(err, "failed to update Role")
-	} else if rowsChanged != 1 {
+	}
+
+	rowsChanged, err := res.RowsAffected()
+	if err != nil {
+		return nil, errors.Wrap(err, "error while getting rows_affected")
+	}
+
+	if rowsChanged != 1 {
 		return nil, fmt.Errorf("invalid number of updated rows, expected 1 but got %d", rowsChanged)
 	}
 
@@ -152,9 +165,9 @@ func (s *SqlRoleStore) createRole(role *model.Role, transaction *sqlxTxWrapper)
 }
 
 func (s *SqlRoleStore) Get(roleId string) (*model.Role, error) {
-	var dbRole Role
+	dbRole := Role{}
 
-	if err := s.GetReplica().SelectOne(&dbRole, "SELECT * from Roles WHERE Id = :Id", map[string]interface{}{"Id": roleId}); err != nil {
+	if err := s.GetReplicaX().Get(&dbRole, "SELECT * from Roles WHERE Id = ?", roleId); err != nil {
 		if err == sql.ErrNoRows {
 			return nil, store.NewErrNotFound("Role", roleId)
 		}
@@ -165,13 +178,13 @@ func (s *SqlRoleStore) Get(roleId string) (*model.Role, error) {
 }
 
 func (s *SqlRoleStore) GetAll() ([]*model.Role, error) {
-	var dbRoles []Role
+	dbRoles := []Role{}
 
-	if _, err := s.GetReplica().Select(&dbRoles, "SELECT * from Roles", map[string]interface{}{}); err != nil {
+	if err := s.GetReplicaX().Select(&dbRoles, "SELECT * from Roles"); err != nil {
 		return nil, errors.Wrap(err, "failed to find Roles")
 	}
 
-	var roles []*model.Role
+	roles := []*model.Role{}
 	for _, dbRole := range dbRoles {
 		roles = append(roles, dbRole.ToModel())
 	}
@@ -179,8 +192,8 @@ func (s *SqlRoleStore) GetAll() ([]*model.Role, error) {
 }
 
 func (s *SqlRoleStore) GetByName(ctx context.Context, name string) (*model.Role, error) {
-	var dbRole Role
-	if err := s.DBFromContext(ctx).SelectOne(&dbRole, "SELECT * from Roles WHERE Name = :Name", map[string]interface{}{"Name": name}); err != nil {
+	dbRole := Role{}
+	if err := s.DBXFromContext(ctx).Get(&dbRole, "SELECT * from Roles WHERE Name = ?", name); err != nil {
 		if err == sql.ErrNoRows {
 			return nil, store.NewErrNotFound("Role", fmt.Sprintf("name=%s", name))
 		}
@@ -204,12 +217,12 @@ func (s *SqlRoleStore) GetByNames(names []string) ([]*model.Role, error) {
 		return nil, errors.Wrap(err, "role_tosql")
 	}
 
-	rows, err := s.GetReplica().Db.Query(queryString, args...)
+	rows, err := s.GetReplicaX().DB.Query(queryString, args...)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to find Roles")
 	}
 
-	var roles []*model.Role
+	roles := []*model.Role{}
 	defer rows.Close()
 	for rows.Next() {
 		var role Role
@@ -231,8 +244,8 @@ func (s *SqlRoleStore) GetByNames(names []string) ([]*model.Role, error) {
 
 func (s *SqlRoleStore) Delete(roleId string) (*model.Role, error) {
 	// Get the role.
-	var role *Role
-	if err := s.GetReplica().SelectOne(&role, "SELECT * from Roles WHERE Id = :Id", map[string]interface{}{"Id": roleId}); err != nil {
+	var role Role
+	if err := s.GetReplicaX().Get(&role, "SELECT * from Roles WHERE Id = ?", roleId); err != nil {
 		if err == sql.ErrNoRows {
 			return nil, store.NewErrNotFound("Role", roleId)
 		}
@@ -243,16 +256,29 @@ func (s *SqlRoleStore) Delete(roleId string) (*model.Role, error) {
 	role.DeleteAt = time
 	role.UpdateAt = time
 
-	if rowsChanged, err := s.GetMaster().Update(role); err != nil {
+	res, err := s.GetMasterX().NamedExec(`UPDATE Roles
+		SET UpdateAt=:UpdateAt, DeleteAt=:DeleteAt, CreateAt=:CreateAt,  Name=:Name, DisplayName=:DisplayName,
+		Description=:Description, Permissions=:Permissions, SchemeManaged=:SchemeManaged, BuiltIn=:BuiltIn
+		 WHERE Id=:Id`, &role)
+
+	if err != nil {
 		return nil, errors.Wrap(err, "failed to update Role")
-	} else if rowsChanged != 1 {
-		return nil, errors.Wrapf(err, "invalid number of updated rows, expected 1 but got %d", rowsChanged)
 	}
+
+	rowsChanged, err := res.RowsAffected()
+	if err != nil {
+		return nil, errors.Wrap(err, "error while getting rows_affected")
+	}
+
+	if rowsChanged != 1 {
+		return nil, fmt.Errorf("invalid number of updated rows, expected 1 but got %d", rowsChanged)
+	}
+
 	return role.ToModel(), nil
 }
 
 func (s *SqlRoleStore) PermanentDeleteAll() error {
-	if _, err := s.GetMaster().Exec("DELETE FROM Roles"); err != nil {
+	if _, err := s.GetMasterX().Exec("DELETE FROM Roles"); err != nil {
 		return errors.Wrap(err, "failed to delete Roles")
 	}
 
@@ -336,8 +362,8 @@ func (s *SqlRoleStore) channelHigherScopedPermissionsQuery(roleNames []string) s
 func (s *SqlRoleStore) ChannelHigherScopedPermissions(roleNames []string) (map[string]*model.RolePermissions, error) {
 	query := s.channelHigherScopedPermissionsQuery(roleNames)
 
-	var rolesPermissions []*channelRolesPermissions
-	if _, err := s.GetReplica().Select(&rolesPermissions, query); err != nil {
+	rolesPermissions := []*channelRolesPermissions{}
+	if err := s.GetReplicaX().Select(&rolesPermissions, query); err != nil {
 		return nil, errors.Wrap(err, "failed to find RolePermissions")
 	}
 
@@ -366,12 +392,12 @@ func (s *SqlRoleStore) AllChannelSchemeRoles() ([]*model.Role, error) {
 		return nil, errors.Wrap(err, "role_tosql")
 	}
 
-	var dbRoles []*Role
-	if _, err = s.GetReplica().Select(&dbRoles, queryString, args...); err != nil {
+	dbRoles := []*Role{}
+	if err = s.GetReplicaX().Select(&dbRoles, queryString, args...); err != nil {
 		return nil, errors.Wrap(err, "failed to find Roles")
 	}
 
-	var roles []*model.Role
+	roles := []*model.Role{}
 	for _, dbRole := range dbRoles {
 		roles = append(roles, dbRole.ToModel())
 	}
@@ -403,12 +429,12 @@ func (s *SqlRoleStore) ChannelRolesUnderTeamRole(roleName string) ([]*model.Role
 		return nil, errors.Wrap(err, "role_tosql")
 	}
 
-	var dbRoles []*Role
-	if _, err = s.GetReplica().Select(&dbRoles, queryString, args...); err != nil {
+	dbRoles := []*Role{}
+	if err = s.GetReplicaX().Select(&dbRoles, queryString, args...); err != nil {
 		return nil, errors.Wrap(err, "failed to find Roles")
 	}
 
-	var roles []*model.Role
+	roles := []*model.Role{}
 	for _, dbRole := range dbRoles {
 		roles = append(roles, dbRole.ToModel())
 	}