mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Chore: Enable ANSI_QUOTES for Mysql Database (#53277)
* remove the quote dialect * add environment variable
This commit is contained in:
parent
732c22ed02
commit
ba89471598
@ -281,6 +281,10 @@ func (ss *SQLStore) buildConnectionString() (string, error) {
|
|||||||
cnnstr += fmt.Sprintf("&tx_isolation=%s", val)
|
cnnstr += fmt.Sprintf("&tx_isolation=%s", val)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ss.Cfg.IsFeatureToggleEnabled("mysqlAnsiQuotes") {
|
||||||
|
cnnstr += "&sql_mode='ANSI_QUOTES'"
|
||||||
|
}
|
||||||
|
|
||||||
cnnstr += ss.buildExtraConnectionString('&')
|
cnnstr += ss.buildExtraConnectionString('&')
|
||||||
case migrator.Postgres:
|
case migrator.Postgres:
|
||||||
addr, err := util.SplitHostPortDefault(ss.dbCfg.Host, "127.0.0.1", "5432")
|
addr, err := util.SplitHostPortDefault(ss.dbCfg.Host, "127.0.0.1", "5432")
|
||||||
|
@ -72,6 +72,12 @@ var sqlStoreTestCases = []sqlStoreTest{
|
|||||||
dbURL: "://invalid.com/",
|
dbURL: "://invalid.com/",
|
||||||
err: &url.Error{Op: "parse", URL: "://invalid.com/", Err: errors.New("missing protocol scheme")},
|
err: &url.Error{Op: "parse", URL: "://invalid.com/", Err: errors.New("missing protocol scheme")},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "Sql mode set to ANSI_QUOTES",
|
||||||
|
dbType: "mysql",
|
||||||
|
dbHost: "[::1]",
|
||||||
|
connStrValues: []string{"sql_mode='ANSI_QUOTES'"},
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestIntegrationSQLConnectionString(t *testing.T) {
|
func TestIntegrationSQLConnectionString(t *testing.T) {
|
||||||
@ -112,5 +118,7 @@ func makeSQLStoreTestConfig(t *testing.T, dbType, host, dbURL string) *setting.C
|
|||||||
_, err = sec.NewKey("password", "pass")
|
_, err = sec.NewKey("password", "pass")
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
cfg.IsFeatureToggleEnabled = func(key string) bool { return true }
|
||||||
|
|
||||||
return cfg
|
return cfg
|
||||||
}
|
}
|
||||||
|
@ -28,9 +28,13 @@ func MySQLTestDB() TestDB {
|
|||||||
if port == "" {
|
if port == "" {
|
||||||
port = "3306"
|
port = "3306"
|
||||||
}
|
}
|
||||||
|
conn_str := fmt.Sprintf("grafana:password@tcp(%s:%s)/grafana_tests?collation=utf8mb4_unicode_ci", host, port)
|
||||||
|
if _, present := os.LookupEnv("MYSQL_ANSI_QUOTES"); present {
|
||||||
|
conn_str += "&sql_mode='ANSI_QUOTES'"
|
||||||
|
}
|
||||||
return TestDB{
|
return TestDB{
|
||||||
DriverName: "mysql",
|
DriverName: "mysql",
|
||||||
ConnStr: fmt.Sprintf("grafana:password@tcp(%s:%s)/grafana_tests?collation=utf8mb4_unicode_ci", host, port),
|
ConnStr: conn_str,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user