diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 076df3bf7a0..f7e138cead5 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -74,4 +74,5 @@ export interface FeatureToggles { increaseInMemDatabaseQueryCache?: boolean; newPanelChromeUI?: boolean; queryLibrary?: boolean; + mysqlAnsiQuotes?: boolean; } diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 3594ca7fc7c..baab1ce520a 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -322,5 +322,10 @@ var ( State: FeatureStateAlpha, RequiresDevMode: true, }, + { + Name: "mysqlAnsiQuotes", + Description: "Use double quote to escape keyword in Mysql query", + State: FeatureStateAlpha, + }, } ) diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index 10eb8143ef5..a77b6d8d80e 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -238,4 +238,8 @@ const ( // FlagQueryLibrary // Reusable query library FlagQueryLibrary = "queryLibrary" + + // FlagMysqlAnsiQuotes + // Use double quote to escape keyword in Mysql query + FlagMysqlAnsiQuotes = "mysqlAnsiQuotes" ) diff --git a/pkg/services/sqlstore/sqlstore.go b/pkg/services/sqlstore/sqlstore.go index ef50821c462..b037b78721c 100644 --- a/pkg/services/sqlstore/sqlstore.go +++ b/pkg/services/sqlstore/sqlstore.go @@ -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'" }