YourSelfHosted/memos
1
0
Fork 0
mirror of https://github.com/usememos/memos.git synced 2025-06-05 22:09:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: create resource without some attributes (#2354)

Browse Source
This commit is contained in:
Athurg Gooth
2023-10-08 18:29:03 +08:00
committed by GitHub
parent c0619ef4a4
commit 1fbd568dfe
2 changed files with 60 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
store/db/mysql/resource.go
View File

@@ -12,18 +12,36 @@ import (
) )
func (d *DB) CreateResource(ctx context.Context, create *store.Resource) (*store.Resource, error) { func (d *DB) CreateResource(ctx context.Context, create *store.Resource) (*store.Resource, error) {
stmt := "INSERT INTO `resource` (`filename`, `blob`, `external_link`, `type`, `size`, `creator_id`, `internal_path`) VALUES (?, ?, ?, ?, ?, ?, ?)" fields := []string{"`filename`", "`blob`", "`external_link`", "`type`", "`size`", "`creator_id`", "`internal_path`"}
result, err := d.db.ExecContext( placeholder := []string{"?", "?", "?", "?", "?", "?", "?"}
ctx, args := []any{create.Filename, create.Blob, create.ExternalLink, create.Type, create.Size, create.CreatorID, create.InternalPath}
stmt,
create.Filename, if create.ID != 0 {
create.Blob, fields = append(fields, "`id`")
create.ExternalLink, placeholder = append(placeholder, "?")
create.Type, args = append(args, create.ID)
create.Size, }
create.CreatorID,
create.InternalPath, if create.CreatedTs != 0 {
) fields = append(fields, "`created_ts`")
placeholder = append(placeholder, "FROM_UNIXTIME(?)")
args = append(args, create.CreatedTs)
}
if create.UpdatedTs != 0 {
fields = append(fields, "`updated_ts`")
placeholder = append(placeholder, "FROM_UNIXTIME(?)")
args = append(args, create.UpdatedTs)
}
if create.MemoID != nil {
fields = append(fields, "`memo_id`")
placeholder = append(placeholder, "?")
args = append(args, *create.MemoID)
}
stmt := "INSERT INTO `resource` (" + strings.Join(fields, ", ") + ") VALUES (" + strings.Join(placeholder, ", ") + ")"
result, err := d.db.ExecContext(ctx, stmt, args...)
if err != nil { if err != nil {
return nil, err return nil, err
} }

54
store/db/sqlite/resource.go
View File

@@ -10,30 +10,36 @@ import (
) )
func (d *DB) CreateResource(ctx context.Context, create *store.Resource) (*store.Resource, error) { func (d *DB) CreateResource(ctx context.Context, create *store.Resource) (*store.Resource, error) {
stmt := ` fields := []string{"`filename`", "`blob`", "`external_link`", "`type`", "`size`", "`creator_id`", "`internal_path`"}
INSERT INTO resource ( placeholder := []string{"?", "?", "?", "?", "?", "?", "?"}
filename, args := []any{create.Filename, create.Blob, create.ExternalLink, create.Type, create.Size, create.CreatorID, create.InternalPath}
blob,
external_link, if create.ID != 0 {
type, fields = append(fields, "`id`")
size, placeholder = append(placeholder, "?")
creator_id, args = append(args, create.ID)
internal_path }
)
VALUES (?, ?, ?, ?, ?, ?, ?) if create.CreatedTs != 0 {
RETURNING id, created_ts, updated_ts fields = append(fields, "`created_ts`")
` placeholder = append(placeholder, "?")
if err := d.db.QueryRowContext( args = append(args, create.CreatedTs)
ctx, }
stmt,
create.Filename, if create.UpdatedTs != 0 {
create.Blob, fields = append(fields, "`updated_ts`")
create.ExternalLink, placeholder = append(placeholder, "?")
create.Type, args = append(args, create.UpdatedTs)
create.Size, }
create.CreatorID,
create.InternalPath, if create.MemoID != nil {
).Scan(&create.ID, &create.CreatedTs, &create.UpdatedTs); err != nil { fields = append(fields, "`memo_id`")
placeholder = append(placeholder, "?")
args = append(args, *create.MemoID)
}
stmt := "INSERT INTO `resource` (" + strings.Join(fields, ", ") + ") VALUES (" + strings.Join(placeholder, ", ") + ") RETURNING `id`, `created_ts`, `updated_ts`"
if err := d.db.QueryRowContext(ctx, stmt, args...).Scan(&create.ID, &create.CreatedTs, &create.UpdatedTs); err != nil {
return nil, err return nil, err
} }