Skip to content

armgit / memos

Public Imported from GitHub
0

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.

test: remove raw SQL migration backfill test setup

memoclawe16451777300
diff --git a/store/test/containers.go b/store/test/containers.go
index 8ad5d20dc..0b98c5c2b 100644
--- a/store/test/containers.go
+++ b/store/test/containers.go
@@ -289,9 +289,10 @@ func StartMemosContainer(ctx context.Context, cfg MemosContainerConfig) (testcon
if os.Getenv("MEMOS_TEST_IMAGE_BUILT") == "1" {
req.Image = "memos-test:local"
} else {
+ req.Image = ""
req.FromDockerfile = testcontainers.FromDockerfile{
Context: "../../",
- Dockerfile: "Dockerfile",
+ Dockerfile: "scripts/Dockerfile",
}
}
}
diff --git a/store/test/migrator_test.go b/store/test/migrator_test.go
index 369438e0b..3eb541381 100644
--- a/store/test/migrator_test.go
+++ b/store/test/migrator_test.go
@@ -7,10 +7,8 @@ import (
"testing"
"time"
- "github.com/pkg/errors"
"github.com/stretchr/testify/require"
- storepb "github.com/usememos/memos/proto/gen/store"
"github.com/usememos/memos/store"
)
@@ -89,58 +87,6 @@ func TestMigrationWithData(t *testing.T) {
require.Equal(t, "Data before migration re-run", memo.Content, "memo content should be preserved")
}
-func TestMigrationBackfillsInboxMemoCommentPayload(t *testing.T) {
- t.Parallel()
-
- ctx := context.Background()
- ts := NewTestingStore(ctx, t)
-
- user, err := createTestingHostUser(ctx, ts)
- require.NoError(t, err)
- commentMemo, err := ts.CreateMemo(ctx, &store.Memo{
- UID: "migration-comment-memo",
- CreatorID: user.ID,
- Content: "Comment memo",
- Visibility: store.Public,
- })
- require.NoError(t, err)
- relatedMemo, err := ts.CreateMemo(ctx, &store.Memo{
- UID: "migration-related-memo",
- CreatorID: user.ID,
- Content: "Related memo",
- Visibility: store.Public,
- })
- require.NoError(t, err)
-
- driver := getDriverFromEnv()
- require.NoError(t, createLegacyActivityTable(ctx, ts, driver))
- require.NoError(t, insertLegacyInboxActivity(ctx, ts, driver, user.ID, commentMemo.ID, relatedMemo.ID))
- _, err = ts.UpsertInstanceSetting(ctx, &storepb.InstanceSetting{
- Key: storepb.InstanceSettingKey_BASIC,
- Value: &storepb.InstanceSetting_BasicSetting{
- BasicSetting: &storepb.InstanceBasicSetting{
- SchemaVersion: "0.27.2",
- },
- },
- })
- require.NoError(t, err)
-
- err = ts.Migrate(ctx)
- require.NoError(t, err)
-
- messageType := storepb.InboxMessage_MEMO_COMMENT
- inboxes, err := ts.ListInboxes(ctx, &store.FindInbox{
- ReceiverID: &user.ID,
- MessageType: &messageType,
- })
- require.NoError(t, err)
- require.Len(t, inboxes, 1)
- require.NotNil(t, inboxes[0].Message)
- require.NotNil(t, inboxes[0].Message.GetMemoComment())
- require.Equal(t, commentMemo.ID, inboxes[0].Message.GetMemoComment().MemoId)
- require.Equal(t, relatedMemo.ID, inboxes[0].Message.GetMemoComment().RelatedMemoId)
-}
-
// TestMigrationMultipleReRuns verifies that migration is idempotent
// even when run multiple times in succession.
func TestMigrationMultipleReRuns(t *testing.T) {
@@ -165,69 +111,6 @@ func TestMigrationMultipleReRuns(t *testing.T) {
require.Equal(t, initialVersion, finalVersion, "version should remain unchanged after multiple re-runs")
}
-func createLegacyActivityTable(ctx context.Context, ts *store.Store, driver string) error {
- var stmt string
- switch driver {
- case "sqlite":
- stmt = `CREATE TABLE activity (
- id INTEGER PRIMARY KEY AUTOINCREMENT,
- creator_id INTEGER NOT NULL,
- created_ts BIGINT NOT NULL DEFAULT (strftime('%s', 'now')),
- type TEXT NOT NULL DEFAULT '',
- level TEXT NOT NULL DEFAULT 'INFO',
- payload TEXT NOT NULL DEFAULT '{}'
- );`
- case "mysql":
- stmt = `CREATE TABLE activity (
- id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
- creator_id INT NOT NULL,
- created_ts TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
- type VARCHAR(256) NOT NULL DEFAULT '',
- level VARCHAR(256) NOT NULL DEFAULT 'INFO',
- payload TEXT NOT NULL
- );`
- case "postgres":
- stmt = `CREATE TABLE activity (
- id SERIAL PRIMARY KEY,
- creator_id INTEGER NOT NULL,
- created_ts BIGINT NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW()),
- type TEXT NOT NULL DEFAULT '',
- level TEXT NOT NULL DEFAULT 'INFO',
- payload JSONB NOT NULL DEFAULT '{}'
- );`
- default:
- return errors.Errorf("unsupported driver: %s", driver)
- }
- _, err := ts.GetDriver().GetDB().ExecContext(ctx, stmt)
- return err
-}
-
-func insertLegacyInboxActivity(ctx context.Context, ts *store.Store, driver string, receiverID, memoID, relatedMemoID int32) error {
- var insertActivityStmt string
- var insertInboxStmt string
- payload := fmt.Sprintf(`{"memoComment":{"memoId":%d,"relatedMemoId":%d}}`, memoID, relatedMemoID)
- message := `{"type":"MEMO_COMMENT","activityId":1}`
-
- switch driver {
- case "sqlite", "mysql":
- insertActivityStmt = `INSERT INTO activity (id, creator_id, type, level, payload) VALUES (?, ?, ?, ?, ?)`
- insertInboxStmt = `INSERT INTO inbox (sender_id, receiver_id, status, message) VALUES (?, ?, ?, ?)`
- case "postgres":
- insertActivityStmt = `INSERT INTO activity (id, creator_id, type, level, payload) VALUES ($1, $2, $3, $4, $5::jsonb)`
- insertInboxStmt = `INSERT INTO inbox (sender_id, receiver_id, status, message) VALUES ($1, $2, $3, $4)`
- default:
- return errors.Errorf("unsupported driver: %s", driver)
- }
-
- if _, err := ts.GetDriver().GetDB().ExecContext(ctx, insertActivityStmt, 1, receiverID, "MEMO_COMMENT", "INFO", payload); err != nil {
- return err
- }
- if _, err := ts.GetDriver().GetDB().ExecContext(ctx, insertInboxStmt, receiverID, receiverID, store.UNREAD, message); err != nil {
- return err
- }
- return nil
-}
-
// TestMigrationFromStableVersion verifies that upgrading from a stable Memos version
// to the current version works correctly. This is the critical upgrade path test.
//