fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

Add initial_name field in DB

Browse source
This commit is contained in:
nemunaire 2016-04-28 16:11:19 +02:00 • committed by Pierre-Olivier Mercier
commit 467641f4f2
3 changed files with 37 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libfic/db.go
View file

@ -38,6 +38,7 @@ CREATE TABLE IF NOT EXISTS themes(
if _, err := db.Exec(`
CREATE TABLE IF NOT EXISTS teams(
id_team INTEGER NOT NULL PRIMARY KEY AUTO_INCREMENT,
initial_name VARCHAR(255) NOT NULL,
name VARCHAR(255) NOT NULL,
color INTEGER NOT NULL
);

26
libfic/team.go
View file

@ -6,13 +6,14 @@ import (
)
type Team struct {
Id int64 `json:"id"`
Name string `json:"name"`
Color uint32 `json:"color"`
Id int64 `json:"id"`
InitialName string `json:"initialName"`
Name string `json:"name"`
Color uint32 `json:"color"`
}
func GetTeams() ([]Team, error) {
if rows, err := DBQuery("SELECT id_team, name, color FROM teams"); err != nil {
if rows, err := DBQuery("SELECT id_team, initial_name, name, color FROM teams"); err != nil {
return nil, err
} else {
defer rows.Close()
@ -20,7 +21,7 @@ func GetTeams() ([]Team, error) {
var teams = make([]Team, 0)
for rows.Next() {
var t Team
if err := rows.Scan(&t.Id, &t.Name, &t.Color); err != nil {
if err := rows.Scan(&t.Id, &t.InitialName, &t.Name, &t.Color); err != nil {
return nil, err
}
teams = append(teams, t)
@ -35,7 +36,16 @@ func GetTeams() ([]Team, error) {
func GetTeam(id int) (Team, error) {
var t Team
if err := DBQueryRow("SELECT id_team, name, color FROM teams WHERE id_team = ?", id).Scan(&t.Id, &t.Name, &t.Color); err != nil {
if err := DBQueryRow("SELECT id_team, initial_name, name, color FROM teams WHERE id_team = ?", id).Scan(&t.Id, &t.InitialName, &t.Name, &t.Color); err != nil {
return t, err
}
return t, nil
}
func GetTeamByInitialName(initialName string) (Team, error) {
var t Team
if err := DBQueryRow("SELECT id_team, initial_name, name, color FROM teams WHERE initial_name = ?", initialName).Scan(&t.Id, &t.InitialName, &t.Name, &t.Color); err != nil {
return t, err
}
@ -43,12 +53,12 @@ func GetTeam(id int) (Team, error) {
}
func CreateTeam(name string, color uint32) (Team, error) {
if res, err := DBExec("INSERT INTO teams (name, color) VALUES (?, ?)", name, color); err != nil {
if res, err := DBExec("INSERT INTO teams (initial_name, name, color) VALUES (?, ?, ?)", name, name, color); err != nil {
return Team{}, err
} else if tid, err := res.LastInsertId(); err != nil {
return Team{}, err
} else {
return Team{tid, name, color}, nil
return Team{tid, name, name, color}, nil
}
}