Merge branch 'dev' of ssh://meowgit.nekoea.red:22222/nihonium/nyanimedb into dev
This commit is contained in:
commit
9affe90988
1 changed files with 7 additions and 1 deletions
|
|
@ -71,7 +71,10 @@ func sqlDate2oapi(p_date pgtype.Timestamptz) *time.Time {
|
||||||
|
|
||||||
func oapiDate2sql(t *time.Time) pgtype.Timestamptz {
|
func oapiDate2sql(t *time.Time) pgtype.Timestamptz {
|
||||||
if t == nil {
|
if t == nil {
|
||||||
return pgtype.Timestamptz{Valid: false}
|
return pgtype.Timestamptz{
|
||||||
|
Time: time.Now(),
|
||||||
|
Valid: true,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return pgtype.Timestamptz{
|
return pgtype.Timestamptz{
|
||||||
Time: *t,
|
Time: *t,
|
||||||
|
|
@ -386,6 +389,9 @@ func (s Server) AddUserTitle(ctx context.Context, request oapi.AddUserTitleReque
|
||||||
// fmt.Println(pgErr.Code) // => 42601
|
// fmt.Println(pgErr.Code) // => 42601
|
||||||
if pgErr.Code == pgErrDuplicateKey { //duplicate key value
|
if pgErr.Code == pgErrDuplicateKey { //duplicate key value
|
||||||
return oapi.AddUserTitle409Response{}, nil
|
return oapi.AddUserTitle409Response{}, nil
|
||||||
|
} else {
|
||||||
|
log.Errorf("%v", err)
|
||||||
|
return oapi.AddUserTitle500Response{}, nil
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
log.Errorf("%v", err)
|
log.Errorf("%v", err)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue