test: Rename GetDB to NewDB

As now we create a new database on each call of the
glsql.GetDB and do not re-use existing database created
on a first call of the function we rename the function.
NewDB is self-explanatory.

29 files changed, 68 insertions, 68 deletions

diff --git a/cmd/praefect/subcmd_accept_dataloss_test.go b/cmd/praefect/subcmd_accept_dataloss_test.go
index 7316d599c..ef5187227 100644
--- a/cmd/praefect/subcmd_accept_dataloss_test.go
+++ b/cmd/praefect/subcmd_accept_dataloss_test.go
@@ -35,7 +35,7 @@ func TestAcceptDatalossSubcommand(t *testing.T) {
 	ctx, cancel := testhelper.Context()
 	defer cancel()
 
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 	rs := datastore.NewPostgresRepositoryStore(db, conf.StorageNames())
 	startingGenerations := map[string]int{st1: 1, st2: 0, st3: datastore.GenerationUnknown}
 
diff --git a/cmd/praefect/subcmd_dataloss_test.go b/cmd/praefect/subcmd_dataloss_test.go
index 6f033dcef..8fce062ce 100644
--- a/cmd/praefect/subcmd_dataloss_test.go
+++ b/cmd/praefect/subcmd_dataloss_test.go
@@ -40,7 +40,7 @@ func TestDatalossSubcommand(t *testing.T) {
 		},
 	}
 
-	tx := glsql.GetDB(t).Begin(t)
+	tx := glsql.NewDB(t).Begin(t)
 	defer tx.Rollback(t)
 
 	ctx, cancel := testhelper.Context()
