From 09cd173e9249d5e54cf3c304d2430f0390c68f45 Mon Sep 17 00:00:00 2001 From: Maddin-619 Date: Fri, 22 Feb 2019 14:19:15 +0100 Subject: [PATCH 1/2] updates all cols except created so user and password of the database can be chaned to no user and password --- pkg/services/sqlstore/datasource.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/services/sqlstore/datasource.go b/pkg/services/sqlstore/datasource.go index ccab1106880..65d8369d763 100644 --- a/pkg/services/sqlstore/datasource.go +++ b/pkg/services/sqlstore/datasource.go @@ -180,7 +180,7 @@ func UpdateDataSource(cmd *m.UpdateDataSourceCommand) error { updateSession = sess.Where("id=? and org_id=?", ds.Id, ds.OrgId) } - affected, err := updateSession.Update(ds) + affected, err := updateSession.AllCols().Omit("created").Update(ds) if err != nil { return err } From ae9327ff3ac5c9f54e5add0ad4629739e34cb9a9 Mon Sep 17 00:00:00 2001 From: bergquist Date: Tue, 5 Mar 2019 13:41:40 +0100 Subject: [PATCH 2/2] remove `UseBool` since we use `AllCols` --- pkg/services/sqlstore/datasource.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkg/services/sqlstore/datasource.go b/pkg/services/sqlstore/datasource.go index 65d8369d763..ef42051f738 100644 --- a/pkg/services/sqlstore/datasource.go +++ b/pkg/services/sqlstore/datasource.go @@ -164,11 +164,6 @@ func UpdateDataSource(cmd *m.UpdateDataSourceCommand) error { Version: cmd.Version + 1, } - sess.UseBool("is_default") - sess.UseBool("basic_auth") - sess.UseBool("with_credentials") - sess.UseBool("read_only") - var updateSession *xorm.Session if cmd.Version != 0 { // the reason we allow cmd.version > db.version is make it possible for people to force