Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
canifa_note
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vũ Hoàng Anh
canifa_note
Commits
f05a8931
Commit
f05a8931
authored
Jan 28, 2024
by
Steven
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore: fix list memos
parent
a4452d8a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
main.go
bin/memos/main.go
+3
-3
memo.go
store/db/postgres/memo.go
+2
-2
memo.go
store/db/sqlite/memo.go
+1
-1
No files found.
bin/memos/main.go
View file @
f05a8931
...
...
@@ -58,14 +58,14 @@ var (
return
}
store
:=
store
.
New
(
dbDriver
,
profile
)
if
err
:=
store
.
MigrateManually
(
ctx
);
err
!=
nil
{
store
Instance
:=
store
.
New
(
dbDriver
,
profile
)
if
err
:=
store
Instance
.
MigrateManually
(
ctx
);
err
!=
nil
{
cancel
()
log
.
Error
(
"failed to migrate manually"
,
zap
.
Error
(
err
))
return
}
s
,
err
:=
server
.
NewServer
(
ctx
,
profile
,
store
)
s
,
err
:=
server
.
NewServer
(
ctx
,
profile
,
store
Instance
)
if
err
!=
nil
{
cancel
()
log
.
Error
(
"failed to create server"
,
zap
.
Error
(
err
))
...
...
store/db/postgres/memo.go
View file @
f05a8931
...
...
@@ -100,8 +100,8 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
query
:=
`SELECT `
+
strings
.
Join
(
fields
,
", "
)
+
`
FROM memo
FULl
JOIN memo_organizer ON memo.id = memo_organizer.memo_id AND memo.creator_id = memo_organizer.user_id
FULL
JOIN memo_relation ON memo.id = memo_relation.memo_id AND memo_relation.type = 'COMMENT'
LEFT
JOIN memo_organizer ON memo.id = memo_organizer.memo_id AND memo.creator_id = memo_organizer.user_id
LEFT
JOIN memo_relation ON memo.id = memo_relation.memo_id AND memo_relation.type = 'COMMENT'
WHERE `
+
strings
.
Join
(
where
,
" AND "
)
+
`
ORDER BY `
+
strings
.
Join
(
orders
,
", "
)
if
find
.
Limit
!=
nil
{
...
...
store/db/sqlite/memo.go
View file @
f05a8931
...
...
@@ -99,7 +99,7 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
query
:=
"SELECT "
+
strings
.
Join
(
fields
,
", "
)
+
"FROM `memo` "
+
"LEFT JOIN `memo_organizer` ON `memo`.`id` = `memo_organizer`.`memo_id` AND `memo`.`creator_id` = `memo_organizer`.`user_id` "
+
"
FULL JOIN `memo_relation` ON `memo`.`id` = `memo_relation`.`memo_id` AND `memo_relation`.`type` =
\"
COMMENT
\"
"
+
" "
+
"
LEFT JOIN `memo_relation` ON `memo`.`id` = `memo_relation`.`memo_id` AND `memo_relation`.`type` =
\"
COMMENT
\
"
"
+
"WHERE "
+
strings
.
Join
(
where
,
" AND "
)
+
" "
+
"ORDER BY "
+
strings
.
Join
(
orders
,
", "
)
if
find
.
Limit
!=
nil
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment