chore: move migration and seed code into driver (#2294)

Move migration and seed code into driver
This commit is contained in:
Athurg Gooth
2023-09-27 11:56:20 +08:00
committed by GitHub
parent ca98367a0a
commit 5121e9f954
45 changed files with 86 additions and 112 deletions

View File

@@ -18,7 +18,6 @@ import (
"github.com/usememos/memos/server"
"github.com/usememos/memos/server/profile"
"github.com/usememos/memos/store"
"github.com/usememos/memos/store/db"
"github.com/usememos/memos/store/sqlite"
"github.com/usememos/memos/test"
)
@@ -32,15 +31,14 @@ type TestingServer struct {
func NewTestingServer(ctx context.Context, t *testing.T) (*TestingServer, error) {
profile := test.GetTestingProfile(t)
db := db.NewDB(profile)
if err := db.Open(); err != nil {
return nil, errors.Wrap(err, "failed to open db")
driver, err := sqlite.NewDriver(profile)
if err != nil {
return nil, errors.Wrap(err, "failed to create db driver")
}
if err := db.Migrate(ctx); err != nil {
if err := driver.Migrate(ctx); err != nil {
return nil, errors.Wrap(err, "failed to migrate db")
}
driver := sqlite.NewDriver(db.DBInstance)
store := store.New(driver, profile)
server, err := server.NewServer(ctx, profile, store)
if err != nil {

View File

@@ -6,7 +6,6 @@ import (
"testing"
"github.com/usememos/memos/store"
"github.com/usememos/memos/store/db"
"github.com/usememos/memos/store/sqlite"
"github.com/usememos/memos/test"
@@ -16,15 +15,14 @@ import (
func NewTestingStore(ctx context.Context, t *testing.T) *store.Store {
profile := test.GetTestingProfile(t)
db := db.NewDB(profile)
if err := db.Open(); err != nil {
fmt.Printf("failed to open db, error: %+v\n", err)
driver, err := sqlite.NewDriver(profile)
if err != nil {
fmt.Printf("failed to create db driver, error: %+v\n", err)
}
if err := db.Migrate(ctx); err != nil {
if err := driver.Migrate(ctx); err != nil {
fmt.Printf("failed to migrate db, error: %+v\n", err)
}
driver := sqlite.NewDriver(db.DBInstance)
store := store.New(driver, profile)
return store
}