fixup! Merge branch 'clean-transactional-propsal' into instance_table

This commit is contained in:
Iraq Jaber
2025-06-13 18:12:43 +02:00
parent b1f25a50d9
commit 247491bea3
3 changed files with 5 additions and 7 deletions

View File

@@ -341,7 +341,7 @@ func TestListInstance(t *testing.T) {
testFunc: func() ([]*domain.Instance, database.PoolTest, func()) {
ctx := context.Background()
// create new db to make sure no instances exist
pool, stop, err := newEmbeededDB()
pool, stop, err := newEmbeededDB(ctx)
require.NoError(t, err)
instanceRepo := repository.InstanceRepository(pool)
@@ -374,7 +374,7 @@ func TestListInstance(t *testing.T) {
testFunc: func() ([]*domain.Instance, database.PoolTest, func()) {
ctx := context.Background()
// create new db to make sure no instances exist
pool, stop, err := newEmbeededDB()
pool, stop, err := newEmbeededDB(ctx)
require.NoError(t, err)
instanceRepo := repository.InstanceRepository(pool)

View File

@@ -3,6 +3,5 @@ package repository
import "github.com/zitadel/zitadel/backend/v3/storage/database"
type repository struct {
// builder database.StatementBuilder
client database.QueryExecutor
}

View File

@@ -20,7 +20,8 @@ var pool database.PoolTest
func runTests(m *testing.M) int {
var stop func()
var err error
pool, stop, err = newEmbeededDB()
ctx := context.Background()
pool, stop, err = newEmbeededDB(ctx)
if err != nil {
log.Print(err)
return 1
@@ -30,15 +31,13 @@ func runTests(m *testing.M) int {
return m.Run()
}
func newEmbeededDB() (pool database.PoolTest, stop func(), err error) {
func newEmbeededDB(ctx context.Context) (pool database.PoolTest, stop func(), err error) {
var connector database.Connector
connector, stop, err = embedded.StartEmbedded()
if err != nil {
return nil, nil, fmt.Errorf("unable to start embedded postgres: %w", err)
}
ctx := context.Background()
pool_, err := connector.Connect(ctx)
if err != nil {
return nil, nil, fmt.Errorf("unable to connect to embedded postgres: %w", err)