From 96395b6d75e92448319566aeb1602f06e2bfa9b3 Mon Sep 17 00:00:00 2001 From: Steven Date: Tue, 26 Sep 2023 19:07:14 +0800 Subject: [PATCH] chore: rename package `sqlite3` to `sqlite` --- cmd/memos.go | 4 ++-- cmd/mvrss.go | 4 ++-- cmd/setup.go | 4 ++-- store/{sqlite3 => sqlite}/activity.go | 2 +- store/{sqlite3 => sqlite}/driver.go | 2 +- store/{sqlite3 => sqlite}/resource.go | 2 +- store/{sqlite3 => sqlite}/system_setting.go | 2 +- store/{sqlite3 => sqlite}/user.go | 2 +- store/{sqlite3 => sqlite}/user_setting.go | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) rename store/{sqlite3 => sqlite}/activity.go (96%) rename store/{sqlite3 => sqlite}/driver.go (91%) rename store/{sqlite3 => sqlite}/resource.go (99%) rename store/{sqlite3 => sqlite}/system_setting.go (98%) rename store/{sqlite3 => sqlite}/user.go (99%) rename store/{sqlite3 => sqlite}/user_setting.go (99%) diff --git a/cmd/memos.go b/cmd/memos.go index ba26e39d..225470fe 100644 --- a/cmd/memos.go +++ b/cmd/memos.go @@ -17,7 +17,7 @@ import ( _profile "github.com/usememos/memos/server/profile" "github.com/usememos/memos/store" "github.com/usememos/memos/store/db" - "github.com/usememos/memos/store/sqlite3" + "github.com/usememos/memos/store/sqlite" ) const ( @@ -55,7 +55,7 @@ var ( return } - driver := sqlite3.NewDriver(db.DBInstance) + driver := sqlite.NewDriver(db.DBInstance) store := store.New(db.DBInstance, driver, profile) s, err := server.NewServer(ctx, profile, store) diff --git a/cmd/mvrss.go b/cmd/mvrss.go index 2e1722b3..aec8385e 100644 --- a/cmd/mvrss.go +++ b/cmd/mvrss.go @@ -10,7 +10,7 @@ import ( "github.com/usememos/memos/store" "github.com/usememos/memos/store/db" - "github.com/usememos/memos/store/sqlite3" + "github.com/usememos/memos/store/sqlite" ) var ( @@ -50,7 +50,7 @@ var ( return } - driver := sqlite3.NewDriver(db.DBInstance) + driver := sqlite.NewDriver(db.DBInstance) s := store.New(db.DBInstance, driver, profile) resources, err := s.ListResources(ctx, &store.FindResource{}) diff --git a/cmd/setup.go b/cmd/setup.go index 1f74d13b..c491974c 100644 --- a/cmd/setup.go +++ b/cmd/setup.go @@ -12,7 +12,7 @@ import ( "github.com/usememos/memos/common/util" "github.com/usememos/memos/store" "github.com/usememos/memos/store/db" - "github.com/usememos/memos/store/sqlite3" + "github.com/usememos/memos/store/sqlite" ) var ( @@ -47,7 +47,7 @@ var ( return } - driver := sqlite3.NewDriver(db.DBInstance) + driver := sqlite.NewDriver(db.DBInstance) store := store.New(db.DBInstance, driver, profile) if err := ExecuteSetup(ctx, store, hostUsername, hostPassword); err != nil { diff --git a/store/sqlite3/activity.go b/store/sqlite/activity.go similarity index 96% rename from store/sqlite3/activity.go rename to store/sqlite/activity.go index e6f82594..97792739 100644 --- a/store/sqlite3/activity.go +++ b/store/sqlite/activity.go @@ -1,4 +1,4 @@ -package sqlite3 +package sqlite import ( "context" diff --git a/store/sqlite3/driver.go b/store/sqlite/driver.go similarity index 91% rename from store/sqlite3/driver.go rename to store/sqlite/driver.go index 034ceb9c..9d3cdb04 100644 --- a/store/sqlite3/driver.go +++ b/store/sqlite/driver.go @@ -1,4 +1,4 @@ -package sqlite3 +package sqlite import ( "database/sql" diff --git a/store/sqlite3/resource.go b/store/sqlite/resource.go similarity index 99% rename from store/sqlite3/resource.go rename to store/sqlite/resource.go index 23ab0102..c64b5661 100644 --- a/store/sqlite3/resource.go +++ b/store/sqlite/resource.go @@ -1,4 +1,4 @@ -package sqlite3 +package sqlite import ( "context" diff --git a/store/sqlite3/system_setting.go b/store/sqlite/system_setting.go similarity index 98% rename from store/sqlite3/system_setting.go rename to store/sqlite/system_setting.go index de5b55ac..492a94ad 100644 --- a/store/sqlite3/system_setting.go +++ b/store/sqlite/system_setting.go @@ -1,4 +1,4 @@ -package sqlite3 +package sqlite import ( "context" diff --git a/store/sqlite3/user.go b/store/sqlite/user.go similarity index 99% rename from store/sqlite3/user.go rename to store/sqlite/user.go index 64e101f2..e0d4c7b0 100644 --- a/store/sqlite3/user.go +++ b/store/sqlite/user.go @@ -1,4 +1,4 @@ -package sqlite3 +package sqlite import ( "context" diff --git a/store/sqlite3/user_setting.go b/store/sqlite/user_setting.go similarity index 99% rename from store/sqlite3/user_setting.go rename to store/sqlite/user_setting.go index 72bff4cf..75c7c3fe 100644 --- a/store/sqlite3/user_setting.go +++ b/store/sqlite/user_setting.go @@ -1,4 +1,4 @@ -package sqlite3 +package sqlite import ( "context"