Merge branch 'master' into develop

2025-02-25 18:55:37 -06:00 · 2017-11-17 15:49:17 +01:00
parent 10fcf2f5be 6595be95eb
commit 0e44fe082b
177 changed files with 14293 additions and 1263 deletions
--- a/pkg/services/sqlstore/datasource_test.go
+++ b/pkg/services/sqlstore/datasource_test.go
@@ -47,6 +47,7 @@ func TestDataAccess(t *testing.T) {
 				Access:   m.DS_ACCESS_DIRECT,
 				Url:      "http://test",
 				Database: "site",
+				ReadOnly: true,
 			})

 			So(err, ShouldBeNil)
@@ -61,6 +62,7 @@ func TestDataAccess(t *testing.T) {

 			So(ds.OrgId, ShouldEqual, 10)
 			So(ds.Database, ShouldEqual, "site")
+			So(ds.ReadOnly, ShouldBeTrue)
 		})

 		Convey("Given a datasource", func() {