Skip to content

Commit 9d5830b

Browse files
committed
Fix sqlite test
1 parent 358e1bf commit 9d5830b

File tree

1 file changed

+15
-12
lines changed

1 file changed

+15
-12
lines changed

models/migrations/v184.go

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,33 @@ func renameTaskErrorsToMessage(x *xorm.Engine) error {
2020
Status int `xorm:"index"`
2121
}
2222

23-
sess := x.NewSession()
24-
defer sess.Close()
25-
if err := sess.Begin(); err != nil {
26-
return err
27-
}
28-
29-
if err := sess.Sync2(new(Task)); err != nil {
30-
return fmt.Errorf("error on Sync2: %v", err)
31-
}
32-
3323
// This migration maybe rerun so that we should check if it has been run
34-
exist, err := x.Dialect().IsColumnExist(x.DB(), context.Background(), "task", "message")
24+
messageExist, err := x.Dialect().IsColumnExist(x.DB(), context.Background(), "task", "message")
3525
if err != nil {
3626
return err
3727
}
38-
if exist {
28+
29+
if messageExist {
3930
errorsExist, err := x.Dialect().IsColumnExist(x.DB(), context.Background(), "task", "errors")
4031
if err != nil {
4132
return err
4233
}
4334
if !errorsExist {
4435
return nil
4536
}
37+
}
38+
39+
sess := x.NewSession()
40+
defer sess.Close()
41+
if err := sess.Begin(); err != nil {
42+
return err
43+
}
44+
45+
if err := sess.Sync2(new(Task)); err != nil {
46+
return fmt.Errorf("error on Sync2: %v", err)
47+
}
4648

49+
if messageExist {
4750
// if both errors and message exist, drop message at first
4851
if err := dropTableColumns(sess, "task", "message"); err != nil {
4952
return err

0 commit comments

Comments
 (0)