diff --git a/cmd/praefect/subcmd_set_replication_factor_test.go b/cmd/praefect/subcmd_set_replication_factor_test.go
index 8a8139f28..b2eaa0226 100644
--- a/cmd/praefect/subcmd_set_replication_factor_test.go
+++ b/cmd/praefect/subcmd_set_replication_factor_test.go
@@ -17,7 +17,7 @@ import (
 )
 
 func TestSetReplicationFactorSubcommand(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	for _, tc := range []struct {
 		desc   string
diff --git a/internal/praefect/auth_test.go b/internal/praefect/auth_test.go
index 09fffe77d..9ed2b146f 100644
--- a/internal/praefect/auth_test.go
+++ b/internal/praefect/auth_test.go
@@ -149,7 +149,7 @@ func runServer(t *testing.T, token string, required bool) (*grpc.Server, string,
 		},
 	}
 	logEntry := testhelper.DiscardTestEntry(t)
-	queue := datastore.NewPostgresReplicationEventQueue(glsql.GetDB(t))
+	queue := datastore.NewPostgresReplicationEventQueue(glsql.NewDB(t))
 
 	nodeMgr, err := nodes.NewManager(logEntry, conf, nil, nil, promtest.NewMockHistogramVec(), protoregistry.GitalyProtoPreregistered, nil, nil)
 	require.NoError(t, err)
diff --git a/internal/praefect/coordinator_pg_test.go b/internal/praefect/coordinator_pg_test.go
index 4ee32062f..4cdd0ce54 100644
--- a/internal/praefect/coordinator_pg_test.go
+++ b/internal/praefect/coordinator_pg_test.go
@@ -154,7 +154,7 @@ func TestStreamDirectorMutator_Transaction(t *testing.T) {
 		},
 	}
 
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	for _, tc := range testcases {
 		t.Run(tc.desc, func(t *testing.T) {
diff --git a/internal/praefect/coordinator_test.go b/internal/praefect/coordinator_test.go
index 2f82c9243..99b906957 100644
--- a/internal/praefect/coordinator_test.go
+++ b/internal/praefect/coordinator_test.go
@@ -60,7 +60,7 @@ func TestSecondaryRotation(t *testing.T) {
 }
 
 func TestStreamDirectorReadOnlyEnforcement(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 	for _, tc := range []struct {
 		desc     string
 		readOnly bool
@@ -154,7 +154,7 @@ func TestStreamDirectorMutator(t *testing.T) {
 
 	var replEventWait sync.WaitGroup
 
-	queueInterceptor := datastore.NewReplicationEventQueueInterceptor(datastore.NewPostgresReplicationEventQueue(glsql.GetDB(t)))
+	queueInterceptor := datastore.NewReplicationEventQueueInterceptor(datastore.NewPostgresReplicationEventQueue(glsql.NewDB(t)))
 	queueInterceptor.OnEnqueue(func(ctx context.Context, event datastore.ReplicationEvent, queue datastore.ReplicationEventQueue) (datastore.ReplicationEvent, error) {
 		defer replEventWait.Done()
 		return queue.Enqueue(ctx, event)
@@ -285,7 +285,7 @@ func TestStreamDirectorMutator_StopTransaction(t *testing.T) {
 	txMgr := transactions.NewManager(conf)
 
 	coordinator := NewCoordinator(
-		datastore.NewPostgresReplicationEventQueue(glsql.GetDB(t)),
+		datastore.NewPostgresReplicationEventQueue(glsql.NewDB(t)),
 		rs,
 		NewNodeManagerRouter(nodeMgr, rs),
 		txMgr,
@@ -377,7 +377,7 @@ func TestStreamDirectorAccessor(t *testing.T) {
 		},
 	}
 
-	queue := datastore.NewPostgresReplicationEventQueue(glsql.GetDB(t))
+	queue := datastore.NewPostgresReplicationEventQueue(glsql.NewDB(t))
 
 	targetRepo := gitalypb.Repository{
 		StorageName:  "praefect",
@@ -482,7 +482,7 @@ func TestCoordinatorStreamDirector_distributesReads(t *testing.T) {
 		},
 	}
 
-	queue := datastore.NewPostgresReplicationEventQueue(glsql.GetDB(t))
+	queue := datastore.NewPostgresReplicationEventQueue(glsql.NewDB(t))
 
 	targetRepo := gitalypb.Repository{
 		StorageName:  "praefect",
@@ -739,7 +739,7 @@ func TestStreamDirector_repo_creation(t *testing.T) {
 	// records need to be created in the database.
 	defer testhelper.ModifyEnvironment(t, "GITALY_TEST_PRAEFECT_BIN", "")()
 
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	for _, tc := range []struct {
 		desc              string
@@ -1015,7 +1015,7 @@ func TestAbsentCorrelationID(t *testing.T) {
 
 	var replEventWait sync.WaitGroup
 
-	queueInterceptor := datastore.NewReplicationEventQueueInterceptor(datastore.NewPostgresReplicationEventQueue(glsql.GetDB(t)))
+	queueInterceptor := datastore.NewReplicationEventQueueInterceptor(datastore.NewPostgresReplicationEventQueue(glsql.NewDB(t)))
 	queueInterceptor.OnEnqueue(func(ctx context.Context, event datastore.ReplicationEvent, queue datastore.ReplicationEventQueue) (datastore.ReplicationEvent, error) {
 		defer replEventWait.Done()
 		return queue.Enqueue(ctx, event)
diff --git a/internal/praefect/datastore/assignment_test.go b/internal/praefect/datastore/assignment_test.go
index e28796f70..c27f6dc81 100644
--- a/internal/praefect/datastore/assignment_test.go
+++ b/internal/praefect/datastore/assignment_test.go
@@ -15,7 +15,7 @@ func TestAssignmentStore_GetHostAssignments(t *testing.T) {
 		storage        string
 	}
 
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	configuredStorages := []string{"storage-1", "storage-2", "storage-3"}
 	for _, tc := range []struct {
@@ -117,7 +117,7 @@ func TestAssignmentStore_SetReplicationFactor(t *testing.T) {
 		}
 	}
 
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	for _, tc := range []struct {
 		desc                  string
diff --git a/internal/praefect/datastore/collector_test.go b/internal/praefect/datastore/collector_test.go
index 63e21b862..dc23889a8 100644
--- a/internal/praefect/datastore/collector_test.go
+++ b/internal/praefect/datastore/collector_test.go
@@ -30,7 +30,7 @@ func TestRepositoryStoreCollector(t *testing.T) {
 		replicas     replicas
 	}
 
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	for _, tc := range []struct {
 		desc         string
diff --git a/internal/praefect/datastore/glsql/postgres_test.go b/internal/praefect/datastore/glsql/postgres_test.go
index af61aae47..86a990d51 100644
--- a/internal/praefect/datastore/glsql/postgres_test.go
+++ b/internal/praefect/datastore/glsql/postgres_test.go
@@ -61,7 +61,7 @@ func TestUint64Provider(t *testing.T) {
 }
 
 func TestScanAll(t *testing.T) {
-	db := GetDB(t)
+	db := NewDB(t)
 
 	var ids Uint64Provider
 	notEmptyRows, err := db.Query("SELECT id FROM (VALUES (1), (200), (300500)) AS t(id)")
diff --git a/internal/praefect/datastore/glsql/testing.go b/internal/praefect/datastore/glsql/testing.go
index d37f05056..d1cc2806e 100644
--- a/internal/praefect/datastore/glsql/testing.go
+++ b/internal/praefect/datastore/glsql/testing.go
@@ -113,7 +113,7 @@ func (db DB) Close() error {
 	return nil
 }
 
-// GetDB returns a wrapper around the database connection pool.
+// NewDB returns a wrapper around the database connection pool.
 // Must be used only for testing.
 // The new database with empty relations will be created for each call of this function.
 // It uses env vars:
@@ -121,14 +121,14 @@ func (db DB) Close() error {
 //   PGPORT - required, binding port
 //   PGUSER - optional, user - `$ whoami` would be used if not provided
 // Once the test is completed the database will be dropped on test cleanup execution.
-func GetDB(t testing.TB) DB {
+func NewDB(t testing.TB) DB {
 	t.Helper()
 	database := "praefect_" + strings.ReplaceAll(uuid.New().String(), "-", "")
 	return DB{DB: initPraefectTestDB(t, database), Name: database}
 }
 
 // GetDBConfig returns the database configuration determined by
-// environment variables.  See GetDB() for the list of variables.
+// environment variables.  See NewDB() for the list of variables.
 func GetDBConfig(t testing.TB, database string) config.DB {
 	getEnvFromGDK(t)
 
diff --git a/internal/praefect/datastore/glsql/testing_test.go b/internal/praefect/datastore/glsql/testing_test.go
index 6da38e048..1f6259b55 100644
--- a/internal/praefect/datastore/glsql/testing_test.go
+++ b/internal/praefect/datastore/glsql/testing_test.go
@@ -7,7 +7,7 @@ import (
 )
 
 func TestDB_Truncate(t *testing.T) {
-	db := GetDB(t)
+	db := NewDB(t)
 
 	_, err := db.Exec("CREATE TABLE truncate_tbl(id BIGSERIAL PRIMARY KEY)")
 	require.NoError(t, err)
diff --git a/internal/praefect/datastore/listener_postgres_test.go b/internal/praefect/datastore/listener_postgres_test.go
index 7c39503e4..ac9b12a28 100644
--- a/internal/praefect/datastore/listener_postgres_test.go
+++ b/internal/praefect/datastore/listener_postgres_test.go
@@ -84,7 +84,7 @@ func (mlh mockListenHandler) Connected() {
 }
 
 func TestPostgresListener_Listen(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	logger := testhelper.NewTestLogger(t)
 
@@ -365,7 +365,7 @@ func requireEqualNotificationEntries(t *testing.T, d string, entries []notificat
 }
 
 func TestPostgresListener_Listen_repositories_delete(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	const channel = "repositories_updates"
 
@@ -397,7 +397,7 @@ func TestPostgresListener_Listen_repositories_delete(t *testing.T) {
 }
 
 func TestPostgresListener_Listen_storage_repositories_insert(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	const channel = "storage_repositories_updates"
 
@@ -422,7 +422,7 @@ func TestPostgresListener_Listen_storage_repositories_insert(t *testing.T) {
 }
 
 func TestPostgresListener_Listen_storage_repositories_update(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	const channel = "storage_repositories_updates"
 
@@ -446,7 +446,7 @@ func TestPostgresListener_Listen_storage_repositories_update(t *testing.T) {
 }
 
 func TestPostgresListener_Listen_storage_empty_notification(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	const channel = "storage_repositories_updates"
 
@@ -464,7 +464,7 @@ func TestPostgresListener_Listen_storage_empty_notification(t *testing.T) {
 }
 
 func TestPostgresListener_Listen_storage_repositories_delete(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	const channel = "storage_repositories_updates"
 
diff --git a/internal/praefect/datastore/postgres_test.go b/internal/praefect/datastore/postgres_test.go
index 9908a386e..257fc46f0 100644
--- a/internal/praefect/datastore/postgres_test.go
+++ b/internal/praefect/datastore/postgres_test.go
@@ -9,7 +9,7 @@ import (
 )
 
 func TestMigrateStatus(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	config := config.Config{
 		DB: glsql.GetDBConfig(t, db.Name),
diff --git a/internal/praefect/datastore/queue_bm_test.go b/internal/praefect/datastore/queue_bm_test.go
index dc294bbba..8fea25258 100644
--- a/internal/praefect/datastore/queue_bm_test.go
+++ b/internal/praefect/datastore/queue_bm_test.go
@@ -31,7 +31,7 @@ func BenchmarkPostgresReplicationEventQueue_Acknowledge(b *testing.B) {
 }
 
 func benchmarkPostgresReplicationEventQueueAcknowledge(b *testing.B, setup map[JobState]int) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(b)
 
 	ctx, cancel := testhelper.Context()
 	defer cancel()
diff --git a/internal/praefect/datastore/queue_test.go b/internal/praefect/datastore/queue_test.go
index ce68a6775..93caabcaa 100644
--- a/internal/praefect/datastore/queue_test.go
+++ b/internal/praefect/datastore/queue_test.go
@@ -13,7 +13,7 @@ import (
 )
 
 func TestPostgresReplicationEventQueue_DeleteReplicaUniqueIndex(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 	for _, tc := range []struct {
 		desc        string
 		existingJob *ReplicationEvent
@@ -152,7 +152,7 @@ func TestPostgresReplicationEventQueue_DeleteReplicaUniqueIndex(t *testing.T) {
 }
 
 func TestPostgresReplicationEventQueue_Enqueue(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	ctx, cancel := testhelper.Context()
 	defer cancel()
@@ -198,7 +198,7 @@ func TestPostgresReplicationEventQueue_Enqueue(t *testing.T) {
 }
 
 func TestPostgresReplicationEventQueue_DeleteReplicaInfiniteAttempts(t *testing.T) {
-	queue := NewPostgresReplicationEventQueue(glsql.GetDB(t))
+	queue := NewPostgresReplicationEventQueue(glsql.NewDB(t))
 
 	ctx, cancel := testhelper.Context()
 	defer cancel()
@@ -248,7 +248,7 @@ func TestPostgresReplicationEventQueue_DeleteReplicaInfiniteAttempts(t *testing.
 }
 
 func TestPostgresReplicationEventQueue_EnqueueMultiple(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	ctx, cancel := testhelper.Context()
 	defer cancel()
@@ -381,7 +381,7 @@ func TestPostgresReplicationEventQueue_EnqueueMultiple(t *testing.T) {
 }
 
 func TestPostgresReplicationEventQueue_Dequeue(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	ctx, cancel := testhelper.Context()
 	defer cancel()
@@ -429,7 +429,7 @@ func TestPostgresReplicationEventQueue_Dequeue(t *testing.T) {
 
 // expected results are listed as literals on purpose to be more explicit about what is going on with data
 func TestPostgresReplicationEventQueue_DequeueMultiple(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	ctx, cancel := testhelper.Context()
 	defer cancel()
@@ -538,7 +538,7 @@ func TestPostgresReplicationEventQueue_DequeueMultiple(t *testing.T) {
 }
 
 func TestPostgresReplicationEventQueue_DequeueSameStorageOtherRepository(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	ctx, cancel := testhelper.Context()
 	defer cancel()
@@ -600,7 +600,7 @@ func TestPostgresReplicationEventQueue_DequeueSameStorageOtherRepository(t *test
 }
 
 func TestPostgresReplicationEventQueue_Acknowledge(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	ctx, cancel := testhelper.Context()
 	defer cancel()
@@ -643,7 +643,7 @@ func TestPostgresReplicationEventQueue_Acknowledge(t *testing.T) {
 }
 
 func TestPostgresReplicationEventQueue_AcknowledgeMultiple(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	ctx, cancel := testhelper.Context()
 	defer cancel()
@@ -831,7 +831,7 @@ func TestPostgresReplicationEventQueue_StartHealthUpdate(t *testing.T) {
 	eventType4 := eventType1
 	eventType4.Job.TargetNodeStorage = "s-2"
 
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	t.Run("no events is valid", func(t *testing.T) {
 		// 'qc' is not initialized, so the test will fail if there will be an attempt to make SQL operation
@@ -977,7 +977,7 @@ func TestPostgresReplicationEventQueue_AcknowledgeStale(t *testing.T) {
 	eventType4 := eventType3
 	eventType4.Job.TargetNodeStorage = "gitaly-3"
 
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	t.Run("no stale jobs yet", func(t *testing.T) {
 		db.TruncateAll(t)
diff --git a/internal/praefect/datastore/repository_store_bm_test.go b/internal/praefect/datastore/repository_store_bm_test.go
index 3612a9391..f39750114 100644
--- a/internal/praefect/datastore/repository_store_bm_test.go
+++ b/internal/praefect/datastore/repository_store_bm_test.go
@@ -38,7 +38,7 @@ func BenchmarkPostgresRepositoryStore_GetConsistentStorages(b *testing.B) {
 }
 
 func benchmarkGetConsistentStorages(b *testing.B, nstorages, nrepositories int) {
-	db := glsql.GetDB(b)
+	db := glsql.NewDB(b)
 
 	ctx, cancel := testhelper.Context()
 	defer cancel()
diff --git a/internal/praefect/datastore/repository_store_test.go b/internal/praefect/datastore/repository_store_test.go
index 951d2d3a4..c6d1cfe42 100644
--- a/internal/praefect/datastore/repository_store_test.go
+++ b/internal/praefect/datastore/repository_store_test.go
@@ -30,7 +30,7 @@ type requireState func(t *testing.T, ctx context.Context, vss virtualStorageStat
 type repositoryStoreFactory func(t *testing.T, storages map[string][]string) (RepositoryStore, requireState)
 
 func TestRepositoryStore_Postgres(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 	testRepositoryStore(t, func(t *testing.T, storages map[string][]string) (RepositoryStore, requireState) {
 		db.TruncateAll(t)
 		gs := NewPostgresRepositoryStore(db, storages)
@@ -842,7 +842,7 @@ func testRepositoryStore(t *testing.T, newStore repositoryStoreFactory) {
 }
 
 func TestPostgresRepositoryStore_GetPartiallyAvailableRepositories(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 	for _, tc := range []struct {
 		desc                  string
 		nonExistentRepository bool
diff --git a/internal/praefect/helper_test.go b/internal/praefect/helper_test.go
index c25a98c92..bcf587505 100644
--- a/internal/praefect/helper_test.go
+++ b/internal/praefect/helper_test.go
@@ -116,7 +116,7 @@ func withMockBackends(t testing.TB, backends map[string]mock.SimpleServiceServer
 }
 
 func defaultQueue(t testing.TB) datastore.ReplicationEventQueue {
-	return datastore.NewPostgresReplicationEventQueue(glsql.GetDB(t))
+	return datastore.NewPostgresReplicationEventQueue(glsql.NewDB(t))
 }
 
 func defaultTxMgr(conf config.Config) *transactions.Manager {
diff --git a/internal/praefect/nodes/health_manager_test.go b/internal/praefect/nodes/health_manager_test.go
index de824d512..ba36b27c3 100644
--- a/internal/praefect/nodes/health_manager_test.go
+++ b/internal/praefect/nodes/health_manager_test.go
@@ -37,7 +37,7 @@ func TestHealthManager(t *testing.T) {
 		HealthConsensus map[string][]string
 	}
 
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	for _, tc := range []struct {
 		desc         string
diff --git a/internal/praefect/nodes/per_repository_test.go b/internal/praefect/nodes/per_repository_test.go
index 8cd1848e8..9789cbc79 100644
--- a/internal/praefect/nodes/per_repository_test.go
+++ b/internal/praefect/nodes/per_repository_test.go
@@ -45,7 +45,7 @@ func TestPerRepositoryElector(t *testing.T) {
 		primary      matcher
 	}
 
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	for _, tc := range []struct {
 		desc         string
diff --git a/internal/praefect/nodes/sql_elector_test.go b/internal/praefect/nodes/sql_elector_test.go
index e1809cdc8..82156c1f1 100644
--- a/internal/praefect/nodes/sql_elector_test.go
+++ b/internal/praefect/nodes/sql_elector_test.go
@@ -28,7 +28,7 @@ import (
 var shardName string = "test-shard-0"
 
 func TestGetPrimaryAndSecondaries(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	logger := testhelper.NewTestLogger(t).WithField("test", t.Name())
 	praefectSocket := testhelper.GetTemporaryGitalySocketFileName(t)
@@ -71,7 +71,7 @@ func TestGetPrimaryAndSecondaries(t *testing.T) {
 }
 
 func TestSqlElector_slow_execution(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	praefectSocket := "unix://" + testhelper.GetTemporaryGitalySocketFileName(t)
 	logger := testhelper.NewTestLogger(t).WithField("test", t.Name())
@@ -108,7 +108,7 @@ func TestSqlElector_slow_execution(t *testing.T) {
 }
 
 func TestBasicFailover(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	logger := testhelper.NewTestLogger(t).WithField("test", t.Name())
 	praefectSocket := testhelper.GetTemporaryGitalySocketFileName(t)
@@ -216,7 +216,7 @@ func TestBasicFailover(t *testing.T) {
 }
 
 func TestElectDemotedPrimary(t *testing.T) {
-	tx := glsql.GetDB(t).Begin(t)
+	tx := glsql.NewDB(t).Begin(t)
 	defer tx.Rollback(t)
 
 	node := config.Node{Storage: "gitaly-0"}
@@ -281,7 +281,7 @@ func predateElection(t testing.TB, ctx context.Context, db glsql.Querier, shardN
 }
 
 func TestElectNewPrimary(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	ns := []*nodeStatus{{
 		node: config.Node{
@@ -449,7 +449,7 @@ func TestConnectionMultiplexing(t *testing.T) {
 
 	go srv.Serve(ln)
 
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 	mgr, err := NewManager(
 		testhelper.DiscardTestEntry(t),
 		config.Config{
diff --git a/internal/praefect/reconciler/reconciler_benchmark_test.go b/internal/praefect/reconciler/reconciler_benchmark_test.go
index fd9b946cf..bdb6f13ac 100644
--- a/internal/praefect/reconciler/reconciler_benchmark_test.go
+++ b/internal/praefect/reconciler/reconciler_benchmark_test.go
@@ -31,7 +31,7 @@ func benchmarkReconcile(b *testing.B, numRepositories int, worstCase bool) {
 	ctx, cancel := testhelper.Context()
 	defer cancel()
 
-	db := glsql.GetDB(b)
+	db := glsql.NewDB(b)
 
 	behind := 0
 	if worstCase {
diff --git a/internal/praefect/reconciler/reconciler_test.go b/internal/praefect/reconciler/reconciler_test.go
index 55eceb02d..8fc77bcbc 100644
--- a/internal/praefect/reconciler/reconciler_test.go
+++ b/internal/praefect/reconciler/reconciler_test.go
@@ -77,7 +77,7 @@ func TestReconciler(t *testing.T) {
 		return out
 	}
 
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 
 	for _, tc := range []struct {
 		desc                string
diff --git a/internal/praefect/replicator_pg_test.go b/internal/praefect/replicator_pg_test.go
index bd8610088..d6661e336 100644
--- a/internal/praefect/replicator_pg_test.go
+++ b/internal/praefect/replicator_pg_test.go
@@ -48,7 +48,7 @@ func TestReplicatorInvalidSourceRepository(t *testing.T) {
 	targetCC, err := client.Dial(ln.Addr().Network()+":"+ln.Addr().String(), nil)
 	require.NoError(t, err)
 
-	rs := datastore.NewPostgresRepositoryStore(glsql.GetDB(t), nil)
+	rs := datastore.NewPostgresRepositoryStore(glsql.NewDB(t), nil)
 	require.NoError(t, rs.SetGeneration(ctx, "virtual-storage-1", "relative-path-1", "gitaly-1", 0))
 
 	r := &defaultReplicator{rs: rs, log: testhelper.DiscardTestLogger(t)}
@@ -67,7 +67,7 @@ func TestReplicatorInvalidSourceRepository(t *testing.T) {
 }
 
 func TestReplicatorDestroy(t *testing.T) {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 	for _, tc := range []struct {
 		change datastore.ChangeType
 		exists bool
diff --git a/internal/praefect/replicator_test.go b/internal/praefect/replicator_test.go
index bc4c74a10..319d92509 100644
--- a/internal/praefect/replicator_test.go
+++ b/internal/praefect/replicator_test.go
@@ -146,7 +146,7 @@ func TestReplMgr_ProcessBacklog(t *testing.T) {
 	logger := testhelper.DiscardTestLogger(t)
 	loggerHook := test.NewLocal(logger)
 
-	queue := datastore.NewReplicationEventQueueInterceptor(datastore.NewPostgresReplicationEventQueue(glsql.GetDB(t)))
+	queue := datastore.NewReplicationEventQueueInterceptor(datastore.NewPostgresReplicationEventQueue(glsql.NewDB(t)))
 	queue.OnAcknowledge(func(ctx context.Context, state datastore.JobState, ids []uint64, queue datastore.ReplicationEventQueue) ([]uint64, error) {
 		cancel() // when it is called we know that replication is finished
 		return queue.Acknowledge(ctx, state, ids)
@@ -297,7 +297,7 @@ func TestReplicator_PropagateReplicationJob(t *testing.T) {
 	// unlinkat /tmp/gitaly-222007427/381349228/storages.d/internal-gitaly-1/+gitaly/state/path/to/repo: directory not empty
 	// By using WaitGroup we are sure the test cleanup will be started after all replication
 	// requests are completed, so no running cache IO operations happen.
-	queue := datastore.NewReplicationEventQueueInterceptor(datastore.NewPostgresReplicationEventQueue(glsql.GetDB(t)))
+	queue := datastore.NewReplicationEventQueueInterceptor(datastore.NewPostgresReplicationEventQueue(glsql.NewDB(t)))
 	var wg sync.WaitGroup
 	queue.OnEnqueue(func(ctx context.Context, event datastore.ReplicationEvent, queue datastore.ReplicationEventQueue) (datastore.ReplicationEvent, error) {
 		wg.Add(1)
@@ -665,7 +665,7 @@ func TestProcessBacklog_FailedJobs(t *testing.T) {
 	ctx, cancel := testhelper.Context()
 	defer cancel()
 
-	queueInterceptor := datastore.NewReplicationEventQueueInterceptor(datastore.NewPostgresReplicationEventQueue(glsql.GetDB(t)))
+	queueInterceptor := datastore.NewReplicationEventQueueInterceptor(datastore.NewPostgresReplicationEventQueue(glsql.NewDB(t)))
 	processed := make(chan struct{})
 
 	dequeues := 0
@@ -788,7 +788,7 @@ func TestProcessBacklog_Success(t *testing.T) {
 	ctx, cancel := testhelper.Context()
 	defer cancel()
 
-	queueInterceptor := datastore.NewReplicationEventQueueInterceptor(datastore.NewPostgresReplicationEventQueue(glsql.GetDB(t)))
+	queueInterceptor := datastore.NewReplicationEventQueueInterceptor(datastore.NewPostgresReplicationEventQueue(glsql.NewDB(t)))
 
 	processed := make(chan struct{})
 	queueInterceptor.OnAcknowledge(func(ctx context.Context, state datastore.JobState, ids []uint64, queue datastore.ReplicationEventQueue) ([]uint64, error) {
@@ -909,7 +909,7 @@ func TestReplMgrProcessBacklog_OnlyHealthyNodes(t *testing.T) {
 	ctx, cancel := testhelper.Context()
 
 	first := true
-	queueInterceptor := datastore.NewReplicationEventQueueInterceptor(datastore.NewPostgresReplicationEventQueue(glsql.GetDB(t)))
+	queueInterceptor := datastore.NewReplicationEventQueueInterceptor(datastore.NewPostgresReplicationEventQueue(glsql.NewDB(t)))
 	queueInterceptor.OnDequeue(func(_ context.Context, virtualStorageName string, storageName string, _ int, _ datastore.ReplicationEventQueue) ([]datastore.ReplicationEvent, error) {
 		select {
 		case <-ctx.Done():
@@ -992,7 +992,7 @@ func TestProcessBacklog_ReplicatesToReadOnlyPrimary(t *testing.T) {
 		},
 	}
 
-	queue := datastore.NewPostgresReplicationEventQueue(glsql.GetDB(t))
+	queue := datastore.NewPostgresReplicationEventQueue(glsql.NewDB(t))
 	_, err := queue.Enqueue(ctx, datastore.ReplicationEvent{
 		Job: datastore.ReplicationJob{
 			Change:            datastore.UpdateRepo,
diff --git a/internal/praefect/repository_exists_test.go b/internal/praefect/repository_exists_test.go
index 5e6260860..bc08d17aa 100644
--- a/internal/praefect/repository_exists_test.go
+++ b/internal/praefect/repository_exists_test.go
@@ -23,7 +23,7 @@ import (
 func TestRepositoryExistsStreamInterceptor(t *testing.T) {
 	errServedByGitaly := status.Error(codes.Unknown, "request passed to Gitaly")
 
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 	for _, tc := range []struct {
 		desc          string
 		routeToGitaly bool
diff --git a/internal/praefect/server_factory_test.go b/internal/praefect/server_factory_test.go
index 788a42316..6cbaa282e 100644
--- a/internal/praefect/server_factory_test.go
+++ b/internal/praefect/server_factory_test.go
@@ -62,7 +62,7 @@ func TestServerFactory(t *testing.T) {
 	revision := text.ChompBytes(gittest.Exec(t, cfg, "-C", repoPath, "rev-parse", "HEAD"))
 
 	logger := testhelper.DiscardTestEntry(t)
-	queue := datastore.NewPostgresReplicationEventQueue(glsql.GetDB(t))
+	queue := datastore.NewPostgresReplicationEventQueue(glsql.NewDB(t))
 
 	rs := datastore.MockRepositoryStore{}
 	nodeMgr, err := nodes.NewManager(logger, conf, nil, rs, &promtest.MockHistogramVec{}, protoregistry.GitalyProtoPreregistered, nil, nil)
diff --git a/internal/praefect/server_test.go b/internal/praefect/server_test.go
index 8ad7f0f8d..77c150562 100644
--- a/internal/praefect/server_test.go
+++ b/internal/praefect/server_test.go
@@ -495,7 +495,7 @@ func TestRemoveRepository(t *testing.T) {
 
 	// TODO: once https://gitlab.com/gitlab-org/gitaly/-/issues/2703 is done and the replication manager supports
 	// graceful shutdown, we can remove this code that waits for jobs to be complete
-	queueInterceptor := datastore.NewReplicationEventQueueInterceptor(datastore.NewPostgresReplicationEventQueue(glsql.GetDB(t)))
+	queueInterceptor := datastore.NewReplicationEventQueueInterceptor(datastore.NewPostgresReplicationEventQueue(glsql.NewDB(t)))
 	jobsDoneCh := make(chan struct{}, 2)
 	queueInterceptor.OnAcknowledge(func(ctx context.Context, state datastore.JobState, ids []uint64, queue datastore.ReplicationEventQueue) ([]uint64, error) {
 		defer func() {
@@ -593,7 +593,7 @@ func TestRenameRepository(t *testing.T) {
 	var canCheckRepo sync.WaitGroup
 	canCheckRepo.Add(2)
 
-	evq := datastore.NewReplicationEventQueueInterceptor(datastore.NewPostgresReplicationEventQueue(glsql.GetDB(t)))
+	evq := datastore.NewReplicationEventQueueInterceptor(datastore.NewPostgresReplicationEventQueue(glsql.NewDB(t)))
 	evq.OnAcknowledge(func(ctx context.Context, state datastore.JobState, ids []uint64, queue datastore.ReplicationEventQueue) ([]uint64, error) {
 		defer canCheckRepo.Done()
 		return queue.Acknowledge(ctx, state, ids)
@@ -773,7 +773,7 @@ func TestProxyWrites(t *testing.T) {
 		},
 	}
 
-	queue := datastore.NewPostgresReplicationEventQueue(glsql.GetDB(t))
+	queue := datastore.NewPostgresReplicationEventQueue(glsql.NewDB(t))
 	entry := testhelper.DiscardTestEntry(t)
 
 	nodeMgr, err := nodes.NewManager(entry, conf, nil, nil, promtest.NewMockHistogramVec(), protoregistry.GitalyProtoPreregistered, nil, nil)
@@ -907,7 +907,7 @@ func TestErrorThreshold(t *testing.T) {
 	ctx, cancel := testhelper.Context()
 	defer cancel()
 
-	queue := datastore.NewPostgresReplicationEventQueue(glsql.GetDB(t))
+	queue := datastore.NewPostgresReplicationEventQueue(glsql.NewDB(t))
 	entry := testhelper.DiscardTestEntry(t)
 
 	testCases := []struct {
diff --git a/internal/testhelper/testserver/gitaly.go b/internal/testhelper/testserver/gitaly.go
index 3bf87ba94..465e56e6a 100644
--- a/internal/testhelper/testserver/gitaly.go
+++ b/internal/testhelper/testserver/gitaly.go
@@ -63,7 +63,7 @@ func RunGitalyServer(t testing.TB, cfg config.Cfg, rubyServer *rubyserver.Server
 
 // createDatabase create a new database with randomly generated name and returns it back to the caller.
 func createDatabase(t testing.TB) string {
-	db := glsql.GetDB(t)
+	db := glsql.NewDB(t)
 	return db.Name
 }