fix: postgres/mysql engine cache was not being used, fixes #12636 (#12642)

e413f026 · Torkel Ödegaard · GitHub · ce64a3cc · e413f026 · e413f026
Commit e413f026 authored Jul 18, 2018 by Torkel Ödegaard Committed by GitHub Jul 18, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletions

devenv/datasources.yaml
+3 -1

pkg/tsdb/sql_engine.go
+1 -0

No files found.
--- a/devenv/datasources.yaml
+++ b/devenv/datasources.yaml
@@ -63,7 +63,8 @@ datasources:
    url: localhost:5432
    database: grafana
    user: grafana
-    password: password
+    secureJsonData:
+      password: password
    jsonData:
      sslmode: "disable"

@@ -74,3 +75,4 @@ datasources:
      authType: credentials
      defaultRegion: eu-west-2

+
--- a/pkg/tsdb/sql_engine.go
+++ b/pkg/tsdb/sql_engine.go
@@ -68,6 +68,7 @@ func (e *DefaultSqlEngine) InitEngine(driverName string, dsInfo *models.DataSour
 	engine.SetMaxOpenConns(10)
 	engine.SetMaxIdleConns(10)

+	engineCache.versions[dsInfo.Id] = dsInfo.Version
 	engineCache.cache[dsInfo.Id] = engine
 	e.XormEngine = engine