Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5400d6acd9 | ||
|
|
74edd574b3 | ||
|
|
266cde6468 |
@@ -49,7 +49,11 @@ func ConnectDatabase(dbConnString string) {
|
||||
}
|
||||
err = m.Up()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
if err.Error() == "no change" {
|
||||
log.Println(err)
|
||||
} else {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
log.Println("Migrations Run")
|
||||
initServices()
|
||||
|
||||
@@ -20,7 +20,12 @@ func (s userService) User(id string) (geeksbot.User, error) {
|
||||
|
||||
func (s userService) CreateUser(u geeksbot.User) (geeksbot.User, error) {
|
||||
queryString := "INSERT INTO users (id, steam_id, active, staff, admin) VALUES ($1, $2, $3, $4, $5)"
|
||||
_, err := s.db.Exec(queryString, u.ID, u.SteamID, u.IsActive, u.IsStaff, u.IsAdmin)
|
||||
var err error
|
||||
if u.SteamID.Valid {
|
||||
_, err = s.db.Exec(queryString, u.ID, u.SteamID.String, u.IsActive, u.IsStaff, u.IsAdmin)
|
||||
} else {
|
||||
_, err = s.db.Exec(queryString, u.ID, nil, u.IsActive, u.IsStaff, u.IsAdmin)
|
||||
}
|
||||
return u, err
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user