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: update memo store
Stevenb2fc3076f6f0
diff --git a/store/db/mysql/memo.go b/store/db/mysql/memo.goindex 7b14686d5..5b2e05355 100644--- a/store/db/mysql/memo.go+++ b/store/db/mysql/memo.go@@ -12,9 +12,9 @@ import ()func (d *DB) CreateMemo(ctx context.Context, create *store.Memo) (*store.Memo, error) {- fields := []string{"`creator_id`", "`content`", "`visibility`"}- placeholder := []string{"?", "?", "?"}- args := []any{create.CreatorID, create.Content, create.Visibility}+ fields := []string{"`resource_name`", "`creator_id`", "`content`", "`visibility`"}+ placeholder := []string{"?", "?", "?", "?"}+ args := []any{create.ResourceName, create.CreatorID, create.Content, create.Visibility}stmt := "INSERT INTO `memo` (" + strings.Join(fields, ", ") + ") VALUES (" + strings.Join(placeholder, ", ") + ")"result, err := d.db.ExecContext(ctx, stmt, args...)@@ -43,6 +43,9 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memoif v := find.ID; v != nil {where, args = append(where, "`memo`.`id` = ?"), append(args, *v)}+ if v := find.ResourceName; v != nil {+ where, args = append(where, "`memo`.`resource_name` = ?"), append(args, *v)+ }if v := find.CreatorID; v != nil {where, args = append(where, "`memo`.`creator_id` = ?"), append(args, *v)}@@ -91,6 +94,7 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memofields := []string{"`memo`.`id` AS `id`",+ "`memo`.`resource_name` AS `resource_name`","`memo`.`creator_id` AS `creator_id`","UNIX_TIMESTAMP(`memo`.`created_ts`) AS `created_ts`","UNIX_TIMESTAMP(`memo`.`updated_ts`) AS `updated_ts`",@@ -122,6 +126,7 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memovar memo store.Memodests := []any{&memo.ID,+ &memo.ResourceName,&memo.CreatorID,&memo.CreatedTs,&memo.UpdatedTs,@@ -161,6 +166,9 @@ func (d *DB) GetMemo(ctx context.Context, find *store.FindMemo) (*store.Memo, erfunc (d *DB) UpdateMemo(ctx context.Context, update *store.UpdateMemo) error {set, args := []string{}, []any{}+ if v := update.ResourceName; v != nil {+ set, args = append(set, "`resource_name` = ?"), append(args, *v)+ }if v := update.CreatedTs; v != nil {set, args = append(set, "`created_ts` = FROM_UNIXTIME(?)"), append(args, *v)}diff --git a/store/db/mysql/migration/dev/LATEST__SCHEMA.sql b/store/db/mysql/migration/dev/LATEST__SCHEMA.sqlindex 2ff4b65e7..b5379a348 100644--- a/store/db/mysql/migration/dev/LATEST__SCHEMA.sql+++ b/store/db/mysql/migration/dev/LATEST__SCHEMA.sql@@ -36,6 +36,7 @@ CREATE TABLE `user_setting` (-- memoCREATE TABLE `memo` (`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY,+ `resource_name` VARCHAR(256) NOT NULL UNIQUE,`creator_id` INT NOT NULL,`created_ts` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,`updated_ts` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,diff --git a/store/db/postgres/memo.go b/store/db/postgres/memo.goindex f363818f9..ad74a3724 100644--- a/store/db/postgres/memo.go+++ b/store/db/postgres/memo.go@@ -12,8 +12,8 @@ import ()func (d *DB) CreateMemo(ctx context.Context, create *store.Memo) (*store.Memo, error) {- fields := []string{"creator_id", "content", "visibility"}- args := []any{create.CreatorID, create.Content, create.Visibility}+ fields := []string{"resource_name", "creator_id", "content", "visibility"}+ args := []any{create.ResourceName, create.CreatorID, create.Content, create.Visibility}stmt := "INSERT INTO memo (" + strings.Join(fields, ", ") + ") VALUES (" + placeholders(len(args)) + ") RETURNING id, created_ts, updated_ts, row_status"if err := d.db.QueryRowContext(ctx, stmt, args...).Scan(@@ -34,6 +34,9 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memoif v := find.ID; v != nil {where, args = append(where, "memo.id = "+placeholder(len(args)+1)), append(args, *v)}+ if v := find.ResourceName; v != nil {+ where, args = append(where, "memo.resource_name = "+placeholder(len(args)+1)), append(args, *v)+ }if v := find.CreatorID; v != nil {where, args = append(where, "memo.creator_id = "+placeholder(len(args)+1)), append(args, *v)}@@ -82,6 +85,7 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memofields := []string{`memo.id AS id`,+ `memo.resource_name AS resource_name`,`memo.creator_id AS creator_id`,`memo.created_ts AS created_ts`,`memo.updated_ts AS updated_ts`,@@ -118,6 +122,7 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memovar memo store.Memodests := []any{&memo.ID,+ &memo.ResourceName,&memo.CreatorID,&memo.CreatedTs,&memo.UpdatedTs,@@ -157,6 +162,9 @@ func (d *DB) GetMemo(ctx context.Context, find *store.FindMemo) (*store.Memo, erfunc (d *DB) UpdateMemo(ctx context.Context, update *store.UpdateMemo) error {set, args := []string{}, []any{}+ if v := update.ResourceName; v != nil {+ set, args = append(set, "resource_name = "+placeholder(len(args)+1)), append(args, *v)+ }if v := update.CreatedTs; v != nil {set, args = append(set, "created_ts = "+placeholder(len(args)+1)), append(args, *v)}diff --git a/store/db/postgres/migration/dev/LATEST__SCHEMA.sql b/store/db/postgres/migration/dev/LATEST__SCHEMA.sqlindex 8c414fd1c..b31e5f4eb 100644--- a/store/db/postgres/migration/dev/LATEST__SCHEMA.sql+++ b/store/db/postgres/migration/dev/LATEST__SCHEMA.sql@@ -36,6 +36,7 @@ CREATE TABLE user_setting (-- memoCREATE TABLE memo (id SERIAL PRIMARY KEY,+ resource_name TEXT NOT NULL UNIQUE,creator_id INTEGER NOT NULL,created_ts BIGINT NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW()),updated_ts BIGINT NOT NULL DEFAULT EXTRACT(EPOCH FROM NOW()),