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: add vacuum memo relation to dev guard (#1644)
boojack9b8d69b2dd95
diff --git a/store/activity.go b/store/activity.goindex badf1a960..3fe05596d 100644--- a/store/activity.go+++ b/store/activity.go@@ -38,7 +38,7 @@ func (raw *activityRaw) toActivity() *api.Activity {// CreateActivity creates an instance of Activity.func (s *Store) CreateActivity(ctx context.Context, create *api.ActivityCreate) (*api.Activity, error) {- if s.profile.Mode == "prod" {+ if s.Profile.Mode == "prod" {return nil, nil}diff --git a/store/memo.go b/store/memo.goindex 46a0d7703..fd30dff6f 100644--- a/store/memo.go+++ b/store/memo.go@@ -53,7 +53,7 @@ func (s *Store) ComposeMemo(ctx context.Context, memo *api.Memo) (*api.Memo, errif err := s.ComposeMemoResourceList(ctx, memo); err != nil {return nil, err}- if s.profile.IsDev() {+ if s.Profile.IsDev() {if err := s.ComposeMemoRelationList(ctx, memo); err != nil {return nil, err}@@ -184,7 +184,7 @@ func (s *Store) DeleteMemo(ctx context.Context, delete *api.MemoDelete) error {if err := deleteMemo(ctx, tx, delete); err != nil {return FormatError(err)}- if err := vacuum(ctx, tx); err != nil {+ if err := s.vacuumImpl(ctx, tx); err != nil {return err}diff --git a/store/resource.go b/store/resource.goindex c12fb8764..cf9316372 100644--- a/store/resource.go+++ b/store/resource.go@@ -160,7 +160,7 @@ func (s *Store) DeleteResource(ctx context.Context, delete *api.ResourceDelete)if err := deleteResource(ctx, tx, delete); err != nil {return err}- if err := vacuum(ctx, tx); err != nil {+ if err := s.vacuumImpl(ctx, tx); err != nil {return err}diff --git a/store/store.go b/store/store.goindex 1db667cbe..7f8187c27 100644--- a/store/store.go+++ b/store/store.go@@ -10,9 +10,8 @@ import (// Store provides database access to all raw objects.type Store struct {- db *sql.DB- profile *profile.Profile-+ Profile *profile.Profile+ db *sql.DBsystemSettingCache sync.Map // map[string]*systemSettingRawuserCache sync.Map // map[int]*userRawuserSettingCache sync.Map // map[string]*userSettingRaw@@ -24,8 +23,8 @@ type Store struct {// New creates a new instance of Store.func New(db *sql.DB, profile *profile.Profile) *Store {return &Store{+ Profile: profile,db: db,- profile: profile,}}@@ -36,7 +35,7 @@ func (s *Store) Vacuum(ctx context.Context) error {}defer tx.Rollback()- if err := vacuum(ctx, tx); err != nil {+ if err := s.vacuumImpl(ctx, tx); err != nil {return err}@@ -52,8 +51,7 @@ func (s *Store) Vacuum(ctx context.Context) error {return nil}-// Exec vacuum records in a transaction.-func vacuum(ctx context.Context, tx *sql.Tx) error {+func (s *Store) vacuumImpl(ctx context.Context, tx *sql.Tx) error {if err := vacuumMemo(ctx, tx); err != nil {return err}@@ -72,8 +70,10 @@ func vacuum(ctx context.Context, tx *sql.Tx) error {if err := vacuumMemoResource(ctx, tx); err != nil {return err}- if err := vacuumMemoRelations(ctx, tx); err != nil {- return err+ if s.Profile.IsDev() {+ if err := vacuumMemoRelations(ctx, tx); err != nil {+ return err+ }}if err := vacuumTag(ctx, tx); err != nil {// Prevent revive warning.diff --git a/store/user.go b/store/user.goindex a7e5ba222..ac59ef112 100644--- a/store/user.go+++ b/store/user.go@@ -163,7 +163,7 @@ func (s *Store) DeleteUser(ctx context.Context, delete *api.UserDelete) error {if err := deleteUser(ctx, tx, delete); err != nil {return err}- if err := vacuum(ctx, tx); err != nil {+ if err := s.vacuumImpl(ctx, tx); err != nil {return err}