diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 3aaaa4aba42..313683eea5b 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -71,10 +71,6 @@ export interface FeatureToggles { */ showDashboardValidationWarnings?: boolean; /** - * Use double quotes to escape keyword in a MySQL query - */ - mysqlAnsiQuotes?: boolean; - /** * Rule backtesting API for alerting */ alertingBacktesting?: boolean; diff --git a/pkg/services/featuremgmt/registry.go b/pkg/services/featuremgmt/registry.go index 69893cb94eb..56f6fa585e0 100644 --- a/pkg/services/featuremgmt/registry.go +++ b/pkg/services/featuremgmt/registry.go @@ -104,12 +104,6 @@ var ( Stage: FeatureStageExperimental, Owner: grafanaDashboardsSquad, }, - { - Name: "mysqlAnsiQuotes", - Description: "Use double quotes to escape keyword in a MySQL query", - Stage: FeatureStageExperimental, - Owner: grafanaSearchAndStorageSquad, - }, { Name: "alertingBacktesting", Description: "Rule backtesting API for alerting", diff --git a/pkg/services/featuremgmt/toggles_gen.csv b/pkg/services/featuremgmt/toggles_gen.csv index a6f6bb4a480..28b50a0840b 100644 --- a/pkg/services/featuremgmt/toggles_gen.csv +++ b/pkg/services/featuremgmt/toggles_gen.csv @@ -11,7 +11,6 @@ logRequestsInstrumentedAsUnknown,experimental,@grafana/grafana-backend-group,fal grpcServer,preview,@grafana/search-and-storage,false,false,false cloudWatchCrossAccountQuerying,GA,@grafana/aws-datasources,false,false,false showDashboardValidationWarnings,experimental,@grafana/dashboards-squad,false,false,false -mysqlAnsiQuotes,experimental,@grafana/search-and-storage,false,false,false alertingBacktesting,experimental,@grafana/alerting-squad,false,false,false logsContextDatasourceUi,GA,@grafana/observability-logs,false,false,true lokiShardSplitting,experimental,@grafana/observability-logs,false,false,true diff --git a/pkg/services/featuremgmt/toggles_gen.go b/pkg/services/featuremgmt/toggles_gen.go index ba6d0d3a415..f31bfc978bf 100644 --- a/pkg/services/featuremgmt/toggles_gen.go +++ b/pkg/services/featuremgmt/toggles_gen.go @@ -55,10 +55,6 @@ const ( // Show warnings when dashboards do not validate against the schema FlagShowDashboardValidationWarnings = "showDashboardValidationWarnings" - // FlagMysqlAnsiQuotes - // Use double quotes to escape keyword in a MySQL query - FlagMysqlAnsiQuotes = "mysqlAnsiQuotes" - // FlagAlertingBacktesting // Rule backtesting API for alerting FlagAlertingBacktesting = "alertingBacktesting" diff --git a/pkg/services/featuremgmt/toggles_gen.json b/pkg/services/featuremgmt/toggles_gen.json index 9fc363536d4..80db44fec7a 100644 --- a/pkg/services/featuremgmt/toggles_gen.json +++ b/pkg/services/featuremgmt/toggles_gen.json @@ -2743,7 +2743,8 @@ "metadata": { "name": "mysqlAnsiQuotes", "resourceVersion": "1753448760331", - "creationTimestamp": "2022-10-12T11:43:35Z" + "creationTimestamp": "2022-10-12T11:43:35Z", + "deletionTimestamp": "2025-11-18T19:38:17Z" }, "spec": { "description": "Use double quotes to escape keyword in a MySQL query", diff --git a/pkg/services/sqlstore/database_config.go b/pkg/services/sqlstore/database_config.go index 65cb51d6f04..15679e030a6 100644 --- a/pkg/services/sqlstore/database_config.go +++ b/pkg/services/sqlstore/database_config.go @@ -166,11 +166,7 @@ func (dbCfg *DatabaseConfig) buildConnectionString(cfg *setting.Cfg, features fe cnnstr += fmt.Sprintf("&transaction_isolation=%s", val) } - //nolint:staticcheck // not yet migrated to OpenFeature - if features != nil && features.IsEnabledGlobally(featuremgmt.FlagMysqlAnsiQuotes) { - cnnstr += "&sql_mode='ANSI_QUOTES'" - } - + cnnstr += "&sql_mode='ANSI_QUOTES'" cnnstr += buildExtraConnectionString('&', dbCfg.UrlQueryParams) case migrator.Postgres: addr, err := util.SplitHostPortDefault(dbCfg.Host, "127.0.0.1", "5432") diff --git a/pkg/services/sqlstore/database_config_test.go b/pkg/services/sqlstore/database_config_test.go index 4c398a1d183..e180051d6cf 100644 --- a/pkg/services/sqlstore/database_config_test.go +++ b/pkg/services/sqlstore/database_config_test.go @@ -100,7 +100,7 @@ var databaseConfigTestCases = []databaseConfigTest{ name: "MySQL with ANSI_QUOTES mode", dbType: "mysql", dbHost: "[::1]", - features: featuremgmt.WithFeatures(featuremgmt.FlagMysqlAnsiQuotes), + features: featuremgmt.WithFeatures(), expConnStr: ":@tcp([::1])/test_db?collation=utf8mb4_unicode_ci&allowNativePasswords=true&clientFoundRows=true&parseTime=true&sql_mode='ANSI_QUOTES'", }, }