fixing merge conflicts

store/sql_team_store.go

@@ -17,8 +17,8 @@ func NewSqlTeamStore(sqlStore *SqlStore) TeamStore {
 	for _, db := range sqlStore.GetAllConns() {
 		table := db.AddTableWithName(model.Team{}, "Teams").SetKeys(false, "Id")
 		table.ColMap("Id").SetMaxSize(26)
-		table.ColMap("Name").SetMaxSize(64)
-		table.ColMap("Domain").SetMaxSize(64).SetUnique(true)
+		table.ColMap("DisplayName").SetMaxSize(64)
+		table.ColMap("Name").SetMaxSize(64).SetUnique(true)
 		table.ColMap("Email").SetMaxSize(128)
 		table.ColMap("CompanyName").SetMaxSize(64)
 		table.ColMap("AllowedDomains").SetMaxSize(500)
@@ -28,6 +28,15 @@ func NewSqlTeamStore(sqlStore *SqlStore) TeamStore {
 }
 
 func (s SqlTeamStore) UpgradeSchemaIfNeeded() {
+	defaultValue := "0"
+	if utils.Cfg.TeamSettings.AllowValetDefault {
+		defaultValue = "1"
+	}
+	s.CreateColumnIfNotExists("Teams", "AllowValet", "AllowedDomains", "tinyint(1)", defaultValue)
+	if !s.DoesColumnExist("Teams", "DisplayName") {
+		s.RenameColumnIfExists("Teams", "Name", "DisplayName", "varchar(64)")
+		s.RenameColumnIfExists("Teams", "Domain", "Name", "varchar(64)")
+	}
 }
 
 func (s SqlTeamStore) CreateIndexesIfNotExists() {
@@ -56,7 +65,7 @@ func (s SqlTeamStore) Save(team *model.Team) StoreChannel {
 		}
 
 		if err := s.GetMaster().Insert(team); err != nil {
-			if IsUniqueConstraintError(err.Error(), "Domain", "teams_domain_key") {
+			if IsUniqueConstraintError(err.Error(), "Name", "teams_domain_key") {
 				result.Err = model.NewAppError("SqlTeamStore.Save", "A team with that domain already exists", "id="+team.Id+", "+err.Error())
 			} else {
 				result.Err = model.NewAppError("SqlTeamStore.Save", "We couldn't save the team", "id="+team.Id+", "+err.Error())
@@ -94,7 +103,7 @@ func (s SqlTeamStore) Update(team *model.Team) StoreChannel {
 		} else {
 			oldTeam := oldResult.(*model.Team)
 			team.CreateAt = oldTeam.CreateAt
-			team.Domain = oldTeam.Domain
+			team.Name = oldTeam.Name
 
 			if count, err := s.GetMaster().Update(team); err != nil {
 				result.Err = model.NewAppError("SqlTeamStore.Update", "We encounted an error updating the team", "id="+team.Id+", "+err.Error())
@@ -112,14 +121,14 @@ func (s SqlTeamStore) Update(team *model.Team) StoreChannel {
 	return storeChannel
 }
 
-func (s SqlTeamStore) UpdateName(name string, teamId string) StoreChannel {
+func (s SqlTeamStore) UpdateDisplayName(name string, teamId string) StoreChannel {
 
 	storeChannel := make(StoreChannel)
 
 	go func() {
 		result := StoreResult{}
 
-		if _, err := s.GetMaster().Exec("UPDATE Teams SET Name = :Name WHERE Id = :Id", map[string]interface{}{"Name": name, "Id": teamId}); err != nil {
+		if _, err := s.GetMaster().Exec("UPDATE Teams SET DisplayName = :Name WHERE Id = :Id", map[string]interface{}{"Name": name, "Id": teamId}); err != nil {
 			result.Err = model.NewAppError("SqlTeamStore.UpdateName", "We couldn't update the team name", "team_id="+teamId)
 		} else {
 			result.Data = teamId
@@ -153,7 +162,7 @@ func (s SqlTeamStore) Get(id string) StoreChannel {
 	return storeChannel
 }
 
-func (s SqlTeamStore) GetByDomain(domain string) StoreChannel {
+func (s SqlTeamStore) GetByName(name string) StoreChannel {
 	storeChannel := make(StoreChannel)
 
 	go func() {
@@ -161,8 +170,8 @@ func (s SqlTeamStore) GetByDomain(domain string) StoreChannel {
 
 		team := model.Team{}
 
-		if err := s.GetReplica().SelectOne(&team, "SELECT * FROM Teams WHERE Domain = :Domain", map[string]interface{}{"Domain": domain}); err != nil {
-			result.Err = model.NewAppError("SqlTeamStore.GetByDomain", "We couldn't find the existing team", "domain="+domain+", "+err.Error())
+		if err := s.GetReplica().SelectOne(&team, "SELECT * FROM Teams WHERE Name = :Name", map[string]interface{}{"Name": name}); err != nil {
+			result.Err = model.NewAppError("SqlTeamStore.GetByName", "We couldn't find the existing team", "name="+name+", "+err.Error())
 		}
 
 		result.Data = &team