Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: move migration and seed code into driver (#2294)
Athurg Gooth5121e9f95431
diff --git a/cmd/memos.go b/cmd/memos.goindex 0f0e06ad0..8cebc9598 100644--- a/cmd/memos.go+++ b/cmd/memos.go@@ -16,7 +16,6 @@ import ("github.com/usememos/memos/server"_profile "github.com/usememos/memos/server/profile""github.com/usememos/memos/store"- "github.com/usememos/memos/store/db""github.com/usememos/memos/store/sqlite")@@ -43,19 +42,18 @@ var (Short: `An open-source, self-hosted memo hub with knowledge management and social networking.`,Run: func(_cmd *cobra.Command, _args []string) {ctx, cancel := context.WithCancel(context.Background())- db := db.NewDB(profile)- if err := db.Open(); err != nil {+ driver, err := sqlite.NewDriver(profile)+ if err != nil {cancel()- log.Error("failed to open db", zap.Error(err))+ log.Error("failed to create db driver", zap.Error(err))return}- if err := db.Migrate(ctx); err != nil {+ if err := driver.Migrate(ctx); err != nil {cancel()log.Error("failed to migrate db", zap.Error(err))return}- driver := sqlite.NewDriver(db.DBInstance)store := store.New(driver, profile)s, err := server.NewServer(ctx, profile, store)if err != nil {diff --git a/cmd/mvrss.go b/cmd/mvrss.goindex 310cc74ef..b82eec5cf 100644--- a/cmd/mvrss.go+++ b/cmd/mvrss.go@@ -9,7 +9,6 @@ import ("github.com/spf13/cobra""github.com/usememos/memos/store"- "github.com/usememos/memos/store/db""github.com/usememos/memos/store/sqlite")@@ -40,17 +39,16 @@ var (return}- 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)return}- if err := db.Migrate(ctx); err != nil {+ if err := driver.Migrate(ctx); err != nil {fmt.Printf("failed to migrate db, error: %+v\n", err)return}- driver := sqlite.NewDriver(db.DBInstance)s := store.New(driver, profile)resources, err := s.ListResources(ctx, &store.FindResource{})if err != nil {diff --git a/cmd/setup.go b/cmd/setup.goindex c1a36bec9..3f32be787 100644--- a/cmd/setup.go+++ b/cmd/setup.go@@ -11,7 +11,6 @@ import ("github.com/usememos/memos/common/util""github.com/usememos/memos/store"- "github.com/usememos/memos/store/db""github.com/usememos/memos/store/sqlite")@@ -37,17 +36,16 @@ var (return}- 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)return}- if err := db.Migrate(ctx); err != nil {+ if err := driver.Migrate(ctx); err != nil {fmt.Printf("failed to migrate db, error: %+v\n", err)return}- driver := sqlite.NewDriver(db.DBInstance)store := store.New(driver, profile)if err := ExecuteSetup(ctx, store, hostUsername, hostPassword); err != nil {fmt.Printf("failed to setup, error: %+v\n", err)diff --git a/store/driver.go b/store/driver.goindex 6cde96b19..12778a469 100644--- a/store/driver.go+++ b/store/driver.go@@ -7,9 +7,11 @@ import ()type Driver interface {+ Close() error++ Migrate(ctx context.Context) errorVacuum(ctx context.Context) errorBackupTo(ctx context.Context, filename string) error- Close() errorCreateActivity(ctx context.Context, create *Activity) (*Activity, error)diff --git a/store/db/db.go b/store/sqlite/migrate.gosimilarity index 64%rename from store/db/db.gorename to store/sqlite/migrate.goindex 1bacbc0f7..3abf5b911 100644--- a/store/db/db.go+++ b/store/sqlite/migrate.go@@ -1,8 +1,7 @@-package db+package sqliteimport ("context"- "database/sql""embed""fmt""io/fs"@@ -13,7 +12,6 @@ import ("github.com/pkg/errors"- "github.com/usememos/memos/server/profile""github.com/usememos/memos/server/version")@@ -23,59 +21,14 @@ var migrationFS embed.FS//go:embed seedvar seedFS embed.FS-type DB struct {- // sqlite db connection instance- DBInstance *sql.DB- profile *profile.Profile-}--// NewDB returns a new instance of DB associated with the given datasource name.-func NewDB(profile *profile.Profile) *DB {- db := &DB{- profile: profile,- }- return db-}--// Open opens a database specified by its database driver name and a-// driver-specific data source name, usually consisting of at least a-// database name and connection information.-func (db *DB) Open() error {- // Ensure a DSN is set before attempting to open the database.- if db.profile.DSN == "" {- return errors.New("dsn required")- }-- // Connect to the database with some sane settings:- // - No shared-cache: it's obsolete; WAL journal mode is a better solution.- // - No foreign key constraints: it's currently disabled by default, but it's a- // good practice to be explicit and prevent future surprises on SQLite upgrades.- // - Journal mode set to WAL: it's the recommended journal mode for most applications- // as it prevents locking issues.- //- // Notes:- // - When using the `modernc.org/sqlite` driver, each pragma must be prefixed with `_pragma=`.- //- // References:- // - https://pkg.go.dev/modernc.org/sqlite#Driver.Open- // - https://www.sqlite.org/sharedcache.html- // - https://www.sqlite.org/pragma.html- sqliteDB, err := sql.Open("sqlite", db.profile.DSN+"?_pragma=foreign_keys(0)&_pragma=busy_timeout(10000)&_pragma=journal_mode(WAL)")- if err != nil {- return errors.Wrapf(err, "failed to open db with dsn: %s", db.profile.DSN)- }- db.DBInstance = sqliteDB- return nil-}-// Migrate applies the latest schema to the database.-func (db *DB) Migrate(ctx context.Context) error {- if db.profile.Mode == "prod" {- _, err := os.Stat(db.profile.DSN)+func (d *Driver) Migrate(ctx context.Context) error {+ if d.profile.Mode == "prod" {+ _, err := os.Stat(d.profile.DSN)if err != nil {// If db file not exists, we should create a new one with latest schema.if errors.Is(err, os.ErrNotExist) {- if err := db.applyLatestSchema(ctx); err != nil {+ if err := d.applyLatestSchema(ctx); err != nil {return errors.Wrap(err, "failed to apply latest schema")}} else {@@ -83,13 +36,13 @@ func (db *DB) Migrate(ctx context.Context) error {}} else {// If db file exists, we should check if we need to migrate the database.- currentVersion := version.GetCurrentVersion(db.profile.Mode)- migrationHistoryList, err := db.FindMigrationHistoryList(ctx, &MigrationHistoryFind{})+ currentVersion := version.GetCurrentVersion(d.profile.Mode)+ migrationHistoryList, err := d.FindMigrationHistoryList(ctx, &MigrationHistoryFind{})if err != nil {return errors.Wrap(err, "failed to find migration history")}if len(migrationHistoryList) == 0 {- _, err := db.UpsertMigrationHistory(ctx, &MigrationHistoryUpsert{+ _, err := d.UpsertMigrationHistory(ctx, &MigrationHistoryUpsert{Version: currentVersion,})if err != nil {@@ -109,11 +62,11 @@ func (db *DB) Migrate(ctx context.Context) error {minorVersionList := getMinorVersionList()// backup the raw database file before migration- rawBytes, err := os.ReadFile(db.profile.DSN)+ rawBytes, err := os.ReadFile(d.profile.DSN)if err != nil {return errors.Wrap(err, "failed to read raw database file")}- backupDBFilePath := fmt.Sprintf("%s/memos_%s_%d_backup.db", db.profile.Data, db.profile.Version, time.Now().Unix())+ backupDBFilePath := fmt.Sprintf("%s/memos_%s_%d_backup.db", d.profile.Data, d.profile.Version, time.Now().Unix())if err := os.WriteFile(backupDBFilePath, rawBytes, 0644); err != nil {return errors.Wrap(err, "failed to write raw database file")}@@ -124,7 +77,7 @@ func (db *DB) Migrate(ctx context.Context) error {normalizedVersion := minorVersion + ".0"if version.IsVersionGreaterThan(normalizedVersion, latestMigrationHistoryVersion) && version.IsVersionGreaterOrEqualThan(currentVersion, normalizedVersion) {println("applying migration for", normalizedVersion)- if err := db.applyMigrationForMinorVersion(ctx, minorVersion); err != nil {+ if err := d.applyMigrationForMinorVersion(ctx, minorVersion); err != nil {return errors.Wrap(err, "failed to apply minor version migration")}}@@ -139,13 +92,13 @@ func (db *DB) Migrate(ctx context.Context) error {}} else {// In non-prod mode, we should always migrate the database.- if _, err := os.Stat(db.profile.DSN); errors.Is(err, os.ErrNotExist) {- if err := db.applyLatestSchema(ctx); err != nil {+ if _, err := os.Stat(d.profile.DSN); errors.Is(err, os.ErrNotExist) {+ if err := d.applyLatestSchema(ctx); err != nil {return errors.Wrap(err, "failed to apply latest schema")}// In demo mode, we should seed the database.- if db.profile.Mode == "demo" {- if err := db.seed(ctx); err != nil {+ if d.profile.Mode == "demo" {+ if err := d.seed(ctx); err != nil {return errors.Wrap(err, "failed to seed")}}@@ -159,9 +112,9 @@ const (latestSchemaFileName = "LATEST__SCHEMA.sql")-func (db *DB) applyLatestSchema(ctx context.Context) error {+func (d *Driver) applyLatestSchema(ctx context.Context) error {schemaMode := "dev"- if db.profile.Mode == "prod" {+ if d.profile.Mode == "prod" {schemaMode = "prod"}latestSchemaPath := fmt.Sprintf("%s/%s/%s", "migration", schemaMode, latestSchemaFileName)@@ -170,13 +123,13 @@ func (db *DB) applyLatestSchema(ctx context.Context) error {return errors.Wrapf(err, "failed to read latest schema %q", latestSchemaPath)}stmt := string(buf)- if err := db.execute(ctx, stmt); err != nil {+ if err := d.execute(ctx, stmt); err != nil {return errors.Wrapf(err, "migrate error: %s", stmt)}return nil}-func (db *DB) applyMigrationForMinorVersion(ctx context.Context, minorVersion string) error {+func (d *Driver) applyMigrationForMinorVersion(ctx context.Context, minorVersion string) error {filenames, err := fs.Glob(migrationFS, fmt.Sprintf("%s/%s/*.sql", "migration/prod", minorVersion))if err != nil {return errors.Wrap(err, "failed to read ddl files")@@ -193,14 +146,14 @@ func (db *DB) applyMigrationForMinorVersion(ctx context.Context, minorVersion st}stmt := string(buf)migrationStmt += stmt- if err := db.execute(ctx, stmt); err != nil {+ if err := d.execute(ctx, stmt); err != nil {return errors.Wrapf(err, "migrate error: %s", stmt)}}// Upsert the newest version to migration_history.version := minorVersion + ".0"- if _, err = db.UpsertMigrationHistory(ctx, &MigrationHistoryUpsert{+ if _, err = d.UpsertMigrationHistory(ctx, &MigrationHistoryUpsert{Version: version,}); err != nil {return errors.Wrapf(err, "failed to upsert migration history with version: %s", version)@@ -209,7 +162,7 @@ func (db *DB) applyMigrationForMinorVersion(ctx context.Context, minorVersion streturn nil}-func (db *DB) seed(ctx context.Context) error {+func (d *Driver) seed(ctx context.Context) error {filenames, err := fs.Glob(seedFS, fmt.Sprintf("%s/*.sql", "seed"))if err != nil {return errors.Wrap(err, "failed to read seed files")@@ -224,7 +177,7 @@ func (db *DB) seed(ctx context.Context) error {return errors.Wrapf(err, "failed to read seed file, filename=%s", filename)}stmt := string(buf)- if err := db.execute(ctx, stmt); err != nil {+ if err := d.execute(ctx, stmt); err != nil {return errors.Wrapf(err, "seed error: %s", stmt)}}@@ -232,8 +185,8 @@ func (db *DB) seed(ctx context.Context) error {}// execute runs a single SQL statement within a transaction.-func (db *DB) execute(ctx context.Context, stmt string) error {- tx, err := db.DBInstance.Begin()+func (d *Driver) execute(ctx context.Context, stmt string) error {+ tx, err := d.db.Begin()if err != nil {return err}diff --git a/store/db/migration/dev/LATEST__SCHEMA.sql b/store/sqlite/migration/dev/LATEST__SCHEMA.sqlsimilarity index 100%rename from store/db/migration/dev/LATEST__SCHEMA.sqlrename to store/sqlite/migration/dev/LATEST__SCHEMA.sqldiff --git a/store/db/migration/prod/0.10/00__activity.sql b/store/sqlite/migration/prod/0.10/00__activity.sqlsimilarity index 100%rename from store/db/migration/prod/0.10/00__activity.sqlrename to store/sqlite/migration/prod/0.10/00__activity.sqldiff --git a/store/db/migration/prod/0.11/00__user_avatar.sql b/store/sqlite/migration/prod/0.11/00__user_avatar.sqlsimilarity index 100%rename from store/db/migration/prod/0.11/00__user_avatar.sqlrename to store/sqlite/migration/prod/0.11/00__user_avatar.sqldiff --git a/store/db/migration/prod/0.11/01__idp.sql b/store/sqlite/migration/prod/0.11/01__idp.sqlsimilarity index 100%rename from store/db/migration/prod/0.11/01__idp.sqlrename to store/sqlite/migration/prod/0.11/01__idp.sqldiff --git a/store/db/migration/prod/0.11/02__storage.sql b/store/sqlite/migration/prod/0.11/02__storage.sqlsimilarity index 100%rename from store/db/migration/prod/0.11/02__storage.sqlrename to store/sqlite/migration/prod/0.11/02__storage.sqldiff --git a/store/db/migration/prod/0.12/00__user_setting.sql b/store/sqlite/migration/prod/0.12/00__user_setting.sqlsimilarity index 100%rename from store/db/migration/prod/0.12/00__user_setting.sqlrename to store/sqlite/migration/prod/0.12/00__user_setting.sqldiff --git a/store/db/migration/prod/0.12/01__system_setting.sql b/store/sqlite/migration/prod/0.12/01__system_setting.sqlsimilarity index 100%rename from store/db/migration/prod/0.12/01__system_setting.sqlrename to store/sqlite/migration/prod/0.12/01__system_setting.sqldiff --git a/store/db/migration/prod/0.12/03__resource_internal_path.sql b/store/sqlite/migration/prod/0.12/03__resource_internal_path.sqlsimilarity index 100%rename from store/db/migration/prod/0.12/03__resource_internal_path.sqlrename to store/sqlite/migration/prod/0.12/03__resource_internal_path.sqldiff --git a/store/db/migration/prod/0.12/04__resource_public_id.sql b/store/sqlite/migration/prod/0.12/04__resource_public_id.sqlsimilarity index 100%rename from store/db/migration/prod/0.12/04__resource_public_id.sqlrename to store/sqlite/migration/prod/0.12/04__resource_public_id.sqldiff --git a/store/db/migration/prod/0.13/00__memo_relation.sql b/store/sqlite/migration/prod/0.13/00__memo_relation.sqlsimilarity index 100%rename from store/db/migration/prod/0.13/00__memo_relation.sqlrename to store/sqlite/migration/prod/0.13/00__memo_relation.sqldiff --git a/store/db/migration/prod/0.13/01__remove_memo_organizer_id.sql b/store/sqlite/migration/prod/0.13/01__remove_memo_organizer_id.sqlsimilarity index 100%rename from store/db/migration/prod/0.13/01__remove_memo_organizer_id.sqlrename to store/sqlite/migration/prod/0.13/01__remove_memo_organizer_id.sqldiff --git a/store/db/migration/prod/0.14/00__drop_resource_public_id.sql b/store/sqlite/migration/prod/0.14/00__drop_resource_public_id.sqlsimilarity index 100%rename from store/db/migration/prod/0.14/00__drop_resource_public_id.sqlrename to store/sqlite/migration/prod/0.14/00__drop_resource_public_id.sqldiff --git a/store/db/migration/prod/0.14/01__create_indexes.sql b/store/sqlite/migration/prod/0.14/01__create_indexes.sqlsimilarity index 100%rename from store/db/migration/prod/0.14/01__create_indexes.sqlrename to store/sqlite/migration/prod/0.14/01__create_indexes.sqldiff --git a/store/db/migration/prod/0.15/00__drop_user_open_id.sql b/store/sqlite/migration/prod/0.15/00__drop_user_open_id.sqlsimilarity index 100%rename from store/db/migration/prod/0.15/00__drop_user_open_id.sqlrename to store/sqlite/migration/prod/0.15/00__drop_user_open_id.sqldiff --git a/store/db/migration/prod/0.16/00__add_memo_id_to_resource.sql b/store/sqlite/migration/prod/0.16/00__add_memo_id_to_resource.sqlsimilarity index 100%rename from store/db/migration/prod/0.16/00__add_memo_id_to_resource.sqlrename to store/sqlite/migration/prod/0.16/00__add_memo_id_to_resource.sqldiff --git a/store/db/migration/prod/0.16/01__drop_shortcut_table.sql b/store/sqlite/migration/prod/0.16/01__drop_shortcut_table.sqlsimilarity index 100%rename from store/db/migration/prod/0.16/01__drop_shortcut_table.sqlrename to store/sqlite/migration/prod/0.16/01__drop_shortcut_table.sqldiff --git a/store/db/migration/prod/0.2/00__user_role.sql b/store/sqlite/migration/prod/0.2/00__user_role.sqlsimilarity index 100%rename from store/db/migration/prod/0.2/00__user_role.sqlrename to store/sqlite/migration/prod/0.2/00__user_role.sqldiff --git a/store/db/migration/prod/0.2/01__memo_visibility.sql b/store/sqlite/migration/prod/0.2/01__memo_visibility.sqlsimilarity index 100%rename from store/db/migration/prod/0.2/01__memo_visibility.sqlrename to store/sqlite/migration/prod/0.2/01__memo_visibility.sqldiff --git a/store/db/migration/prod/0.3/00__memo_visibility_protected.sql b/store/sqlite/migration/prod/0.3/00__memo_visibility_protected.sqlsimilarity index 100%rename from store/db/migration/prod/0.3/00__memo_visibility_protected.sqlrename to store/sqlite/migration/prod/0.3/00__memo_visibility_protected.sqldiff --git a/store/db/migration/prod/0.4/00__user_setting.sql b/store/sqlite/migration/prod/0.4/00__user_setting.sqlsimilarity index 100%rename from store/db/migration/prod/0.4/00__user_setting.sqlrename to store/sqlite/migration/prod/0.4/00__user_setting.sqldiff --git a/store/db/migration/prod/0.5/00__regenerate_foreign_keys.sql b/store/sqlite/migration/prod/0.5/00__regenerate_foreign_keys.sqlsimilarity index 100%rename from store/db/migration/prod/0.5/00__regenerate_foreign_keys.sqlrename to store/sqlite/migration/prod/0.5/00__regenerate_foreign_keys.sqldiff --git a/store/db/migration/prod/0.5/01__memo_resource.sql b/store/sqlite/migration/prod/0.5/01__memo_resource.sqlsimilarity index 100%rename from store/db/migration/prod/0.5/01__memo_resource.sqlrename to store/sqlite/migration/prod/0.5/01__memo_resource.sqldiff --git a/store/db/migration/prod/0.5/02__system_setting.sql b/store/sqlite/migration/prod/0.5/02__system_setting.sqlsimilarity index 100%rename from store/db/migration/prod/0.5/02__system_setting.sqlrename to store/sqlite/migration/prod/0.5/02__system_setting.sqldiff --git a/store/db/migration/prod/0.5/03__resource_extermal_link.sql b/store/sqlite/migration/prod/0.5/03__resource_extermal_link.sqlsimilarity index 100%rename from store/db/migration/prod/0.5/03__resource_extermal_link.sqlrename to store/sqlite/migration/prod/0.5/03__resource_extermal_link.sqldiff --git a/store/db/migration/prod/0.6/00__recreate_triggers.sql b/store/sqlite/migration/prod/0.6/00__recreate_triggers.sqlsimilarity index 100%rename from store/db/migration/prod/0.6/00__recreate_triggers.sqlrename to store/sqlite/migration/prod/0.6/00__recreate_triggers.sqldiff --git a/store/db/migration/prod/0.7/00__remove_fk.sql b/store/sqlite/migration/prod/0.7/00__remove_fk.sqlsimilarity index 100%rename from store/db/migration/prod/0.7/00__remove_fk.sqlrename to store/sqlite/migration/prod/0.7/00__remove_fk.sqldiff --git a/store/db/migration/prod/0.7/01__remove_triggers.sql b/store/sqlite/migration/prod/0.7/01__remove_triggers.sqlsimilarity index 100%rename from store/db/migration/prod/0.7/01__remove_triggers.sqlrename to store/sqlite/migration/prod/0.7/01__remove_triggers.sqldiff --git a/store/db/migration/prod/0.8/00__migration_history.sql b/store/sqlite/migration/prod/0.8/00__migration_history.sqlsimilarity index 100%rename from store/db/migration/prod/0.8/00__migration_history.sqlrename to store/sqlite/migration/prod/0.8/00__migration_history.sqldiff --git a/store/db/migration/prod/0.8/01__user_username.sql b/store/sqlite/migration/prod/0.8/01__user_username.sqlsimilarity index 100%rename from store/db/migration/prod/0.8/01__user_username.sqlrename to store/sqlite/migration/prod/0.8/01__user_username.sqldiff --git a/store/db/migration/prod/0.9/00__tag.sql b/store/sqlite/migration/prod/0.9/00__tag.sqlsimilarity index 100%rename from store/db/migration/prod/0.9/00__tag.sqlrename to store/sqlite/migration/prod/0.9/00__tag.sqldiff --git a/store/db/migration/prod/LATEST__SCHEMA.sql b/store/sqlite/migration/prod/LATEST__SCHEMA.sqlsimilarity index 100%rename from store/db/migration/prod/LATEST__SCHEMA.sqlrename to store/sqlite/migration/prod/LATEST__SCHEMA.sqldiff --git a/store/db/migration_history.go b/store/sqlite/migration_history.gosimilarity index 76%rename from store/db/migration_history.gorename to store/sqlite/migration_history.goindex e4b897e64..2de2725d6 100644--- a/store/db/migration_history.go+++ b/store/sqlite/migration_history.go@@ -1,4 +1,4 @@-package db+package sqliteimport ("context"@@ -18,7 +18,7 @@ type MigrationHistoryFind struct {Version *string}-func (db *DB) FindMigrationHistoryList(ctx context.Context, find *MigrationHistoryFind) ([]*MigrationHistory, error) {+func (d *Driver) FindMigrationHistoryList(ctx context.Context, find *MigrationHistoryFind) ([]*MigrationHistory, error) {where, args := []string{"1 = 1"}, []any{}if v := find.Version; v != nil {@@ -34,7 +34,7 @@ func (db *DB) FindMigrationHistoryList(ctx context.Context, find *MigrationHistoWHERE ` + strings.Join(where, " AND ") + `ORDER BY created_ts DESC`- rows, err := db.DBInstance.QueryContext(ctx, query, args...)+ rows, err := d.db.QueryContext(ctx, query, args...)if err != nil {return nil, err}@@ -60,7 +60,7 @@ func (db *DB) FindMigrationHistoryList(ctx context.Context, find *MigrationHistoreturn list, nil}-func (db *DB) UpsertMigrationHistory(ctx context.Context, upsert *MigrationHistoryUpsert) (*MigrationHistory, error) {+func (d *Driver) UpsertMigrationHistory(ctx context.Context, upsert *MigrationHistoryUpsert) (*MigrationHistory, error) {stmt := `INSERT INTO migration_history (version@@ -72,7 +72,7 @@ func (db *DB) UpsertMigrationHistory(ctx context.Context, upsert *MigrationHistoRETURNING version, created_ts`var migrationHistory MigrationHistory- if err := db.DBInstance.QueryRowContext(ctx, stmt, upsert.Version).Scan(+ if err := d.db.QueryRowContext(ctx, stmt, upsert.Version).Scan(&migrationHistory.Version,&migrationHistory.CreatedTs,); err != nil {diff --git a/store/db/seed/10000__reset.sql b/store/sqlite/seed/10000__reset.sqlsimilarity index 100%rename from store/db/seed/10000__reset.sqlrename to store/sqlite/seed/10000__reset.sqldiff --git a/store/db/seed/10001__user.sql b/store/sqlite/seed/10001__user.sqlsimilarity index 100%rename from store/db/seed/10001__user.sqlrename to store/sqlite/seed/10001__user.sqldiff --git a/store/db/seed/10002__memo.sql b/store/sqlite/seed/10002__memo.sqlsimilarity index 100%rename from store/db/seed/10002__memo.sqlrename to store/sqlite/seed/10002__memo.sqldiff --git a/store/db/seed/10003__memo_organizer.sql b/store/sqlite/seed/10003__memo_organizer.sqlsimilarity index 100%rename from store/db/seed/10003__memo_organizer.sqlrename to store/sqlite/seed/10003__memo_organizer.sqldiff --git a/store/db/seed/10004__tag.sql b/store/sqlite/seed/10004__tag.sqlsimilarity index 100%rename from store/db/seed/10004__tag.sqlrename to store/sqlite/seed/10004__tag.sqldiff --git a/store/sqlite/sqlite.go b/store/sqlite/sqlite.goindex b9e53fdd0..dc13d0818 100644--- a/store/sqlite/sqlite.go+++ b/store/sqlite/sqlite.go@@ -7,17 +7,46 @@ import ("github.com/pkg/errors""modernc.org/sqlite"+ "github.com/usememos/memos/server/profile""github.com/usememos/memos/store")type Driver struct {- db *sql.DB+ db *sql.DB+ profile *profile.Profile}-func NewDriver(db *sql.DB) store.Driver {- return &Driver{- db: db,+// NewDriver opens a database specified by its database driver name and a+// driver-specific data source name, usually consisting of at least a+// database name and connection information.+func NewDriver(profile *profile.Profile) (store.Driver, error) {+ // Ensure a DSN is set before attempting to open the database.+ if profile.DSN == "" {+ return nil, errors.New("dsn required")}++ // Connect to the database with some sane settings:+ // - No shared-cache: it's obsolete; WAL journal mode is a better solution.+ // - No foreign key constraints: it's currently disabled by default, but it's a+ // good practice to be explicit and prevent future surprises on SQLite upgrades.+ // - Journal mode set to WAL: it's the recommended journal mode for most applications+ // as it prevents locking issues.+ //+ // Notes:+ // - When using the `modernc.org/sqlite` driver, each pragma must be prefixed with `_pragma=`.+ //+ // References:+ // - https://pkg.go.dev/modernc.org/sqlite#Driver.Open+ // - https://www.sqlite.org/sharedcache.html+ // - https://www.sqlite.org/pragma.html+ sqliteDB, err := sql.Open("sqlite", profile.DSN+"?_pragma=foreign_keys(0)&_pragma=busy_timeout(10000)&_pragma=journal_mode(WAL)")+ if err != nil {+ return nil, errors.Wrapf(err, "failed to open db with dsn: %s", profile.DSN)+ }++ driver := Driver{db: sqliteDB, profile: profile}++ return &driver, nil}func (d *Driver) Vacuum(ctx context.Context) error {diff --git a/test/server/server.go b/test/server/server.goindex 1bf400d13..6359eba25 100644--- a/test/server/server.go+++ b/test/server/server.go@@ -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 {diff --git a/test/store/store.go b/test/store/store.goindex d530fe685..2ebb4a567 100644--- a/test/store/store.go+++ b/test/store/store.go@@ -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}