From f3753712e09b66cd88437b5581c83f3526d137dd Mon Sep 17 00:00:00 2001 From: Carl Bergquist Date: Mon, 11 Mar 2019 07:22:54 +0100 Subject: [PATCH] Revert "Fix Datasource Update to no User/Password" --- pkg/services/sqlstore/datasource.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/services/sqlstore/datasource.go b/pkg/services/sqlstore/datasource.go index 36fd7c5b023..071577eb6d6 100644 --- a/pkg/services/sqlstore/datasource.go +++ b/pkg/services/sqlstore/datasource.go @@ -174,6 +174,11 @@ 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 @@ -185,7 +190,7 @@ func UpdateDataSource(cmd *m.UpdateDataSourceCommand) error { updateSession = sess.Where("id=? and org_id=?", ds.Id, ds.OrgId) } - affected, err := updateSession.AllCols().Omit("created").Update(ds) + affected, err := updateSession.Update(ds) if err != nil { return err }