Switch to using in-mem sequence generator only when explicitly configured in connection string. Move spanner-related functions to pkg/util/spanner. (#103363)

* Switch to using in-mem sequence generator only when explicitly configured in connection string.
Move spanner-related functions to pkg/util/spanner.
This commit is contained in:
Peter Štibraný
2025-04-08 16:36:37 +02:00
committed by GitHub
parent 6e134ed974
commit 4efdef9b9c
5 changed files with 46 additions and 39 deletions
@@ -17,6 +17,7 @@ import (
"google.golang.org/grpc/codes"
"xorm.io/core"
utilspanner "github.com/grafana/grafana/pkg/util/spanner"
"xorm.io/xorm"
_ "embed"
@@ -290,7 +291,7 @@ func (s *SpannerDialect) executeDDLStatements(ctx context.Context, engine *xorm.
return err
}
opts := xorm.SpannerConnectorConfigToClientOptions(cfg)
opts := utilspanner.ConnectorConfigToClientOptions(cfg)
databaseAdminClient, err := database.NewDatabaseAdminClient(ctx, opts...)
if err != nil {
+1 -1
View File
@@ -191,7 +191,7 @@ func spannerTestDB() (*TestDB, error) {
// $ curl "localhost:9020/v1/projects/grafanatest/instances/grafanatest/databases" --data '{"createStatement": "CREATE DATABASE `grafanatest`"}'
return &TestDB{
DriverName: "spanner",
ConnStr: fmt.Sprintf("%s/projects/grafanatest/instances/grafanatest/databases/grafanatest;usePlainText=true", host),
ConnStr: fmt.Sprintf("%s/projects/grafanatest/instances/grafanatest/databases/grafanatest;usePlainText=true;inMemSequenceGenerator=true", host),
Cleanup: func() {},
}, nil
}