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
ff5a1eeb
Commit
ff5a1eeb
authored
Feb 06, 2022
by
email
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: db release mode
parent
c77996a8
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
10 deletions
+15
-10
profile.go
bin/server/cmd/profile.go
+2
-3
root.go
bin/server/cmd/root.go
+1
-1
memos.db
resources/memos.db
+0
-0
memos_release.db
resources/memos_release.db
+0
-0
sqlite.go
store/sqlite.go
+12
-6
No files found.
bin/server/cmd/profile.go
View file @
ff5a1eeb
...
...
@@ -31,7 +31,7 @@ func checkDSN(dataDir string) (string, error) {
dataDir
=
strings
.
TrimRight
(
dataDir
,
"/"
)
if
_
,
err
:=
os
.
Stat
(
dataDir
);
err
!=
nil
{
error
:=
fmt
.
Errorf
(
"unable to access -
-data %s,
%w"
,
dataDir
,
err
)
error
:=
fmt
.
Errorf
(
"unable to access -
data %s, err
%w"
,
dataDir
,
err
)
return
""
,
error
}
...
...
@@ -43,12 +43,11 @@ func GetProfile() Profile {
mode
:=
flag
.
String
(
"mode"
,
"dev"
,
""
)
port
:=
flag
.
Int
(
"port"
,
8080
,
""
)
data
:=
flag
.
String
(
"data"
,
""
,
""
)
flag
.
Parse
()
dataDir
,
err
:=
checkDSN
(
*
data
)
if
err
!=
nil
{
fmt
.
Printf
(
"
%+v
\n
"
,
err
)
fmt
.
Printf
(
"
Failed to check dsn: %s, err: %+v
\n
"
,
dataDir
,
err
)
os
.
Exit
(
1
)
}
...
...
bin/server/cmd/root.go
View file @
ff5a1eeb
...
...
@@ -29,7 +29,7 @@ func Execute() {
}
func
(
m
*
Main
)
Run
()
error
{
db
:=
store
.
NewDB
(
m
.
profile
.
dsn
)
db
:=
store
.
NewDB
(
m
.
profile
.
dsn
,
m
.
profile
.
mode
)
if
err
:=
db
.
Open
();
err
!=
nil
{
return
fmt
.
Errorf
(
"cannot open db: %w"
,
err
)
...
...
resources/memos.db
deleted
100644 → 0
View file @
c77996a8
File deleted
resources/memos_release.db
0 → 100644
View file @
ff5a1eeb
File added
store/sqlite.go
View file @
ff5a1eeb
...
...
@@ -17,14 +17,17 @@ var seedFS embed.FS
type
DB
struct
{
Db
*
sql
.
DB
//
Datasource name.
//
datasource name
DSN
string
// mode: release or dev
mode
string
}
// NewDB returns a new instance of DB associated with the given datasource name.
func
NewDB
(
dsn
string
)
*
DB
{
func
NewDB
(
dsn
string
,
mode
string
)
*
DB
{
db
:=
&
DB
{
DSN
:
dsn
,
mode
:
mode
,
}
return
db
}
...
...
@@ -37,12 +40,15 @@ func (db *DB) Open() (err error) {
// Connect to the database.
if
db
.
Db
,
err
=
sql
.
Open
(
"sqlite3"
,
db
.
DSN
);
err
!=
nil
{
return
err
return
fmt
.
Errorf
(
"failed to open db with dsn: %s, err: %w"
,
db
.
DSN
,
err
)
}
if
db
.
mode
==
"dev"
{
// If mode is dev, then we will seed the database.
if
err
:=
db
.
seed
();
err
!=
nil
{
return
fmt
.
Errorf
(
"failed to seed: %w"
,
err
)
}
}
return
err
}
...
...
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