From b49a195839ae388184c5111464d8ea3dbe03772b Mon Sep 17 00:00:00 2001 From: Lars Lehtonen Date: Mon, 13 Jul 2020 01:58:55 -0700 Subject: models: fix xorm variable clobber (#12231) NewTestEngine() takes a *xorm.Engine as its argument, and then immediately overwrites it. This fixes the model package to not take an unneeded variable, and changes the routers package to not create a nil *xorm.Engine that is immediately discarded by model. --- models/models.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'models') diff --git a/models/models.go b/models/models.go index 7f12d6260a..79a549b74b 100644 --- a/models/models.go +++ b/models/models.go @@ -151,7 +151,7 @@ func getEngine() (*xorm.Engine, error) { } // NewTestEngine sets a new test xorm.Engine -func NewTestEngine(x *xorm.Engine) (err error) { +func NewTestEngine() (err error) { x, err = getEngine() if err != nil { return fmt.Errorf("Connect to database: %v", err) -- cgit v1.2.3