mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-12-30 00:36:14 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/main' into feature/add-sqlite-support

Browse source 
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
This commit is contained in:
kim (grufwub) 2021-08-26 16:53:33 +01:00
commit 63412d565b
2 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
internal/db/bundb/admin.go
View file

@ -234,17 +234,18 @@ func (a *adminDB) CreateInstanceInstance(ctx context.Context) db.Error {
domain := a.config.Host
// check if instance entry already exists
existsQ := a.conn.
q := a.conn.
NewSelect().
Model(&gtsmodel.Instance{}).
Where("domain = ?", domain)
count, err := existsQ.Count(ctx)
if err != nil && count == 1 {
a.log.Infof("instance instance %s already exists", domain)
exists, err := a.conn.Exists(ctx, q)
if err != nil {
return err
}
if exists {
a.log.Infof("instance entry already exists")
return nil
} else if err != sql.ErrNoRows {
return a.conn.ProcessError(err)
}
iID, err := id.NewRandomULID()
@ -263,9 +264,11 @@ func (a *adminDB) CreateInstanceInstance(ctx context.Context) db.Error {
NewInsert().
Model(i)
if _, err := insertQ.Exec(ctx); err != nil {
return err
_, err = insertQ.Exec(ctx)
err = a.conn.ProcessError(err)
if err == nil {
a.log.Infof("created instance instance %s with id %s", domain, i.ID)
}
a.log.Infof("created instance instance %s with id %s", domain, i.ID)
return nil
return err
}