fix new tx within tx (#163)

Signed-off-by: kim (grufwub) <grufwub@gmail.com>
This commit is contained in:
kim 2021-08-27 10:38:24 +01:00 committed by GitHub
parent 30f688dbe2
commit 87328b6218
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -122,7 +122,6 @@ func (s *statusDB) GetStatusByID(ctx context.Context, id string) (*gtsmodel.Stat
Where("status.id = ?", id) Where("status.id = ?", id)
err := processErrorResponse(q.Scan(ctx)) err := processErrorResponse(q.Scan(ctx))
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -145,7 +144,6 @@ func (s *statusDB) GetStatusByURI(ctx context.Context, uri string) (*gtsmodel.St
Where("LOWER(status.uri) = LOWER(?)", uri) Where("LOWER(status.uri) = LOWER(?)", uri)
err := processErrorResponse(q.Scan(ctx)) err := processErrorResponse(q.Scan(ctx))
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -168,7 +166,6 @@ func (s *statusDB) GetStatusByURL(ctx context.Context, uri string) (*gtsmodel.St
Where("LOWER(status.url) = LOWER(?)", uri) Where("LOWER(status.url) = LOWER(?)", uri)
err := processErrorResponse(q.Scan(ctx)) err := processErrorResponse(q.Scan(ctx))
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -206,7 +203,7 @@ func (s *statusDB) PutStatus(ctx context.Context, status *gtsmodel.Status) db.Er
for _, a := range status.Attachments { for _, a := range status.Attachments {
a.StatusID = status.ID a.StatusID = status.ID
a.UpdatedAt = time.Now() a.UpdatedAt = time.Now()
if _, err := s.conn.NewUpdate().Model(a). if _, err := tx.NewUpdate().Model(a).
Where("id = ?", a.ID). Where("id = ?", a.ID).
Exec(ctx); err != nil { Exec(ctx); err != nil {
return err return err