graph/db: refactor to make postgres fixtures re-usable
In preparation for tests where we will want to spin up SQL DBs many times, we do some refactoring so that it is easy to re-use postgres fixtures since those are expensive to spin up.
This commit is contained in:
4 files changed
+82
-24
No files matched your search
@@ -58,6 +58,8 @@ func TestMigrateGraphToSQL(t *testing.T) {
|
|||||||
t.Parallel()
|
t.Parallel()
|
||||||
ctx := context.Background()
|
ctx := context.Background()
|
||||||
|
|
||||||
|
dbFixture := NewTestDBFixture(t)
|
||||||
|
|
||||||
writeUpdate := func(t *testing.T, db *KVStore, object any) {
|
writeUpdate := func(t *testing.T, db *KVStore, object any) {
|
||||||
t.Helper()
|
t.Helper()
|
||||||
|
|
||||||
@@ -324,7 +326,8 @@ func TestMigrateGraphToSQL(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Set up our destination SQL DB.
|
// Set up our destination SQL DB.
|
||||||
sql, ok := NewTestDB(t).(*SQLStore)
|
db := NewTestDBWithFixture(t, dbFixture)
|
||||||
|
sql, ok := db.(*SQLStore)
|
||||||
require.True(t, ok)
|
require.True(t, ok)
|
||||||
|
|
||||||
// Run the migration.
|
// Run the migration.
|
||||||
|
|||||||
@@ -6,9 +6,46 @@ import (
|
|||||||
"database/sql"
|
"database/sql"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/btcsuite/btcd/chaincfg"
|
||||||
"github.com/lightningnetwork/lnd/sqldb"
|
"github.com/lightningnetwork/lnd/sqldb"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// NewTestDB is a helper function that creates a SQLStore backed by a SQL
|
||||||
|
// database for testing.
|
||||||
|
func NewTestDB(t testing.TB) V1Store {
|
||||||
|
return NewTestDBWithFixture(t, nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewTestDBFixture creates a new sqldb.TestPgFixture for testing purposes.
|
||||||
|
func NewTestDBFixture(t *testing.T) *sqldb.TestPgFixture {
|
||||||
|
pgFixture := sqldb.NewTestPgFixture(t, sqldb.DefaultPostgresFixtureLifetime)
|
||||||
|
t.Cleanup(func() {
|
||||||
|
pgFixture.TearDown(t)
|
||||||
|
})
|
||||||
|
return pgFixture
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewTestDBWithFixture is a helper function that creates a SQLStore backed by a
|
||||||
|
// SQL database for testing.
|
||||||
|
func NewTestDBWithFixture(t testing.TB, pgFixture *sqldb.TestPgFixture) V1Store {
|
||||||
|
var querier BatchedSQLQueries
|
||||||
|
if pgFixture == nil {
|
||||||
|
querier = newBatchQuerier(t)
|
||||||
|
} else {
|
||||||
|
querier = newBatchQuerierWithFixture(t, pgFixture)
|
||||||
|
}
|
||||||
|
|
||||||
|
store, err := NewSQLStore(
|
||||||
|
&SQLStoreConfig{
|
||||||
|
ChainHash: *chaincfg.MainNetParams.GenesisHash,
|
||||||
|
}, querier,
|
||||||
|
)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
return store
|
||||||
|
}
|
||||||
|
|
||||||
// newBatchQuerier creates a new BatchedSQLQueries instance for testing
|
// newBatchQuerier creates a new BatchedSQLQueries instance for testing
|
||||||
// using a PostgreSQL database fixture.
|
// using a PostgreSQL database fixture.
|
||||||
func newBatchQuerier(t testing.TB) BatchedSQLQueries {
|
func newBatchQuerier(t testing.TB) BatchedSQLQueries {
|
||||||
@@ -19,6 +56,14 @@ func newBatchQuerier(t testing.TB) BatchedSQLQueries {
|
|||||||
pgFixture.TearDown(t)
|
pgFixture.TearDown(t)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
return newBatchQuerierWithFixture(t, pgFixture)
|
||||||
|
}
|
||||||
|
|
||||||
|
// newBatchQuerierWithFixture creates a new BatchedSQLQueries instance for
|
||||||
|
// testing using a PostgreSQL database fixture.
|
||||||
|
func newBatchQuerierWithFixture(t testing.TB,
|
||||||
|
pgFixture *sqldb.TestPgFixture) BatchedSQLQueries {
|
||||||
|
|
||||||
db := sqldb.NewTestPostgresDB(t, pgFixture).BaseDB
|
db := sqldb.NewTestPostgresDB(t, pgFixture).BaseDB
|
||||||
|
|
||||||
return sqldb.NewTransactionExecutor(
|
return sqldb.NewTransactionExecutor(
|
||||||
|
|||||||
@@ -1,23 +0,0 @@
|
|||||||
//go:build test_db_postgres || test_db_sqlite
|
|
||||||
|
|
||||||
package graphdb
|
|
||||||
|
|
||||||
import (
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"github.com/btcsuite/btcd/chaincfg"
|
|
||||||
"github.com/stretchr/testify/require"
|
|
||||||
)
|
|
||||||
|
|
||||||
// NewTestDB is a helper function that creates a SQLStore backed by a SQL
|
|
||||||
// database for testing.
|
|
||||||
func NewTestDB(t testing.TB) V1Store {
|
|
||||||
store, err := NewSQLStore(
|
|
||||||
&SQLStoreConfig{
|
|
||||||
ChainHash: *chaincfg.MainNetParams.GenesisHash,
|
|
||||||
}, newBatchQuerier(t),
|
|
||||||
)
|
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
return store
|
|
||||||
}
|
|
||||||
@@ -6,12 +6,45 @@ import (
|
|||||||
"database/sql"
|
"database/sql"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/btcsuite/btcd/chaincfg"
|
||||||
"github.com/lightningnetwork/lnd/sqldb"
|
"github.com/lightningnetwork/lnd/sqldb"
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// NewTestDB is a helper function that creates a SQLStore backed by a SQL
|
||||||
|
// database for testing.
|
||||||
|
func NewTestDB(t testing.TB) V1Store {
|
||||||
|
return NewTestDBWithFixture(t, nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewTestDBFixture is a no-op for the sqlite build.
|
||||||
|
func NewTestDBFixture(_ *testing.T) *sqldb.TestPgFixture {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewTestDBWithFixture is a helper function that creates a SQLStore backed by a
|
||||||
|
// SQL database for testing.
|
||||||
|
func NewTestDBWithFixture(t testing.TB, _ *sqldb.TestPgFixture) V1Store {
|
||||||
|
store, err := NewSQLStore(
|
||||||
|
&SQLStoreConfig{
|
||||||
|
ChainHash: *chaincfg.MainNetParams.GenesisHash,
|
||||||
|
}, newBatchQuerier(t),
|
||||||
|
)
|
||||||
|
require.NoError(t, err)
|
||||||
|
return store
|
||||||
|
}
|
||||||
|
|
||||||
// newBatchQuerier creates a new BatchedSQLQueries instance for testing
|
// newBatchQuerier creates a new BatchedSQLQueries instance for testing
|
||||||
// using a SQLite database.
|
// using a SQLite database.
|
||||||
func newBatchQuerier(t testing.TB) BatchedSQLQueries {
|
func newBatchQuerier(t testing.TB) BatchedSQLQueries {
|
||||||
|
return newBatchQuerierWithFixture(t, nil)
|
||||||
|
}
|
||||||
|
|
||||||
|
// newBatchQuerierWithFixture creates a new BatchedSQLQueries instance for
|
||||||
|
// testing using a SQLite database.
|
||||||
|
func newBatchQuerierWithFixture(t testing.TB,
|
||||||
|
_ *sqldb.TestPgFixture) BatchedSQLQueries {
|
||||||
|
|
||||||
db := sqldb.NewTestSqliteDB(t).BaseDB
|
db := sqldb.NewTestSqliteDB(t).BaseDB
|
||||||
|
|
||||||
return sqldb.NewTransactionExecutor(
|
return sqldb.NewTransactionExecutor(
|
||||||
|
|||||||
Reference in new issue
Block a user