update the feature toggle usage in backend (#56787)

pull/56796/head
ying-jeanne 3 years ago committed by GitHub
parent 10c080dad1
commit 80ede174dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      packages/grafana-data/src/types/featureToggles.gen.ts
  2. 5
      pkg/services/featuremgmt/registry.go
  3. 4
      pkg/services/featuremgmt/toggles_gen.go
  4. 2
      pkg/services/sqlstore/sqlstore.go

@ -74,4 +74,5 @@ export interface FeatureToggles {
increaseInMemDatabaseQueryCache?: boolean;
newPanelChromeUI?: boolean;
queryLibrary?: boolean;
mysqlAnsiQuotes?: boolean;
}

@ -322,5 +322,10 @@ var (
State: FeatureStateAlpha,
RequiresDevMode: true,
},
{
Name: "mysqlAnsiQuotes",
Description: "Use double quote to escape keyword in Mysql query",
State: FeatureStateAlpha,
},
}
)

@ -238,4 +238,8 @@ const (
// FlagQueryLibrary
// Reusable query library
FlagQueryLibrary = "queryLibrary"
// FlagMysqlAnsiQuotes
// Use double quote to escape keyword in Mysql query
FlagMysqlAnsiQuotes = "mysqlAnsiQuotes"
)

@ -289,7 +289,7 @@ func (ss *SQLStore) buildConnectionString() (string, error) {
cnnstr += fmt.Sprintf("&tx_isolation=%s", val)
}
if ss.Cfg.IsFeatureToggleEnabled("mysqlAnsiQuotes") || ss.Cfg.IsFeatureToggleEnabled("newDBLibrary") {
if ss.Cfg.IsFeatureToggleEnabled(featuremgmt.FlagMysqlAnsiQuotes) || ss.Cfg.IsFeatureToggleEnabled("newDBLibrary") {
cnnstr += "&sql_mode='ANSI_QUOTES'"
}

Loading…
Cancel
Save