public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SQL Store: Fix parse time setup (#92484)

Browse Source
This commit is contained in:
Stephanie Hingtgen
2024-08-27 08:39:27 -06:00
committed by GitHub
parent aba4b42973
commit a4266df16d
3 changed files with 81 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/sqlstore/sqlstore.go
+12 -20
View File
@@ -61,11 +61,10 @@ func ProvideService(cfg *setting.Cfg,
// by that mimic the functionality of how it was functioning before
// xorm's changes above.
xorm.DefaultPostgresSchema = ""
s, err := newSQLStore(cfg, nil, migrations, bus, tracer)
s, err := newSQLStore(cfg, nil, features, migrations, bus, tracer)
if err != nil {
return nil, err
}
s.features = features
if err := s.Migrate(s.dbCfg.MigrationLock); err != nil {
return nil, err
@@ -100,18 +99,10 @@ func ProvideServiceForTests(t sqlutil.ITestDB, cfg *setting.Cfg, features featur
func NewSQLStoreWithoutSideEffects(cfg *setting.Cfg,
features featuremgmt.FeatureToggles,
bus bus.Bus, tracer tracing.Tracer) (*SQLStore, error) {
s, err := newSQLStore(cfg, nil, nil, bus, tracer)
if err != nil {
return nil, err
}
s.features = features
s.tracer = tracer
return s, nil
return newSQLStore(cfg, nil, features, nil, bus, tracer)
}
func newSQLStore(cfg *setting.Cfg, engine *xorm.Engine,
func newSQLStore(cfg *setting.Cfg, engine *xorm.Engine, features featuremgmt.FeatureToggles,
migrations registry.DatabaseMigrator, bus bus.Bus, tracer tracing.Tracer, opts ...InitTestDBOpt) (*SQLStore, error) {
ss := &SQLStore{
cfg: cfg,
@@ -120,6 +111,7 @@ func newSQLStore(cfg *setting.Cfg, engine *xorm.Engine,
migrations: migrations,
bus: bus,
tracer: tracer,
features: features,
}
for _, opt := range opts {
if !opt.EnsureDefaultOrgAndUser {
@@ -296,24 +288,24 @@ func (ss *SQLStore) initEngine(engine *xorm.Engine) error {
}
}
if engine == nil {
connection := ss.dbCfg.ConnectionString
// Ensure that parseTime is enabled for MySQL
if ss.dbCfg.Type == migrator.MySQL && !strings.Contains(connection, "parseTime=") {
if ss.features.IsEnabledGlobally(featuremgmt.FlagMysqlParseTime) {
connection += "&parseTime=true"
if ss.features.IsEnabledGlobally(featuremgmt.FlagMysqlParseTime) && ss.dbCfg.Type == migrator.MySQL && !strings.Contains(ss.dbCfg.ConnectionString, "parseTime=") {
if strings.Contains(ss.dbCfg.ConnectionString, "?") {
ss.dbCfg.ConnectionString += "&parseTime=true"
} else {
ss.dbCfg.ConnectionString += "?parseTime=true"
}
}
var err error
engine, err = xorm.NewEngine(ss.dbCfg.Type, connection)
engine, err = xorm.NewEngine(ss.dbCfg.Type, ss.dbCfg.ConnectionString)
if err != nil {
return err
}
// Only for MySQL or MariaDB, verify we can connect with the current connection string's system var for transaction isolation.
// If not, create a new engine with a compatible connection string.
if ss.dbCfg.Type == migrator.MySQL {
engine, err = ss.ensureTransactionIsolationCompatibility(engine, connection)
engine, err = ss.ensureTransactionIsolationCompatibility(engine, ss.dbCfg.ConnectionString)
if err != nil {
return err
}
@@ -603,7 +595,7 @@ func TestMain(m *testing.M) {
tracer := tracing.InitializeTracerForTest()
bus := bus.ProvideBus(tracer)
testSQLStore, err = newSQLStore(cfg, engine, migration, bus, tracer, opts...)
testSQLStore, err = newSQLStore(cfg, engine, features, migration, bus, tracer, opts...)
if err != nil {
return nil, err
}