remove mysqlAnsiQuotes FF

This commit is contained in:
Ryan McKinley
2025-11-18 22:40:04 +03:00
parent 2f591aaaeb
commit ffd34a8bb6
7 changed files with 4 additions and 22 deletions
-4
View File
@@ -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;
-6
View File
@@ -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",
-1
View File
@@ -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
1 Name Stage Owner requiresDevMode RequiresRestart FrontendOnly
11 grpcServer preview @grafana/search-and-storage false false false
12 cloudWatchCrossAccountQuerying GA @grafana/aws-datasources false false false
13 showDashboardValidationWarnings experimental @grafana/dashboards-squad false false false
mysqlAnsiQuotes experimental @grafana/search-and-storage false false false
14 alertingBacktesting experimental @grafana/alerting-squad false false false
15 logsContextDatasourceUi GA @grafana/observability-logs false false true
16 lokiShardSplitting experimental @grafana/observability-logs false false true
-4
View File
@@ -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"
+2 -1
View File
@@ -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",
+1 -5
View File
@@ -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")
@@ -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'",
},
}