From 3650b32ec586dbf48a1b8f2f91f340368d1204fd Mon Sep 17 00:00:00 2001 From: Joe Chen Date: Sun, 18 Feb 2024 19:39:41 -0500 Subject: [PATCH] chore: rename `internal/db` to `internal/database` (#7665) --- .github/workflows/go.yml | 6 +- Taskfile.yml | 2 +- gen.go | 2 +- internal/cmd/admin.go | 24 +- internal/cmd/backup.go | 8 +- internal/cmd/hook.go | 46 +- internal/cmd/restore.go | 6 +- internal/cmd/serv.go | 52 +- internal/cmd/web.go | 8 +- internal/context/api_org.go | 6 +- internal/context/auth.go | 40 +- internal/context/context.go | 4 +- internal/context/go_get.go | 6 +- internal/context/org.go | 12 +- internal/context/repo.go | 56 +- internal/context/user.go | 6 +- internal/cron/cron.go | 18 +- internal/{db => database}/access_tokens.go | 2 +- .../{db => database}/access_tokens_test.go | 2 +- internal/{db => database}/actions.go | 2 +- internal/{db => database}/actions_test.go | 2 +- internal/{db => database}/attachment.go | 2 +- internal/{db => database}/backup.go | 10 +- internal/{db => database}/backup_test.go | 2 +- internal/{db => database}/comment.go | 2 +- internal/{db/db.go => database/database.go} | 8 +- internal/{db => database}/error.go | 2 +- internal/{db => database}/errors/errors.go | 0 internal/{db => database}/errors/repo.go | 0 internal/{db => database}/issue.go | 4 +- internal/{db => database}/issue_label.go | 2 +- internal/{db => database}/issue_mail.go | 2 +- internal/{db => database}/lfs.go | 2 +- internal/{db => database}/lfs_test.go | 2 +- .../{db => database}/login_source_files.go | 2 +- .../login_source_files_test.go | 2 +- internal/{db => database}/login_sources.go | 2 +- .../{db => database}/login_sources_test.go | 2 +- internal/{db => database}/main_test.go | 2 +- .../{db => database}/migrations/main_test.go | 0 .../{db => database}/migrations/migrations.go | 0 internal/{db => database}/migrations/v20.go | 0 .../{db => database}/migrations/v20_test.go | 0 internal/{db => database}/migrations/v21.go | 0 .../{db => database}/migrations/v21_test.go | 0 internal/{db => database}/milestone.go | 2 +- internal/{db => database}/mirror.go | 4 +- internal/{db => database}/mirror_test.go | 2 +- internal/{db => database}/mocks.go | 2 +- internal/{db => database}/mocks_test.go | 16 +- internal/{db => database}/models.go | 4 +- internal/{db => database}/notices.go | 2 +- internal/{db => database}/notices_test.go | 2 +- internal/{db => database}/org.go | 2 +- internal/{db => database}/org_team.go | 4 +- internal/{db => database}/orgs.go | 2 +- internal/{db => database}/orgs_test.go | 2 +- internal/{db => database}/perms.go | 2 +- internal/{db => database}/perms_test.go | 2 +- internal/{db => database}/public_keys.go | 2 +- internal/{db => database}/public_keys_test.go | 2 +- internal/{db => database}/pull.go | 2 +- internal/{db => database}/release.go | 2 +- internal/{db => database}/repo.go | 4 +- internal/{db => database}/repo_branch.go | 2 +- .../{db => database}/repo_collaboration.go | 2 +- internal/{db => database}/repo_editor.go | 4 +- internal/{db => database}/repo_editor_test.go | 2 +- internal/{db => database}/repo_tag.go | 2 +- internal/{db => database}/repo_test.go | 2 +- internal/{db => database}/repos.go | 2 +- internal/{db => database}/repos_test.go | 2 +- internal/{db => database}/schemadoc/main.go | 6 +- internal/{db => database}/ssh_key.go | 2 +- internal/{db => database}/ssh_key_test.go | 2 +- .../testdata/backup/Access.golden.json | 0 .../testdata/backup/AccessToken.golden.json | 0 .../testdata/backup/Action.golden.json | 0 .../testdata/backup/EmailAddress.golden.json | 0 .../testdata/backup/Follow.golden.json | 0 .../testdata/backup/LFSObject.golden.json | 0 .../testdata/backup/LoginSource.golden.json | 0 .../testdata/backup/Notice.golden.json | 0 internal/{db => database}/two_factor.go | 2 +- internal/{db => database}/two_factors.go | 2 +- internal/{db => database}/two_factors_test.go | 2 +- internal/{db => database}/update.go | 2 +- internal/{db => database}/users.go | 2 +- internal/{db => database}/users_test.go | 2 +- internal/{db => database}/webhook.go | 2 +- internal/{db => database}/webhook_dingtalk.go | 2 +- internal/{db => database}/webhook_discord.go | 2 +- internal/{db => database}/webhook_slack.go | 2 +- internal/{db => database}/wiki.go | 2 +- internal/form/repo.go | 14 +- internal/route/admin/admin.go | 18 +- internal/route/admin/auths.go | 26 +- internal/route/admin/notice.go | 10 +- internal/route/admin/orgs.go | 10 +- internal/route/admin/repos.go | 16 +- internal/route/admin/users.go | 50 +- internal/route/api/v1/admin/org_repo.go | 6 +- internal/route/api/v1/admin/org_team.go | 10 +- internal/route/api/v1/admin/user.go | 32 +- internal/route/api/v1/api.go | 18 +- internal/route/api/v1/convert/convert.go | 24 +- internal/route/api/v1/org/org.go | 26 +- internal/route/api/v1/repo/collaborators.go | 16 +- internal/route/api/v1/repo/commits.go | 10 +- internal/route/api/v1/repo/contents.go | 4 +- internal/route/api/v1/repo/file.go | 4 +- internal/route/api/v1/repo/hook.go | 70 +- internal/route/api/v1/repo/issue.go | 38 +- internal/route/api/v1/repo/issue_comment.go | 24 +- internal/route/api/v1/repo/issue_label.go | 26 +- internal/route/api/v1/repo/key.go | 20 +- internal/route/api/v1/repo/label.go | 20 +- internal/route/api/v1/repo/milestone.go | 16 +- internal/route/api/v1/repo/repo.go | 80 +- internal/route/api/v1/user/app.go | 8 +- internal/route/api/v1/user/email.go | 12 +- internal/route/api/v1/user/follower.go | 20 +- internal/route/api/v1/user/key.go | 20 +- internal/route/api/v1/user/user.go | 6 +- internal/route/dev/template.go | 4 +- internal/route/home.go | 32 +- internal/route/install.go | 28 +- internal/route/lfs/basic.go | 22 +- internal/route/lfs/basic_test.go | 52 +- internal/route/lfs/batch.go | 8 +- internal/route/lfs/batch_test.go | 14 +- internal/route/lfs/mocks_test.go | 750 +++++++++--------- internal/route/lfs/route.go | 36 +- internal/route/lfs/route_test.go | 128 +-- internal/route/org/members.go | 14 +- internal/route/org/org.go | 14 +- internal/route/org/setting.go | 22 +- internal/route/org/teams.go | 44 +- internal/route/repo/branch.go | 8 +- internal/route/repo/commit.go | 14 +- internal/route/repo/editor.go | 14 +- internal/route/repo/http.go | 34 +- internal/route/repo/issue.go | 144 ++-- internal/route/repo/pull.go | 76 +- internal/route/repo/release.go | 32 +- internal/route/repo/repo.go | 60 +- internal/route/repo/setting.go | 86 +- internal/route/repo/tasks.go | 18 +- internal/route/repo/view.go | 6 +- internal/route/repo/webhook.go | 106 +-- internal/route/repo/webhook_test.go | 10 +- internal/route/repo/wiki.go | 16 +- internal/route/user/auth.go | 78 +- internal/route/user/home.go | 86 +- internal/route/user/profile.go | 20 +- internal/route/user/setting.go | 110 +-- internal/ssh/ssh.go | 4 +- internal/template/template.go | 6 +- mockgen.yaml | 6 +- 159 files changed, 1612 insertions(+), 1612 deletions(-) rename internal/{db => database}/access_tokens.go (99%) rename internal/{db => database}/access_tokens_test.go (99%) rename internal/{db => database}/actions.go (99%) rename internal/{db => database}/actions_test.go (99%) rename internal/{db => database}/attachment.go (99%) rename internal/{db => database}/backup.go (96%) rename internal/{db => database}/backup_test.go (99%) rename internal/{db => database}/comment.go (99%) rename internal/{db/db.go => database/database.go} (93%) rename internal/{db => database}/error.go (99%) rename internal/{db => database}/errors/errors.go (100%) rename internal/{db => database}/errors/repo.go (100%) rename internal/{db => database}/issue.go (99%) rename internal/{db => database}/issue_label.go (99%) rename internal/{db => database}/issue_mail.go (99%) rename internal/{db => database}/lfs.go (99%) rename internal/{db => database}/lfs_test.go (99%) rename internal/{db => database}/login_source_files.go (99%) rename internal/{db => database}/login_source_files_test.go (99%) rename internal/{db => database}/login_sources.go (99%) rename internal/{db => database}/login_sources_test.go (99%) rename internal/{db => database}/main_test.go (98%) rename internal/{db => database}/migrations/main_test.go (100%) rename internal/{db => database}/migrations/migrations.go (100%) rename internal/{db => database}/migrations/v20.go (100%) rename internal/{db => database}/migrations/v20_test.go (100%) rename internal/{db => database}/migrations/v21.go (100%) rename internal/{db => database}/migrations/v21_test.go (100%) rename internal/{db => database}/milestone.go (99%) rename internal/{db => database}/mirror.go (99%) rename internal/{db => database}/mirror_test.go (97%) rename internal/{db => database}/mocks.go (98%) rename internal/{db => database}/mocks_test.go (99%) rename internal/{db => database}/models.go (99%) rename internal/{db => database}/notices.go (99%) rename internal/{db => database}/notices_test.go (99%) rename internal/{db => database}/org.go (99%) rename internal/{db => database}/org_team.go (99%) rename internal/{db => database}/orgs.go (99%) rename internal/{db => database}/orgs_test.go (99%) rename internal/{db => database}/perms.go (99%) rename internal/{db => database}/perms_test.go (99%) rename internal/{db => database}/public_keys.go (99%) rename internal/{db => database}/public_keys_test.go (99%) rename internal/{db => database}/pull.go (99%) rename internal/{db => database}/release.go (99%) rename internal/{db => database}/repo.go (99%) rename internal/{db => database}/repo_branch.go (99%) rename internal/{db => database}/repo_collaboration.go (99%) rename internal/{db => database}/repo_editor.go (99%) rename internal/{db => database}/repo_editor_test.go (98%) rename internal/{db => database}/repo_tag.go (98%) rename internal/{db => database}/repo_test.go (98%) rename internal/{db => database}/repos.go (99%) rename internal/{db => database}/repos_test.go (99%) rename internal/{db => database}/schemadoc/main.go (97%) rename internal/{db => database}/ssh_key.go (99%) rename internal/{db => database}/ssh_key_test.go (99%) rename internal/{db => database}/testdata/backup/Access.golden.json (100%) rename internal/{db => database}/testdata/backup/AccessToken.golden.json (100%) rename internal/{db => database}/testdata/backup/Action.golden.json (100%) rename internal/{db => database}/testdata/backup/EmailAddress.golden.json (100%) rename internal/{db => database}/testdata/backup/Follow.golden.json (100%) rename internal/{db => database}/testdata/backup/LFSObject.golden.json (100%) rename internal/{db => database}/testdata/backup/LoginSource.golden.json (100%) rename internal/{db => database}/testdata/backup/Notice.golden.json (100%) rename internal/{db => database}/two_factor.go (99%) rename internal/{db => database}/two_factors.go (99%) rename internal/{db => database}/two_factors_test.go (99%) rename internal/{db => database}/update.go (99%) rename internal/{db => database}/users.go (99%) rename internal/{db => database}/users_test.go (99%) rename internal/{db => database}/webhook.go (99%) rename internal/{db => database}/webhook_dingtalk.go (99%) rename internal/{db => database}/webhook_discord.go (99%) rename internal/{db => database}/webhook_slack.go (99%) rename internal/{db => database}/wiki.go (99%) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index c9feee4e2..58d79fd40 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -162,7 +162,7 @@ jobs: with: go-version: ${{ matrix.go-version }} - name: Run tests with coverage - run: go test -shuffle=on -v -race -coverprofile=coverage -covermode=atomic ./internal/db/... + run: go test -shuffle=on -v -race -coverprofile=coverage -covermode=atomic ./internal/database/... env: GOGS_DATABASE_TYPE: postgres PGPORT: 5432 @@ -188,7 +188,7 @@ jobs: with: go-version: ${{ matrix.go-version }} - name: Run tests with coverage - run: go test -shuffle=on -v -race -coverprofile=coverage -covermode=atomic ./internal/db/... + run: go test -shuffle=on -v -race -coverprofile=coverage -covermode=atomic ./internal/database/... env: GOGS_DATABASE_TYPE: mysql MYSQL_USER: root @@ -211,6 +211,6 @@ jobs: with: go-version: ${{ matrix.go-version }} - name: Run tests with coverage - run: go test -shuffle=on -v -race -parallel=1 -coverprofile=coverage -covermode=atomic ./internal/db/... + run: go test -shuffle=on -v -race -parallel=1 -coverprofile=coverage -covermode=atomic ./internal/database/... env: GOGS_DATABASE_TYPE: sqlite diff --git a/Taskfile.yml b/Taskfile.yml index 872bf9900..9bb97e97d 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -42,7 +42,7 @@ tasks: generate-schemadoc: desc: Generate database schema documentation cmds: - - go generate ./internal/db/schemadoc + - go generate ./internal/database/schemadoc generate: desc: Run all go:generate commands diff --git a/gen.go b/gen.go index ea1d85037..6b8ecab48 100644 --- a/gen.go +++ b/gen.go @@ -4,5 +4,5 @@ package main -//go:generate go install golang.org/x/tools/cmd/goimports@v0.1.10 +//go:generate go install golang.org/x/tools/cmd/goimports@v0.17.0 //go:generate go run github.com/derision-test/go-mockgen/cmd/go-mockgen@v1.3.7 diff --git a/internal/cmd/admin.go b/internal/cmd/admin.go index 8f40bf1c0..78c9e8929 100644 --- a/internal/cmd/admin.go +++ b/internal/cmd/admin.go @@ -14,7 +14,7 @@ import ( "github.com/urfave/cli" "gogs.io/gogs/internal/conf" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) var ( @@ -52,7 +52,7 @@ to make automatic initialization process more smoothly`, Name: "delete-inactive-users", Usage: "Delete all inactive accounts", Action: adminDashboardOperation( - func() error { return db.Users.DeleteInactivated() }, + func() error { return database.Users.DeleteInactivated() }, "All inactivated accounts have been deleted successfully", ), Flags: []cli.Flag{ @@ -64,7 +64,7 @@ to make automatic initialization process more smoothly`, Name: "delete-repository-archives", Usage: "Delete all repositories archives", Action: adminDashboardOperation( - db.DeleteRepositoryArchives, + database.DeleteRepositoryArchives, "All repositories archives have been deleted successfully", ), Flags: []cli.Flag{ @@ -76,7 +76,7 @@ to make automatic initialization process more smoothly`, Name: "delete-missing-repositories", Usage: "Delete all repository records that lost Git files", Action: adminDashboardOperation( - db.DeleteMissingRepositories, + database.DeleteMissingRepositories, "All repositories archives have been deleted successfully", ), Flags: []cli.Flag{ @@ -88,7 +88,7 @@ to make automatic initialization process more smoothly`, Name: "collect-garbage", Usage: "Do garbage collection on repositories", Action: adminDashboardOperation( - db.GitGcRepos, + database.GitGcRepos, "All repositories have done garbage collection successfully", ), Flags: []cli.Flag{ @@ -100,7 +100,7 @@ to make automatic initialization process more smoothly`, Name: "rewrite-authorized-keys", Usage: "Rewrite '.ssh/authorized_keys' file (caution: non-Gogs keys will be lost)", Action: adminDashboardOperation( - db.RewriteAuthorizedKeys, + database.RewriteAuthorizedKeys, "All public keys have been rewritten successfully", ), Flags: []cli.Flag{ @@ -112,7 +112,7 @@ to make automatic initialization process more smoothly`, Name: "resync-hooks", Usage: "Resync pre-receive, update and post-receive hooks", Action: adminDashboardOperation( - db.SyncRepositoryHooks, + database.SyncRepositoryHooks, "All repositories' pre-receive, update and post-receive hooks have been resynced successfully", ), Flags: []cli.Flag{ @@ -124,7 +124,7 @@ to make automatic initialization process more smoothly`, Name: "reinit-missing-repositories", Usage: "Reinitialize all repository records that lost Git files", Action: adminDashboardOperation( - db.ReinitMissingRepositories, + database.ReinitMissingRepositories, "All repository records that lost Git files have been reinitialized successfully", ), Flags: []cli.Flag{ @@ -148,15 +148,15 @@ func runCreateUser(c *cli.Context) error { } conf.InitLogging(true) - if _, err = db.SetEngine(); err != nil { + if _, err = database.SetEngine(); err != nil { return errors.Wrap(err, "set engine") } - user, err := db.Users.Create( + user, err := database.Users.Create( context.Background(), c.String("name"), c.String("email"), - db.CreateUserOptions{ + database.CreateUserOptions{ Password: c.String("password"), Activated: true, Admin: c.Bool("admin"), @@ -178,7 +178,7 @@ func adminDashboardOperation(operation func() error, successMessage string) func } conf.InitLogging(true) - if _, err = db.SetEngine(); err != nil { + if _, err = database.SetEngine(); err != nil { return errors.Wrap(err, "set engine") } diff --git a/internal/cmd/backup.go b/internal/cmd/backup.go index e258bc3d7..87767e617 100644 --- a/internal/cmd/backup.go +++ b/internal/cmd/backup.go @@ -20,7 +20,7 @@ import ( log "unknwon.dev/clog/v2" "gogs.io/gogs/internal/conf" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/osutil" ) @@ -57,7 +57,7 @@ func runBackup(c *cli.Context) error { } conf.InitLogging(true) - conn, err := db.SetEngine() + conn, err := database.SetEngine() if err != nil { return errors.Wrap(err, "set engine") } @@ -95,7 +95,7 @@ func runBackup(c *cli.Context) error { // Database dbDir := filepath.Join(rootDir, "db") - if err = db.DumpDatabase(context.Background(), conn, dbDir, c.Bool("verbose")); err != nil { + if err = database.DumpDatabase(context.Background(), conn, dbDir, c.Bool("verbose")); err != nil { log.Fatal("Failed to dump database: %v", err) } if err = z.AddDir(archiveRootDir+"/db", dbDir); err != nil { @@ -127,7 +127,7 @@ func runBackup(c *cli.Context) error { reposDump := filepath.Join(rootDir, "repositories.zip") log.Info("Dumping repositories in %q", conf.Repository.Root) if c.Bool("exclude-mirror-repos") { - repos, err := db.GetNonMirrorRepositories() + repos, err := database.GetNonMirrorRepositories() if err != nil { log.Fatal("Failed to get non-mirror repositories: %v", err) } diff --git a/internal/cmd/hook.go b/internal/cmd/hook.go index b58db829e..842777da1 100644 --- a/internal/cmd/hook.go +++ b/internal/cmd/hook.go @@ -22,7 +22,7 @@ import ( "github.com/gogs/git-module" "gogs.io/gogs/internal/conf" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/email" "gogs.io/gogs/internal/httplib" ) @@ -68,7 +68,7 @@ func runHookPreReceive(c *cli.Context) error { } setup(c, "pre-receive.log", true) - isWiki := strings.Contains(os.Getenv(db.ENV_REPO_CUSTOM_HOOKS_PATH), ".wiki.git/") + isWiki := strings.Contains(os.Getenv(database.ENV_REPO_CUSTOM_HOOKS_PATH), ".wiki.git/") buf := bytes.NewBuffer(nil) scanner := bufio.NewScanner(os.Stdin) @@ -89,10 +89,10 @@ func runHookPreReceive(c *cli.Context) error { branchName := git.RefShortName(string(fields[2])) // Branch protection - repoID := com.StrTo(os.Getenv(db.ENV_REPO_ID)).MustInt64() - protectBranch, err := db.GetProtectBranchOfRepoByName(repoID, branchName) + repoID := com.StrTo(os.Getenv(database.ENV_REPO_ID)).MustInt64() + protectBranch, err := database.GetProtectBranchOfRepoByName(repoID, branchName) if err != nil { - if db.IsErrBranchNotExist(err) { + if database.IsErrBranchNotExist(err) { continue } fail("Internal error", "GetProtectBranchOfRepoByName [repo_id: %d, branch: %s]: %v", repoID, branchName, err) @@ -105,9 +105,9 @@ func runHookPreReceive(c *cli.Context) error { bypassRequirePullRequest := false // Check if user is in whitelist when enabled - userID := com.StrTo(os.Getenv(db.ENV_AUTH_USER_ID)).MustInt64() + userID := com.StrTo(os.Getenv(database.ENV_AUTH_USER_ID)).MustInt64() if protectBranch.EnableWhitelist { - if !db.IsUserInProtectBranchWhitelist(repoID, userID, branchName) { + if !database.IsUserInProtectBranchWhitelist(repoID, userID, branchName) { fail(fmt.Sprintf("Branch '%s' is protected and you are not in the push whitelist", branchName), "") } @@ -126,7 +126,7 @@ func runHookPreReceive(c *cli.Context) error { // Check force push output, err := git.NewCommand("rev-list", "--max-count=1", oldCommitID, "^"+newCommitID). - RunInDir(db.RepoPath(os.Getenv(db.ENV_REPO_OWNER_NAME), os.Getenv(db.ENV_REPO_NAME))) + RunInDir(database.RepoPath(os.Getenv(database.ENV_REPO_OWNER_NAME), os.Getenv(database.ENV_REPO_NAME))) if err != nil { fail("Internal error", "Failed to detect force push: %v", err) } else if len(output) > 0 { @@ -134,7 +134,7 @@ func runHookPreReceive(c *cli.Context) error { } } - customHooksPath := filepath.Join(os.Getenv(db.ENV_REPO_CUSTOM_HOOKS_PATH), "pre-receive") + customHooksPath := filepath.Join(os.Getenv(database.ENV_REPO_CUSTOM_HOOKS_PATH), "pre-receive") if !com.IsFile(customHooksPath) { return nil } @@ -145,7 +145,7 @@ func runHookPreReceive(c *cli.Context) error { } else { hookCmd = exec.Command(customHooksPath) } - hookCmd.Dir = db.RepoPath(os.Getenv(db.ENV_REPO_OWNER_NAME), os.Getenv(db.ENV_REPO_NAME)) + hookCmd.Dir = database.RepoPath(os.Getenv(database.ENV_REPO_OWNER_NAME), os.Getenv(database.ENV_REPO_NAME)) hookCmd.Stdout = os.Stdout hookCmd.Stdin = buf hookCmd.Stderr = os.Stderr @@ -168,7 +168,7 @@ func runHookUpdate(c *cli.Context) error { fail("First argument 'refName' is empty", "First argument 'refName' is empty") } - customHooksPath := filepath.Join(os.Getenv(db.ENV_REPO_CUSTOM_HOOKS_PATH), "update") + customHooksPath := filepath.Join(os.Getenv(database.ENV_REPO_CUSTOM_HOOKS_PATH), "update") if !com.IsFile(customHooksPath) { return nil } @@ -179,7 +179,7 @@ func runHookUpdate(c *cli.Context) error { } else { hookCmd = exec.Command(customHooksPath, args...) } - hookCmd.Dir = db.RepoPath(os.Getenv(db.ENV_REPO_OWNER_NAME), os.Getenv(db.ENV_REPO_NAME)) + hookCmd.Dir = database.RepoPath(os.Getenv(database.ENV_REPO_OWNER_NAME), os.Getenv(database.ENV_REPO_NAME)) hookCmd.Stdout = os.Stdout hookCmd.Stdin = os.Stdin hookCmd.Stderr = os.Stderr @@ -199,7 +199,7 @@ func runHookPostReceive(c *cli.Context) error { // so we need to setup additional services for email notifications. email.NewContext() - isWiki := strings.Contains(os.Getenv(db.ENV_REPO_CUSTOM_HOOKS_PATH), ".wiki.git/") + isWiki := strings.Contains(os.Getenv(database.ENV_REPO_CUSTOM_HOOKS_PATH), ".wiki.git/") buf := bytes.NewBuffer(nil) scanner := bufio.NewScanner(os.Stdin) @@ -217,24 +217,24 @@ func runHookPostReceive(c *cli.Context) error { continue } - options := db.PushUpdateOptions{ + options := database.PushUpdateOptions{ OldCommitID: string(fields[0]), NewCommitID: string(fields[1]), FullRefspec: string(fields[2]), - PusherID: com.StrTo(os.Getenv(db.ENV_AUTH_USER_ID)).MustInt64(), - PusherName: os.Getenv(db.ENV_AUTH_USER_NAME), - RepoUserName: os.Getenv(db.ENV_REPO_OWNER_NAME), - RepoName: os.Getenv(db.ENV_REPO_NAME), + PusherID: com.StrTo(os.Getenv(database.ENV_AUTH_USER_ID)).MustInt64(), + PusherName: os.Getenv(database.ENV_AUTH_USER_NAME), + RepoUserName: os.Getenv(database.ENV_REPO_OWNER_NAME), + RepoName: os.Getenv(database.ENV_REPO_NAME), } - if err := db.PushUpdate(options); err != nil { + if err := database.PushUpdate(options); err != nil { log.Error("PushUpdate: %v", err) } // Ask for running deliver hook and test pull request tasks q := make(url.Values) q.Add("branch", git.RefShortName(options.FullRefspec)) - q.Add("secret", os.Getenv(db.ENV_REPO_OWNER_SALT_MD5)) - q.Add("pusher", os.Getenv(db.ENV_AUTH_USER_ID)) + q.Add("secret", os.Getenv(database.ENV_REPO_OWNER_SALT_MD5)) + q.Add("pusher", os.Getenv(database.ENV_AUTH_USER_ID)) reqURL := fmt.Sprintf("%s%s/%s/tasks/trigger?%s", conf.Server.LocalRootURL, options.RepoUserName, options.RepoName, q.Encode()) log.Trace("Trigger task: %s", reqURL) @@ -252,7 +252,7 @@ func runHookPostReceive(c *cli.Context) error { } } - customHooksPath := filepath.Join(os.Getenv(db.ENV_REPO_CUSTOM_HOOKS_PATH), "post-receive") + customHooksPath := filepath.Join(os.Getenv(database.ENV_REPO_CUSTOM_HOOKS_PATH), "post-receive") if !com.IsFile(customHooksPath) { return nil } @@ -263,7 +263,7 @@ func runHookPostReceive(c *cli.Context) error { } else { hookCmd = exec.Command(customHooksPath) } - hookCmd.Dir = db.RepoPath(os.Getenv(db.ENV_REPO_OWNER_NAME), os.Getenv(db.ENV_REPO_NAME)) + hookCmd.Dir = database.RepoPath(os.Getenv(database.ENV_REPO_OWNER_NAME), os.Getenv(database.ENV_REPO_NAME)) hookCmd.Stdout = os.Stdout hookCmd.Stdin = buf hookCmd.Stderr = os.Stderr diff --git a/internal/cmd/restore.go b/internal/cmd/restore.go index c71165236..871c3be93 100644 --- a/internal/cmd/restore.go +++ b/internal/cmd/restore.go @@ -17,7 +17,7 @@ import ( log "unknwon.dev/clog/v2" "gogs.io/gogs/internal/conf" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/osutil" "gogs.io/gogs/internal/semverutil" ) @@ -108,14 +108,14 @@ func runRestore(c *cli.Context) error { } conf.InitLogging(true) - conn, err := db.SetEngine() + conn, err := database.SetEngine() if err != nil { return errors.Wrap(err, "set engine") } // Database dbDir := path.Join(archivePath, "db") - if err = db.ImportDatabase(context.Background(), conn, dbDir, c.Bool("verbose")); err != nil { + if err = database.ImportDatabase(context.Background(), conn, dbDir, c.Bool("verbose")); err != nil { log.Fatal("Failed to import database: %v", err) } diff --git a/internal/cmd/serv.go b/internal/cmd/serv.go index accffc94f..c8af87649 100644 --- a/internal/cmd/serv.go +++ b/internal/cmd/serv.go @@ -18,7 +18,7 @@ import ( log "unknwon.dev/clog/v2" "gogs.io/gogs/internal/conf" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) const ( @@ -95,7 +95,7 @@ func setup(c *cli.Context, logFile string, connectDB bool) { _ = os.Chdir(conf.WorkDir()) } - if _, err := db.SetEngine(); err != nil { + if _, err := database.SetEngine(); err != nil { fail("Internal error", "Failed to set database engine: %v", err) } } @@ -108,28 +108,28 @@ func parseSSHCmd(cmd string) (string, string) { return ss[0], strings.Replace(ss[1], "'/", "'", 1) } -func checkDeployKey(key *db.PublicKey, repo *db.Repository) { +func checkDeployKey(key *database.PublicKey, repo *database.Repository) { // Check if this deploy key belongs to current repository. - if !db.HasDeployKey(key.ID, repo.ID) { + if !database.HasDeployKey(key.ID, repo.ID) { fail("Key access denied", "Deploy key access denied: [key_id: %d, repo_id: %d]", key.ID, repo.ID) } // Update deploy key activity. - deployKey, err := db.GetDeployKeyByRepo(key.ID, repo.ID) + deployKey, err := database.GetDeployKeyByRepo(key.ID, repo.ID) if err != nil { fail("Internal error", "GetDeployKey: %v", err) } deployKey.Updated = time.Now() - if err = db.UpdateDeployKey(deployKey); err != nil { + if err = database.UpdateDeployKey(deployKey); err != nil { fail("Internal error", "UpdateDeployKey: %v", err) } } -var allowedCommands = map[string]db.AccessMode{ - "git-upload-pack": db.AccessModeRead, - "git-upload-archive": db.AccessModeRead, - "git-receive-pack": db.AccessModeWrite, +var allowedCommands = map[string]database.AccessMode{ + "git-upload-pack": database.AccessModeRead, + "git-upload-archive": database.AccessModeRead, + "git-receive-pack": database.AccessModeWrite, } func runServ(c *cli.Context) error { @@ -162,17 +162,17 @@ func runServ(c *cli.Context) error { repoName := strings.TrimSuffix(strings.ToLower(repoFields[1]), ".git") repoName = strings.TrimSuffix(repoName, ".wiki") - owner, err := db.Users.GetByUsername(ctx, ownerName) + owner, err := database.Users.GetByUsername(ctx, ownerName) if err != nil { - if db.IsErrUserNotExist(err) { + if database.IsErrUserNotExist(err) { fail("Repository owner does not exist", "Unregistered owner: %s", ownerName) } fail("Internal error", "Failed to get repository owner '%s': %v", ownerName, err) } - repo, err := db.GetRepositoryByName(owner.ID, repoName) + repo, err := database.GetRepositoryByName(owner.ID, repoName) if err != nil { - if db.IsErrRepoNotExist(err) { + if database.IsErrRepoNotExist(err) { fail(_ACCESS_DENIED_MESSAGE, "Repository does not exist: %s/%s", owner.Name, repoName) } fail("Internal error", "Failed to get repository: %v", err) @@ -185,19 +185,19 @@ func runServ(c *cli.Context) error { } // Prohibit push to mirror repositories. - if requestMode > db.AccessModeRead && repo.IsMirror { + if requestMode > database.AccessModeRead && repo.IsMirror { fail("Mirror repository is read-only", "") } // Allow anonymous (user is nil) clone for public repositories. - var user *db.User + var user *database.User - key, err := db.GetPublicKeyByID(com.StrTo(strings.TrimPrefix(c.Args()[0], "key-")).MustInt64()) + key, err := database.GetPublicKeyByID(com.StrTo(strings.TrimPrefix(c.Args()[0], "key-")).MustInt64()) if err != nil { fail("Invalid key ID", "Invalid key ID '%s': %v", c.Args()[0], err) } - if requestMode == db.AccessModeWrite || repo.IsPrivate { + if requestMode == database.AccessModeWrite || repo.IsPrivate { // Check deploy key or user key. if key.IsDeployKey() { if key.Mode < requestMode { @@ -205,20 +205,20 @@ func runServ(c *cli.Context) error { } checkDeployKey(key, repo) } else { - user, err = db.Users.GetByKeyID(ctx, key.ID) + user, err = database.Users.GetByKeyID(ctx, key.ID) if err != nil { fail("Internal error", "Failed to get user by key ID '%d': %v", key.ID, err) } - mode := db.Perms.AccessMode(ctx, user.ID, repo.ID, - db.AccessModeOptions{ + mode := database.Perms.AccessMode(ctx, user.ID, repo.ID, + database.AccessModeOptions{ OwnerID: repo.OwnerID, Private: repo.IsPrivate, }, ) if mode < requestMode { clientMessage := _ACCESS_DENIED_MESSAGE - if mode >= db.AccessModeRead { + if mode >= database.AccessModeRead { clientMessage = "You do not have sufficient authorization for this action" } fail(clientMessage, @@ -238,13 +238,13 @@ func runServ(c *cli.Context) error { // Update user key activity. if key.ID > 0 { - key, err := db.GetPublicKeyByID(key.ID) + key, err := database.GetPublicKeyByID(key.ID) if err != nil { fail("Internal error", "GetPublicKeyByID: %v", err) } key.Updated = time.Now() - if err = db.UpdatePublicKey(key); err != nil { + if err = database.UpdatePublicKey(key); err != nil { fail("Internal error", "UpdatePublicKey: %v", err) } } @@ -261,8 +261,8 @@ func runServ(c *cli.Context) error { } else { gitCmd = exec.Command(verb, repoFullName) } - if requestMode == db.AccessModeWrite { - gitCmd.Env = append(os.Environ(), db.ComposeHookEnvs(db.ComposeHookEnvsOptions{ + if requestMode == database.AccessModeWrite { + gitCmd.Env = append(os.Environ(), database.ComposeHookEnvs(database.ComposeHookEnvsOptions{ AuthUser: user, OwnerName: owner.Name, OwnerSalt: owner.Salt, diff --git a/internal/cmd/web.go b/internal/cmd/web.go index 3be1db06f..54b02ff95 100644 --- a/internal/cmd/web.go +++ b/internal/cmd/web.go @@ -33,7 +33,7 @@ import ( "gogs.io/gogs/internal/app" "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/form" "gogs.io/gogs/internal/osutil" "gogs.io/gogs/internal/route" @@ -107,7 +107,7 @@ func newMacaron() *macaron.Macaron { conf.Picture.RepositoryAvatarUploadPath, macaron.StaticOptions{ ETag: true, - Prefix: db.REPO_AVATAR_URL_PREFIX, + Prefix: database.REPO_AVATAR_URL_PREFIX, SkipLogging: conf.Server.DisableRouterLog, }, )) @@ -155,7 +155,7 @@ func newMacaron() *macaron.Macaron { HealthCheckFuncs: []*toolbox.HealthCheckFuncDesc{ { Desc: "Database connection", - Func: db.Ping, + Func: database.Ping, }, }, })) @@ -305,7 +305,7 @@ func runWeb(c *cli.Context) error { }, context.InjectParamsUser()) m.Get("/attachments/:uuid", func(c *context.Context) { - attach, err := db.GetAttachmentByUUID(c.Params(":uuid")) + attach, err := database.GetAttachmentByUUID(c.Params(":uuid")) if err != nil { c.NotFoundOrError(err, "get attachment by UUID") return diff --git a/internal/context/api_org.go b/internal/context/api_org.go index 3927b890e..e077928e5 100644 --- a/internal/context/api_org.go +++ b/internal/context/api_org.go @@ -5,10 +5,10 @@ package context import ( - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) type APIOrganization struct { - Organization *db.User - Team *db.Team + Organization *database.User + Team *database.Team } diff --git a/internal/context/auth.go b/internal/context/auth.go index b1125e3d0..a1b489a8b 100644 --- a/internal/context/auth.go +++ b/internal/context/auth.go @@ -19,7 +19,7 @@ import ( "gogs.io/gogs/internal/auth" "gogs.io/gogs/internal/conf" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/tool" ) @@ -109,7 +109,7 @@ func isAPIPath(url string) bool { // authenticatedUserID returns the ID of the authenticated user, along with a bool value // which indicates whether the user uses token authentication. func authenticatedUserID(c *macaron.Context, sess session.Store) (_ int64, isTokenAuth bool) { - if !db.HasEngine { + if !database.HasEngine { return 0, false } @@ -132,14 +132,14 @@ func authenticatedUserID(c *macaron.Context, sess session.Store) (_ int64, isTok // Let's see if token is valid. if len(tokenSHA) > 0 { - t, err := db.AccessTokens.GetBySHA1(c.Req.Context(), tokenSHA) + t, err := database.AccessTokens.GetBySHA1(c.Req.Context(), tokenSHA) if err != nil { - if !db.IsErrAccessTokenNotExist(err) { + if !database.IsErrAccessTokenNotExist(err) { log.Error("GetAccessTokenBySHA: %v", err) } return 0, false } - if err = db.AccessTokens.Touch(c.Req.Context(), t.ID); err != nil { + if err = database.AccessTokens.Touch(c.Req.Context(), t.ID); err != nil { log.Error("Failed to touch access token: %v", err) } return t.UserID, true @@ -151,9 +151,9 @@ func authenticatedUserID(c *macaron.Context, sess session.Store) (_ int64, isTok return 0, false } if id, ok := uid.(int64); ok { - _, err := db.Users.GetByID(c.Req.Context(), id) + _, err := database.Users.GetByID(c.Req.Context(), id) if err != nil { - if !db.IsErrUserNotExist(err) { + if !database.IsErrUserNotExist(err) { log.Error("Failed to get user by ID: %v", err) } return 0, false @@ -165,8 +165,8 @@ func authenticatedUserID(c *macaron.Context, sess session.Store) (_ int64, isTok // authenticatedUser returns the user object of the authenticated user, along with two bool values // which indicate whether the user uses HTTP Basic Authentication or token authentication respectively. -func authenticatedUser(ctx *macaron.Context, sess session.Store) (_ *db.User, isBasicAuth, isTokenAuth bool) { - if !db.HasEngine { +func authenticatedUser(ctx *macaron.Context, sess session.Store) (_ *database.User, isBasicAuth, isTokenAuth bool) { + if !database.HasEngine { return nil, false, false } @@ -176,20 +176,20 @@ func authenticatedUser(ctx *macaron.Context, sess session.Store) (_ *db.User, is if conf.Auth.EnableReverseProxyAuthentication { webAuthUser := ctx.Req.Header.Get(conf.Auth.ReverseProxyAuthenticationHeader) if len(webAuthUser) > 0 { - user, err := db.Users.GetByUsername(ctx.Req.Context(), webAuthUser) + user, err := database.Users.GetByUsername(ctx.Req.Context(), webAuthUser) if err != nil { - if !db.IsErrUserNotExist(err) { + if !database.IsErrUserNotExist(err) { log.Error("Failed to get user by name: %v", err) return nil, false, false } // Check if enabled auto-registration. if conf.Auth.EnableReverseProxyAutoRegistration { - user, err = db.Users.Create( + user, err = database.Users.Create( ctx.Req.Context(), webAuthUser, gouuid.NewV4().String()+"@localhost", - db.CreateUserOptions{ + database.CreateUserOptions{ Activated: true, }, ) @@ -210,7 +210,7 @@ func authenticatedUser(ctx *macaron.Context, sess session.Store) (_ *db.User, is if len(auths) == 2 && auths[0] == "Basic" { uname, passwd, _ := tool.BasicAuthDecode(auths[1]) - u, err := db.Users.Authenticate(ctx.Req.Context(), uname, passwd, -1) + u, err := database.Users.Authenticate(ctx.Req.Context(), uname, passwd, -1) if err != nil { if !auth.IsErrBadCredentials(err) { log.Error("Failed to authenticate user: %v", err) @@ -224,7 +224,7 @@ func authenticatedUser(ctx *macaron.Context, sess session.Store) (_ *db.User, is return nil, false, false } - u, err := db.Users.GetByID(ctx.Req.Context(), uid) + u, err := database.Users.GetByID(ctx.Req.Context(), uid) if err != nil { log.Error("GetUserByID: %v", err) return nil, false, false @@ -233,19 +233,19 @@ func authenticatedUser(ctx *macaron.Context, sess session.Store) (_ *db.User, is } // AuthenticateByToken attempts to authenticate a user by the given access -// token. It returns db.ErrAccessTokenNotExist when the access token does not +// token. It returns database.ErrAccessTokenNotExist when the access token does not // exist. -func AuthenticateByToken(ctx context.Context, token string) (*db.User, error) { - t, err := db.AccessTokens.GetBySHA1(ctx, token) +func AuthenticateByToken(ctx context.Context, token string) (*database.User, error) { + t, err := database.AccessTokens.GetBySHA1(ctx, token) if err != nil { return nil, errors.Wrap(err, "get access token by SHA1") } - if err = db.AccessTokens.Touch(ctx, t.ID); err != nil { + if err = database.AccessTokens.Touch(ctx, t.ID); err != nil { // NOTE: There is no need to fail the auth flow if we can't touch the token. log.Error("Failed to touch access token [id: %d]: %v", t.ID, err) } - user, err := db.Users.GetByID(ctx, t.UserID) + user, err := database.Users.GetByID(ctx, t.UserID) if err != nil { return nil, errors.Wrapf(err, "get user by ID [user_id: %d]", t.UserID) } diff --git a/internal/context/context.go b/internal/context/context.go index 69a34dd47..e90c85298 100644 --- a/internal/context/context.go +++ b/internal/context/context.go @@ -19,7 +19,7 @@ import ( log "unknwon.dev/clog/v2" "gogs.io/gogs/internal/conf" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/errutil" "gogs.io/gogs/internal/form" "gogs.io/gogs/internal/lazyregexp" @@ -35,7 +35,7 @@ type Context struct { Session session.Store Link string // Current request URL - User *db.User + User *database.User IsLogged bool IsBasicAuth bool IsTokenAuth bool diff --git a/internal/context/go_get.go b/internal/context/go_get.go index b83eda83b..811098459 100644 --- a/internal/context/go_get.go +++ b/internal/context/go_get.go @@ -9,7 +9,7 @@ import ( "gopkg.in/macaron.v1" "gogs.io/gogs/internal/conf" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/repoutil" ) @@ -27,9 +27,9 @@ func ServeGoGet() macaron.Handler { repoName := c.Params(":reponame") branchName := "master" - owner, err := db.Users.GetByUsername(c.Req.Context(), ownerName) + owner, err := database.Users.GetByUsername(c.Req.Context(), ownerName) if err == nil { - repo, err := db.Repos.GetByName(c.Req.Context(), owner.ID, repoName) + repo, err := database.Repos.GetByName(c.Req.Context(), owner.ID, repoName) if err == nil && repo.DefaultBranch != "" { branchName = repo.DefaultBranch } diff --git a/internal/context/org.go b/internal/context/org.go index 389677af9..c48def235 100644 --- a/internal/context/org.go +++ b/internal/context/org.go @@ -10,7 +10,7 @@ import ( "gopkg.in/macaron.v1" "gogs.io/gogs/internal/conf" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) type Organization struct { @@ -18,10 +18,10 @@ type Organization struct { IsMember bool IsTeamMember bool // Is member of team. IsTeamAdmin bool // In owner team or team that has admin permission level. - Organization *db.User + Organization *database.User OrgLink string - Team *db.Team + Team *database.Team } func HandleOrgAssignment(c *Context, args ...bool) { @@ -47,7 +47,7 @@ func HandleOrgAssignment(c *Context, args ...bool) { orgName := c.Params(":org") var err error - c.Org.Organization, err = db.Users.GetByUsername(c.Req.Context(), orgName) + c.Org.Organization, err = database.Users.GetByUsername(c.Req.Context(), orgName) if err != nil { c.NotFoundOrError(err, "get organization by name") return @@ -78,7 +78,7 @@ func HandleOrgAssignment(c *Context, args ...bool) { } } else { // Fake data. - c.Data["SignedUser"] = &db.User{} + c.Data["SignedUser"] = &database.User{} } if (requireMember && !c.Org.IsMember) || (requireOwner && !c.Org.IsOwner) { @@ -131,7 +131,7 @@ func HandleOrgAssignment(c *Context, args ...bool) { return } - c.Org.IsTeamAdmin = c.Org.Team.IsOwnerTeam() || c.Org.Team.Authorize >= db.AccessModeAdmin + c.Org.IsTeamAdmin = c.Org.Team.IsOwnerTeam() || c.Org.Team.Authorize >= database.AccessModeAdmin c.Data["IsTeamAdmin"] = c.Org.IsTeamAdmin if requireTeamAdmin && !c.Org.IsTeamAdmin { c.NotFound() diff --git a/internal/context/repo.go b/internal/context/repo.go index 3c3462f0e..ccbbdbe75 100644 --- a/internal/context/repo.go +++ b/internal/context/repo.go @@ -17,25 +17,25 @@ import ( "github.com/gogs/git-module" "gogs.io/gogs/internal/conf" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/repoutil" ) type PullRequest struct { - BaseRepo *db.Repository + BaseRepo *database.Repository Allowed bool SameRepo bool HeadInfo string // [:] } type Repository struct { - AccessMode db.AccessMode + AccessMode database.AccessMode IsWatching bool IsViewBranch bool IsViewTag bool IsViewCommit bool - Repository *db.Repository - Owner *db.User + Repository *database.Repository + Owner *database.User Commit *git.Commit Tag *git.Tag GitRepo *git.Repository @@ -46,29 +46,29 @@ type Repository struct { RepoLink string CloneLink repoutil.CloneLink CommitsCount int64 - Mirror *db.Mirror + Mirror *database.Mirror PullRequest *PullRequest } // IsOwner returns true if current user is the owner of repository. func (r *Repository) IsOwner() bool { - return r.AccessMode >= db.AccessModeOwner + return r.AccessMode >= database.AccessModeOwner } // IsAdmin returns true if current user has admin or higher access of repository. func (r *Repository) IsAdmin() bool { - return r.AccessMode >= db.AccessModeAdmin + return r.AccessMode >= database.AccessModeAdmin } // IsWriter returns true if current user has write or higher access of repository. func (r *Repository) IsWriter() bool { - return r.AccessMode >= db.AccessModeWrite + return r.AccessMode >= database.AccessModeWrite } // HasAccess returns true if the current user has at least read access for this repository func (r *Repository) HasAccess() bool { - return r.AccessMode >= db.AccessModeRead + return r.AccessMode >= database.AccessModeRead } // CanEnableEditor returns true if repository is editable and user has proper access level. @@ -125,7 +125,7 @@ func (r *Repository) PullRequestURL(baseBranch, headBranch string) string { func RepoAssignment(pages ...bool) macaron.Handler { return func(c *Context) { var ( - owner *db.User + owner *database.User err error isIssuesPage bool isWikiPage bool @@ -145,7 +145,7 @@ func RepoAssignment(pages ...bool) macaron.Handler { if c.IsLogged && c.User.LowerName == strings.ToLower(ownerName) { owner = c.User } else { - owner, err = db.Users.GetByUsername(c.Req.Context(), ownerName) + owner, err = database.Users.GetByUsername(c.Req.Context(), ownerName) if err != nil { c.NotFoundOrError(err, "get user by name") return @@ -154,7 +154,7 @@ func RepoAssignment(pages ...bool) macaron.Handler { c.Repo.Owner = owner c.Data["Username"] = c.Repo.Owner.Name - repo, err := db.GetRepositoryByName(owner.ID, repoName) + repo, err := database.GetRepositoryByName(owner.ID, repoName) if err != nil { c.NotFoundOrError(err, "get repository by name") return @@ -169,10 +169,10 @@ func RepoAssignment(pages ...bool) macaron.Handler { // Admin has super access if c.IsLogged && c.User.IsAdmin { - c.Repo.AccessMode = db.AccessModeOwner + c.Repo.AccessMode = database.AccessModeOwner } else { - c.Repo.AccessMode = db.Perms.AccessMode(c.Req.Context(), c.UserID(), repo.ID, - db.AccessModeOptions{ + c.Repo.AccessMode = database.Perms.AccessMode(c.Req.Context(), c.UserID(), repo.ID, + database.AccessModeOptions{ OwnerID: repo.OwnerID, Private: repo.IsPrivate, }, @@ -181,23 +181,23 @@ func RepoAssignment(pages ...bool) macaron.Handler { // If the authenticated user has no direct access, see if the repository is a fork // and whether the user has access to the base repository. - if c.Repo.AccessMode == db.AccessModeNone && repo.BaseRepo != nil { - mode := db.Perms.AccessMode(c.Req.Context(), c.UserID(), repo.BaseRepo.ID, - db.AccessModeOptions{ + if c.Repo.AccessMode == database.AccessModeNone && repo.BaseRepo != nil { + mode := database.Perms.AccessMode(c.Req.Context(), c.UserID(), repo.BaseRepo.ID, + database.AccessModeOptions{ OwnerID: repo.BaseRepo.OwnerID, Private: repo.BaseRepo.IsPrivate, }, ) // Users shouldn't have indirect access level higher than write. - if mode > db.AccessModeWrite { - mode = db.AccessModeWrite + if mode > database.AccessModeWrite { + mode = database.AccessModeWrite } c.Repo.AccessMode = mode } // Check access - if c.Repo.AccessMode == db.AccessModeNone { + if c.Repo.AccessMode == database.AccessModeNone { // Redirect to any accessible page if not yet on it if repo.IsPartialPublic() && (!(isIssuesPage || isWikiPage) || @@ -227,7 +227,7 @@ func RepoAssignment(pages ...bool) macaron.Handler { } if repo.IsMirror { - c.Repo.Mirror, err = db.GetMirrorByRepoID(repo.ID) + c.Repo.Mirror, err = database.GetMirrorByRepoID(repo.ID) if err != nil { c.Error(err, "get mirror by repository ID") return @@ -237,7 +237,7 @@ func RepoAssignment(pages ...bool) macaron.Handler { c.Data["Mirror"] = c.Repo.Mirror } - gitRepo, err := git.Open(db.RepoPath(ownerName, repoName)) + gitRepo, err := git.Open(database.RepoPath(ownerName, repoName)) if err != nil { c.Error(err, "open repository") return @@ -265,8 +265,8 @@ func RepoAssignment(pages ...bool) macaron.Handler { c.Data["WikiCloneLink"] = repo.WikiCloneLink() if c.IsLogged { - c.Data["IsWatchingRepo"] = db.IsWatching(c.User.ID, repo.ID) - c.Data["IsStaringRepo"] = db.IsStaring(c.User.ID, repo.ID) + c.Data["IsWatchingRepo"] = database.IsWatching(c.User.ID, repo.ID) + c.Data["IsStaringRepo"] = database.IsStaring(c.User.ID, repo.ID) } // repo is bare and display enable @@ -314,7 +314,7 @@ func RepoRef() macaron.Handler { // For API calls. if c.Repo.GitRepo == nil { - repoPath := db.RepoPath(c.Repo.Owner.Name, c.Repo.Repository.Name) + repoPath := database.RepoPath(c.Repo.Owner.Name, c.Repo.Repository.Name) c.Repo.GitRepo, err = git.Open(repoPath) if err != nil { c.Error(err, "open repository") @@ -403,7 +403,7 @@ func RepoRef() macaron.Handler { c.Data["IsViewCommit"] = c.Repo.IsViewCommit // People who have push access or have forked repository can propose a new pull request. - if c.Repo.IsWriter() || (c.IsLogged && db.Repos.HasForkedBy(c.Req.Context(), c.Repo.Repository.ID, c.User.ID)) { + if c.Repo.IsWriter() || (c.IsLogged && database.Repos.HasForkedBy(c.Req.Context(), c.Repo.Repository.ID, c.User.ID)) { // Pull request is allowed if this is a fork repository // and base repository accepts pull requests. if c.Repo.Repository.BaseRepo != nil { diff --git a/internal/context/user.go b/internal/context/user.go index 2b2773f5c..7069f7835 100644 --- a/internal/context/user.go +++ b/internal/context/user.go @@ -7,19 +7,19 @@ package context import ( "gopkg.in/macaron.v1" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) // ParamsUser is the wrapper type of the target user defined by URL parameter, namely ':username'. type ParamsUser struct { - *db.User + *database.User } // InjectParamsUser returns a handler that retrieves target user based on URL parameter ':username', // and injects it as *ParamsUser. func InjectParamsUser() macaron.Handler { return func(c *Context) { - user, err := db.Users.GetByUsername(c.Req.Context(), c.Params(":username")) + user, err := database.Users.GetByUsername(c.Req.Context(), c.Params(":username")) if err != nil { c.NotFoundOrError(err, "get user by name") return diff --git a/internal/cron/cron.go b/internal/cron/cron.go index 2228b6a46..36072ab7f 100644 --- a/internal/cron/cron.go +++ b/internal/cron/cron.go @@ -12,7 +12,7 @@ import ( "github.com/gogs/cron" "gogs.io/gogs/internal/conf" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) var c = cron.New() @@ -23,47 +23,47 @@ func NewContext() { err error ) if conf.Cron.UpdateMirror.Enabled { - entry, err = c.AddFunc("Update mirrors", conf.Cron.UpdateMirror.Schedule, db.MirrorUpdate) + entry, err = c.AddFunc("Update mirrors", conf.Cron.UpdateMirror.Schedule, database.MirrorUpdate) if err != nil { log.Fatal("Cron.(update mirrors): %v", err) } if conf.Cron.UpdateMirror.RunAtStart { entry.Prev = time.Now() entry.ExecTimes++ - go db.MirrorUpdate() + go database.MirrorUpdate() } } if conf.Cron.RepoHealthCheck.Enabled { - entry, err = c.AddFunc("Repository health check", conf.Cron.RepoHealthCheck.Schedule, db.GitFsck) + entry, err = c.AddFunc("Repository health check", conf.Cron.RepoHealthCheck.Schedule, database.GitFsck) if err != nil { log.Fatal("Cron.(repository health check): %v", err) } if conf.Cron.RepoHealthCheck.RunAtStart { entry.Prev = time.Now() entry.ExecTimes++ - go db.GitFsck() + go database.GitFsck() } } if conf.Cron.CheckRepoStats.Enabled { - entry, err = c.AddFunc("Check repository statistics", conf.Cron.CheckRepoStats.Schedule, db.CheckRepoStats) + entry, err = c.AddFunc("Check repository statistics", conf.Cron.CheckRepoStats.Schedule, database.CheckRepoStats) if err != nil { log.Fatal("Cron.(check repository statistics): %v", err) } if conf.Cron.CheckRepoStats.RunAtStart { entry.Prev = time.Now() entry.ExecTimes++ - go db.CheckRepoStats() + go database.CheckRepoStats() } } if conf.Cron.RepoArchiveCleanup.Enabled { - entry, err = c.AddFunc("Repository archive cleanup", conf.Cron.RepoArchiveCleanup.Schedule, db.DeleteOldRepositoryArchives) + entry, err = c.AddFunc("Repository archive cleanup", conf.Cron.RepoArchiveCleanup.Schedule, database.DeleteOldRepositoryArchives) if err != nil { log.Fatal("Cron.(repository archive cleanup): %v", err) } if conf.Cron.RepoArchiveCleanup.RunAtStart { entry.Prev = time.Now() entry.ExecTimes++ - go db.DeleteOldRepositoryArchives() + go database.DeleteOldRepositoryArchives() } } c.Start() diff --git a/internal/db/access_tokens.go b/internal/database/access_tokens.go similarity index 99% rename from internal/db/access_tokens.go rename to internal/database/access_tokens.go index 825cfa87a..f097e3053 100644 --- a/internal/db/access_tokens.go +++ b/internal/database/access_tokens.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/access_tokens_test.go b/internal/database/access_tokens_test.go similarity index 99% rename from internal/db/access_tokens_test.go rename to internal/database/access_tokens_test.go index 2a1d452fe..d373d107f 100644 --- a/internal/db/access_tokens_test.go +++ b/internal/database/access_tokens_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/actions.go b/internal/database/actions.go similarity index 99% rename from internal/db/actions.go rename to internal/database/actions.go index 48d080b3d..0496b7d4f 100644 --- a/internal/db/actions.go +++ b/internal/database/actions.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/actions_test.go b/internal/database/actions_test.go similarity index 99% rename from internal/db/actions_test.go rename to internal/database/actions_test.go index 8bf20f697..ea419b234 100644 --- a/internal/db/actions_test.go +++ b/internal/database/actions_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/attachment.go b/internal/database/attachment.go similarity index 99% rename from internal/db/attachment.go rename to internal/database/attachment.go index 533724688..d0da42474 100644 --- a/internal/db/attachment.go +++ b/internal/database/attachment.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "fmt" diff --git a/internal/db/backup.go b/internal/database/backup.go similarity index 96% rename from internal/db/backup.go rename to internal/database/backup.go index 7c5145194..4435862a8 100644 --- a/internal/db/backup.go +++ b/internal/database/backup.go @@ -1,4 +1,4 @@ -package db +package database import ( "bufio" @@ -25,9 +25,9 @@ import ( ) // getTableType returns the type name of a table definition without package name, -// e.g. *db.LFSObject -> LFSObject. +// e.g. *database.LFSObject -> LFSObject. func getTableType(t any) string { - return strings.TrimPrefix(fmt.Sprintf("%T", t), "*db.") + return strings.TrimPrefix(fmt.Sprintf("%T", t), "*database.") } // DumpDatabase dumps all data from database to file system in JSON Lines format. @@ -153,7 +153,7 @@ func ImportDatabase(ctx context.Context, db *gorm.DB, dirPath string, verbose bo default: } - tableName := strings.TrimPrefix(fmt.Sprintf("%T", table), "*db.") + tableName := strings.TrimPrefix(fmt.Sprintf("%T", table), "*database.") err := func() error { tableFile := filepath.Join(dirPath, tableName+".json") if !osutil.IsFile(tableFile) { @@ -245,7 +245,7 @@ func importLegacyTables(ctx context.Context, dirPath string, verbose bool) error default: } - tableName := strings.TrimPrefix(fmt.Sprintf("%T", table), "*db.") + tableName := strings.TrimPrefix(fmt.Sprintf("%T", table), "*database.") tableFile := filepath.Join(dirPath, tableName+".json") if !osutil.IsFile(tableFile) { continue diff --git a/internal/db/backup_test.go b/internal/database/backup_test.go similarity index 99% rename from internal/db/backup_test.go rename to internal/database/backup_test.go index 9d2d9403a..16044eb64 100644 --- a/internal/db/backup_test.go +++ b/internal/database/backup_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "bytes" diff --git a/internal/db/comment.go b/internal/database/comment.go similarity index 99% rename from internal/db/comment.go rename to internal/database/comment.go index cdfc16959..7d6f2fbd4 100644 --- a/internal/db/comment.go +++ b/internal/database/comment.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/db.go b/internal/database/database.go similarity index 93% rename from internal/db/db.go rename to internal/database/database.go index 9878032d3..dd123c90d 100644 --- a/internal/db/db.go +++ b/internal/database/database.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "fmt" @@ -100,14 +100,14 @@ func Init(w logger.Writer) (*gorm.DB, error) { } // NOTE: GORM has problem detecting existing columns, see - // https://github.com/gogs/gogs/issues/6091. Therefore only use it to create new - // tables, and do customized migration with future changes. + // https://github.com/gogs/gogs/issues/6091. Therefore, only use it to create new + // tables, and do customize migration with future changes. for _, table := range Tables { if db.Migrator().HasTable(table) { continue } - name := strings.TrimPrefix(fmt.Sprintf("%T", table), "*db.") + name := strings.TrimPrefix(fmt.Sprintf("%T", table), "*database.") err = db.Migrator().AutoMigrate(table) if err != nil { return nil, errors.Wrapf(err, "auto migrate %q", name) diff --git a/internal/db/error.go b/internal/database/error.go similarity index 99% rename from internal/db/error.go rename to internal/database/error.go index 8436aa99e..82445788b 100644 --- a/internal/db/error.go +++ b/internal/database/error.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "fmt" diff --git a/internal/db/errors/errors.go b/internal/database/errors/errors.go similarity index 100% rename from internal/db/errors/errors.go rename to internal/database/errors/errors.go diff --git a/internal/db/errors/repo.go b/internal/database/errors/repo.go similarity index 100% rename from internal/db/errors/repo.go rename to internal/database/errors/repo.go diff --git a/internal/db/issue.go b/internal/database/issue.go similarity index 99% rename from internal/db/issue.go rename to internal/database/issue.go index 53c8132de..4808b7348 100644 --- a/internal/db/issue.go +++ b/internal/database/issue.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" @@ -17,7 +17,7 @@ import ( api "github.com/gogs/go-gogs-client" "gogs.io/gogs/internal/conf" - "gogs.io/gogs/internal/db/errors" + "gogs.io/gogs/internal/database/errors" "gogs.io/gogs/internal/errutil" "gogs.io/gogs/internal/markup" "gogs.io/gogs/internal/tool" diff --git a/internal/db/issue_label.go b/internal/database/issue_label.go similarity index 99% rename from internal/db/issue_label.go rename to internal/database/issue_label.go index e5404880c..670a74965 100644 --- a/internal/db/issue_label.go +++ b/internal/database/issue_label.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "fmt" diff --git a/internal/db/issue_mail.go b/internal/database/issue_mail.go similarity index 99% rename from internal/db/issue_mail.go rename to internal/database/issue_mail.go index f094cf98a..2e6e5d247 100644 --- a/internal/db/issue_mail.go +++ b/internal/database/issue_mail.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/lfs.go b/internal/database/lfs.go similarity index 99% rename from internal/db/lfs.go rename to internal/database/lfs.go index bff18efd1..67ec63aa2 100644 --- a/internal/db/lfs.go +++ b/internal/database/lfs.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/lfs_test.go b/internal/database/lfs_test.go similarity index 99% rename from internal/db/lfs_test.go rename to internal/database/lfs_test.go index ee56a2c70..99a3ddd28 100644 --- a/internal/db/lfs_test.go +++ b/internal/database/lfs_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/login_source_files.go b/internal/database/login_source_files.go similarity index 99% rename from internal/db/login_source_files.go rename to internal/database/login_source_files.go index 7c0967a57..4653d64dc 100644 --- a/internal/db/login_source_files.go +++ b/internal/database/login_source_files.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "fmt" diff --git a/internal/db/login_source_files_test.go b/internal/database/login_source_files_test.go similarity index 99% rename from internal/db/login_source_files_test.go rename to internal/database/login_source_files_test.go index e0031dc99..7a00ddde6 100644 --- a/internal/db/login_source_files_test.go +++ b/internal/database/login_source_files_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "testing" diff --git a/internal/db/login_sources.go b/internal/database/login_sources.go similarity index 99% rename from internal/db/login_sources.go rename to internal/database/login_sources.go index 9469a3f08..6f5846295 100644 --- a/internal/db/login_sources.go +++ b/internal/database/login_sources.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/login_sources_test.go b/internal/database/login_sources_test.go similarity index 99% rename from internal/db/login_sources_test.go rename to internal/database/login_sources_test.go index 830a07a88..e8470dd48 100644 --- a/internal/db/login_sources_test.go +++ b/internal/database/login_sources_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/main_test.go b/internal/database/main_test.go similarity index 98% rename from internal/db/main_test.go rename to internal/database/main_test.go index fbb98a7eb..137871adc 100644 --- a/internal/db/main_test.go +++ b/internal/database/main_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "flag" diff --git a/internal/db/migrations/main_test.go b/internal/database/migrations/main_test.go similarity index 100% rename from internal/db/migrations/main_test.go rename to internal/database/migrations/main_test.go diff --git a/internal/db/migrations/migrations.go b/internal/database/migrations/migrations.go similarity index 100% rename from internal/db/migrations/migrations.go rename to internal/database/migrations/migrations.go diff --git a/internal/db/migrations/v20.go b/internal/database/migrations/v20.go similarity index 100% rename from internal/db/migrations/v20.go rename to internal/database/migrations/v20.go diff --git a/internal/db/migrations/v20_test.go b/internal/database/migrations/v20_test.go similarity index 100% rename from internal/db/migrations/v20_test.go rename to internal/database/migrations/v20_test.go diff --git a/internal/db/migrations/v21.go b/internal/database/migrations/v21.go similarity index 100% rename from internal/db/migrations/v21.go rename to internal/database/migrations/v21.go diff --git a/internal/db/migrations/v21_test.go b/internal/database/migrations/v21_test.go similarity index 100% rename from internal/db/migrations/v21_test.go rename to internal/database/migrations/v21_test.go diff --git a/internal/db/milestone.go b/internal/database/milestone.go similarity index 99% rename from internal/db/milestone.go rename to internal/database/milestone.go index a6e74f517..a6e9d068a 100644 --- a/internal/db/milestone.go +++ b/internal/database/milestone.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "fmt" diff --git a/internal/db/mirror.go b/internal/database/mirror.go similarity index 99% rename from internal/db/mirror.go rename to internal/database/mirror.go index 11ab1c6af..92e447342 100644 --- a/internal/db/mirror.go +++ b/internal/database/mirror.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" @@ -19,7 +19,7 @@ import ( "github.com/gogs/git-module" "gogs.io/gogs/internal/conf" - "gogs.io/gogs/internal/db/errors" + "gogs.io/gogs/internal/database/errors" "gogs.io/gogs/internal/process" "gogs.io/gogs/internal/sync" ) diff --git a/internal/db/mirror_test.go b/internal/database/mirror_test.go similarity index 97% rename from internal/db/mirror_test.go rename to internal/database/mirror_test.go index 74f1d936e..72da7ba25 100644 --- a/internal/db/mirror_test.go +++ b/internal/database/mirror_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "testing" diff --git a/internal/db/mocks.go b/internal/database/mocks.go similarity index 98% rename from internal/db/mocks.go rename to internal/database/mocks.go index 89c3ed9c5..8d1ffdbc5 100644 --- a/internal/db/mocks.go +++ b/internal/database/mocks.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "testing" diff --git a/internal/db/mocks_test.go b/internal/database/mocks_test.go similarity index 99% rename from internal/db/mocks_test.go rename to internal/database/mocks_test.go index 6ba677706..400436d39 100644 --- a/internal/db/mocks_test.go +++ b/internal/database/mocks_test.go @@ -4,7 +4,7 @@ // To add additional mocks to this or another package, add a new entry to the // mockgen.yaml file in the root of this repository. -package db +package database import ( "context" @@ -14,7 +14,7 @@ import ( ) // MockLoginSourcesStore is a mock implementation of the LoginSourcesStore -// interface (from the package gogs.io/gogs/internal/db) used for unit +// interface (from the package gogs.io/gogs/internal/database) used for unit // testing. type MockLoginSourcesStore struct { // CountFunc is an instance of a mock function object controlling the @@ -902,7 +902,7 @@ func (c LoginSourcesStoreSaveFuncCall) Results() []interface{} { // MockLoginSourceFileStore is a mock implementation of the // loginSourceFileStore interface (from the package -// gogs.io/gogs/internal/db) used for unit testing. +// gogs.io/gogs/internal/database) used for unit testing. type MockLoginSourceFileStore struct { // SaveFunc is an instance of a mock function object controlling the // behavior of the method Save. @@ -962,8 +962,8 @@ func NewStrictMockLoginSourceFileStore() *MockLoginSourceFileStore { } // surrogateMockLoginSourceFileStore is a copy of the loginSourceFileStore -// interface (from the package gogs.io/gogs/internal/db). It is redefined -// here as it is unexported in the source package. +// interface (from the package gogs.io/gogs/internal/database). It is +// redefined here as it is unexported in the source package. type surrogateMockLoginSourceFileStore interface { Save() error SetConfig(interface{}) error @@ -1296,7 +1296,7 @@ func (c LoginSourceFileStoreSetGeneralFuncCall) Results() []interface{} { // MockLoginSourceFilesStore is a mock implementation of the // loginSourceFilesStore interface (from the package -// gogs.io/gogs/internal/db) used for unit testing. +// gogs.io/gogs/internal/database) used for unit testing. type MockLoginSourceFilesStore struct { // GetByIDFunc is an instance of a mock function object controlling the // behavior of the method GetByID. @@ -1369,8 +1369,8 @@ func NewStrictMockLoginSourceFilesStore() *MockLoginSourceFilesStore { } // surrogateMockLoginSourceFilesStore is a copy of the loginSourceFilesStore -// interface (from the package gogs.io/gogs/internal/db). It is redefined -// here as it is unexported in the source package. +// interface (from the package gogs.io/gogs/internal/database). It is +// redefined here as it is unexported in the source package. type surrogateMockLoginSourceFilesStore interface { GetByID(int64) (*LoginSource, error) Len() int diff --git a/internal/db/models.go b/internal/database/models.go similarity index 99% rename from internal/db/models.go rename to internal/database/models.go index 1e3b8d9b7..6af4e9753 100644 --- a/internal/db/models.go +++ b/internal/database/models.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" @@ -22,7 +22,7 @@ import ( "xorm.io/xorm" "gogs.io/gogs/internal/conf" - "gogs.io/gogs/internal/db/migrations" + "gogs.io/gogs/internal/database/migrations" "gogs.io/gogs/internal/dbutil" ) diff --git a/internal/db/notices.go b/internal/database/notices.go similarity index 99% rename from internal/db/notices.go rename to internal/database/notices.go index c1601735b..37d6777fa 100644 --- a/internal/db/notices.go +++ b/internal/database/notices.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/notices_test.go b/internal/database/notices_test.go similarity index 99% rename from internal/db/notices_test.go rename to internal/database/notices_test.go index b88f92f38..b2d74a093 100644 --- a/internal/db/notices_test.go +++ b/internal/database/notices_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/org.go b/internal/database/org.go similarity index 99% rename from internal/db/org.go rename to internal/database/org.go index 8bc16701e..dd6f559cf 100644 --- a/internal/db/org.go +++ b/internal/database/org.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/org_team.go b/internal/database/org_team.go similarity index 99% rename from internal/db/org_team.go rename to internal/database/org_team.go index d737167e4..f51e75839 100644 --- a/internal/db/org_team.go +++ b/internal/database/org_team.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" @@ -11,7 +11,7 @@ import ( "xorm.io/xorm" - "gogs.io/gogs/internal/db/errors" + "gogs.io/gogs/internal/database/errors" "gogs.io/gogs/internal/errutil" ) diff --git a/internal/db/orgs.go b/internal/database/orgs.go similarity index 99% rename from internal/db/orgs.go rename to internal/database/orgs.go index 753d81209..233c39d54 100644 --- a/internal/db/orgs.go +++ b/internal/database/orgs.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/orgs_test.go b/internal/database/orgs_test.go similarity index 99% rename from internal/db/orgs_test.go rename to internal/database/orgs_test.go index 64831c8a7..f3e00c8c1 100644 --- a/internal/db/orgs_test.go +++ b/internal/database/orgs_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/perms.go b/internal/database/perms.go similarity index 99% rename from internal/db/perms.go rename to internal/database/perms.go index c3cd05664..bf2c2692c 100644 --- a/internal/db/perms.go +++ b/internal/database/perms.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/perms_test.go b/internal/database/perms_test.go similarity index 99% rename from internal/db/perms_test.go rename to internal/database/perms_test.go index 5fc4d0508..6bd55eb70 100644 --- a/internal/db/perms_test.go +++ b/internal/database/perms_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/public_keys.go b/internal/database/public_keys.go similarity index 99% rename from internal/db/public_keys.go rename to internal/database/public_keys.go index 71b0ed99f..8cdf64410 100644 --- a/internal/db/public_keys.go +++ b/internal/database/public_keys.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "os" diff --git a/internal/db/public_keys_test.go b/internal/database/public_keys_test.go similarity index 99% rename from internal/db/public_keys_test.go rename to internal/database/public_keys_test.go index 32983e967..925aa3c6f 100644 --- a/internal/db/public_keys_test.go +++ b/internal/database/public_keys_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/pull.go b/internal/database/pull.go similarity index 99% rename from internal/db/pull.go rename to internal/database/pull.go index 09df38ea0..f067211ef 100644 --- a/internal/db/pull.go +++ b/internal/database/pull.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/release.go b/internal/database/release.go similarity index 99% rename from internal/db/release.go rename to internal/database/release.go index 26b7595d3..bce7eb9ee 100644 --- a/internal/db/release.go +++ b/internal/database/release.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "fmt" diff --git a/internal/db/repo.go b/internal/database/repo.go similarity index 99% rename from internal/db/repo.go rename to internal/database/repo.go index 8f15ea2b9..0be0fa00a 100644 --- a/internal/db/repo.go +++ b/internal/database/repo.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "bytes" @@ -33,7 +33,7 @@ import ( embedConf "gogs.io/gogs/conf" "gogs.io/gogs/internal/avatar" "gogs.io/gogs/internal/conf" - dberrors "gogs.io/gogs/internal/db/errors" + dberrors "gogs.io/gogs/internal/database/errors" "gogs.io/gogs/internal/dbutil" "gogs.io/gogs/internal/errutil" "gogs.io/gogs/internal/markup" diff --git a/internal/db/repo_branch.go b/internal/database/repo_branch.go similarity index 99% rename from internal/db/repo_branch.go rename to internal/database/repo_branch.go index 65bcdc4af..cbf00294d 100644 --- a/internal/db/repo_branch.go +++ b/internal/database/repo_branch.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/repo_collaboration.go b/internal/database/repo_collaboration.go similarity index 99% rename from internal/db/repo_collaboration.go rename to internal/database/repo_collaboration.go index 758b824b5..f912abd17 100644 --- a/internal/db/repo_collaboration.go +++ b/internal/database/repo_collaboration.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "fmt" diff --git a/internal/db/repo_editor.go b/internal/database/repo_editor.go similarity index 99% rename from internal/db/repo_editor.go rename to internal/database/repo_editor.go index 0a1c94958..f1b7a245b 100644 --- a/internal/db/repo_editor.go +++ b/internal/database/repo_editor.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "fmt" @@ -23,7 +23,7 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/cryptoutil" - dberrors "gogs.io/gogs/internal/db/errors" + dberrors "gogs.io/gogs/internal/database/errors" "gogs.io/gogs/internal/gitutil" "gogs.io/gogs/internal/osutil" "gogs.io/gogs/internal/pathutil" diff --git a/internal/db/repo_editor_test.go b/internal/database/repo_editor_test.go similarity index 98% rename from internal/db/repo_editor_test.go rename to internal/database/repo_editor_test.go index f6178eda8..1c45c4d18 100644 --- a/internal/db/repo_editor_test.go +++ b/internal/database/repo_editor_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "testing" diff --git a/internal/db/repo_tag.go b/internal/database/repo_tag.go similarity index 98% rename from internal/db/repo_tag.go rename to internal/database/repo_tag.go index cc6721fc9..907ae9065 100644 --- a/internal/db/repo_tag.go +++ b/internal/database/repo_tag.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "fmt" diff --git a/internal/db/repo_test.go b/internal/database/repo_test.go similarity index 98% rename from internal/db/repo_test.go rename to internal/database/repo_test.go index 32caf6a2b..a3ffca068 100644 --- a/internal/db/repo_test.go +++ b/internal/database/repo_test.go @@ -1,4 +1,4 @@ -package db +package database import ( "testing" diff --git a/internal/db/repos.go b/internal/database/repos.go similarity index 99% rename from internal/db/repos.go rename to internal/database/repos.go index 28a38148c..17c46d330 100644 --- a/internal/db/repos.go +++ b/internal/database/repos.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/repos_test.go b/internal/database/repos_test.go similarity index 99% rename from internal/db/repos_test.go rename to internal/database/repos_test.go index 7bb74f88a..e697db1cd 100644 --- a/internal/db/repos_test.go +++ b/internal/database/repos_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/schemadoc/main.go b/internal/database/schemadoc/main.go similarity index 97% rename from internal/db/schemadoc/main.go rename to internal/database/schemadoc/main.go index 664a2969e..e074fcf50 100644 --- a/internal/db/schemadoc/main.go +++ b/internal/database/schemadoc/main.go @@ -17,7 +17,7 @@ import ( "gorm.io/gorm/clause" "gorm.io/gorm/schema" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) //go:generate go run main.go ../../../docs/dev/database_schema.md @@ -138,8 +138,8 @@ func generate(dialector gorm.Dialector) ([]*tableInfo, error) { RunWithValue(value any, fc func(*gorm.Statement) error) error FullDataTypeOf(*schema.Field) clause.Expr }) - tableInfos := make([]*tableInfo, 0, len(db.Tables)) - for _, table := range db.Tables { + tableInfos := make([]*tableInfo, 0, len(database.Tables)) + for _, table := range database.Tables { err = m.RunWithValue(table, func(stmt *gorm.Statement) error { fields := make([]*tableField, 0, len(stmt.Schema.DBNames)) for _, field := range stmt.Schema.Fields { diff --git a/internal/db/ssh_key.go b/internal/database/ssh_key.go similarity index 99% rename from internal/db/ssh_key.go rename to internal/database/ssh_key.go index d022e2074..b45917836 100644 --- a/internal/db/ssh_key.go +++ b/internal/database/ssh_key.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/ssh_key_test.go b/internal/database/ssh_key_test.go similarity index 99% rename from internal/db/ssh_key_test.go rename to internal/database/ssh_key_test.go index ceaf48c2a..dc232e66a 100644 --- a/internal/db/ssh_key_test.go +++ b/internal/database/ssh_key_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "testing" diff --git a/internal/db/testdata/backup/Access.golden.json b/internal/database/testdata/backup/Access.golden.json similarity index 100% rename from internal/db/testdata/backup/Access.golden.json rename to internal/database/testdata/backup/Access.golden.json diff --git a/internal/db/testdata/backup/AccessToken.golden.json b/internal/database/testdata/backup/AccessToken.golden.json similarity index 100% rename from internal/db/testdata/backup/AccessToken.golden.json rename to internal/database/testdata/backup/AccessToken.golden.json diff --git a/internal/db/testdata/backup/Action.golden.json b/internal/database/testdata/backup/Action.golden.json similarity index 100% rename from internal/db/testdata/backup/Action.golden.json rename to internal/database/testdata/backup/Action.golden.json diff --git a/internal/db/testdata/backup/EmailAddress.golden.json b/internal/database/testdata/backup/EmailAddress.golden.json similarity index 100% rename from internal/db/testdata/backup/EmailAddress.golden.json rename to internal/database/testdata/backup/EmailAddress.golden.json diff --git a/internal/db/testdata/backup/Follow.golden.json b/internal/database/testdata/backup/Follow.golden.json similarity index 100% rename from internal/db/testdata/backup/Follow.golden.json rename to internal/database/testdata/backup/Follow.golden.json diff --git a/internal/db/testdata/backup/LFSObject.golden.json b/internal/database/testdata/backup/LFSObject.golden.json similarity index 100% rename from internal/db/testdata/backup/LFSObject.golden.json rename to internal/database/testdata/backup/LFSObject.golden.json diff --git a/internal/db/testdata/backup/LoginSource.golden.json b/internal/database/testdata/backup/LoginSource.golden.json similarity index 100% rename from internal/db/testdata/backup/LoginSource.golden.json rename to internal/database/testdata/backup/LoginSource.golden.json diff --git a/internal/db/testdata/backup/Notice.golden.json b/internal/database/testdata/backup/Notice.golden.json similarity index 100% rename from internal/db/testdata/backup/Notice.golden.json rename to internal/database/testdata/backup/Notice.golden.json diff --git a/internal/db/two_factor.go b/internal/database/two_factor.go similarity index 99% rename from internal/db/two_factor.go rename to internal/database/two_factor.go index 177f38f38..3239ddd34 100644 --- a/internal/db/two_factor.go +++ b/internal/database/two_factor.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "encoding/base64" diff --git a/internal/db/two_factors.go b/internal/database/two_factors.go similarity index 99% rename from internal/db/two_factors.go rename to internal/database/two_factors.go index 741a2ff79..33f2b49ca 100644 --- a/internal/db/two_factors.go +++ b/internal/database/two_factors.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/two_factors_test.go b/internal/database/two_factors_test.go similarity index 99% rename from internal/db/two_factors_test.go rename to internal/database/two_factors_test.go index 3ebcfd7da..e03e06f06 100644 --- a/internal/db/two_factors_test.go +++ b/internal/database/two_factors_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/update.go b/internal/database/update.go similarity index 99% rename from internal/db/update.go rename to internal/database/update.go index 4c0eb3c5a..7976d125c 100644 --- a/internal/db/update.go +++ b/internal/database/update.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/users.go b/internal/database/users.go similarity index 99% rename from internal/db/users.go rename to internal/database/users.go index c39f9f39c..018a94a4e 100644 --- a/internal/db/users.go +++ b/internal/database/users.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/users_test.go b/internal/database/users_test.go similarity index 99% rename from internal/db/users_test.go rename to internal/database/users_test.go index bb0273a58..1547c271c 100644 --- a/internal/db/users_test.go +++ b/internal/database/users_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "context" diff --git a/internal/db/webhook.go b/internal/database/webhook.go similarity index 99% rename from internal/db/webhook.go rename to internal/database/webhook.go index 91079d8ad..25049154f 100644 --- a/internal/db/webhook.go +++ b/internal/database/webhook.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "crypto/hmac" diff --git a/internal/db/webhook_dingtalk.go b/internal/database/webhook_dingtalk.go similarity index 99% rename from internal/db/webhook_dingtalk.go rename to internal/database/webhook_dingtalk.go index 1a864370e..53e714509 100644 --- a/internal/db/webhook_dingtalk.go +++ b/internal/database/webhook_dingtalk.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "fmt" diff --git a/internal/db/webhook_discord.go b/internal/database/webhook_discord.go similarity index 99% rename from internal/db/webhook_discord.go rename to internal/database/webhook_discord.go index 34b9b4b2a..00cccca05 100644 --- a/internal/db/webhook_discord.go +++ b/internal/database/webhook_discord.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "fmt" diff --git a/internal/db/webhook_slack.go b/internal/database/webhook_slack.go similarity index 99% rename from internal/db/webhook_slack.go rename to internal/database/webhook_slack.go index 766f5a4e5..bd00f6300 100644 --- a/internal/db/webhook_slack.go +++ b/internal/database/webhook_slack.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "fmt" diff --git a/internal/db/wiki.go b/internal/database/wiki.go similarity index 99% rename from internal/db/wiki.go rename to internal/database/wiki.go index eae55d095..d29e0ce13 100644 --- a/internal/db/wiki.go +++ b/internal/database/wiki.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package db +package database import ( "fmt" diff --git a/internal/form/repo.go b/internal/form/repo.go index 5750d78ec..67066de29 100644 --- a/internal/form/repo.go +++ b/internal/form/repo.go @@ -13,7 +13,7 @@ import ( "gopkg.in/macaron.v1" "gogs.io/gogs/internal/conf" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/netutil" ) @@ -60,7 +60,7 @@ func (f *MigrateRepo) Validate(ctx *macaron.Context, errs binding.Errors) bindin // and returns composed URL with needed username and password. // It also checks if given user has permission when remote address // is actually a local path. -func (f MigrateRepo) ParseRemoteAddr(user *db.User) (string, error) { +func (f MigrateRepo) ParseRemoteAddr(user *database.User) (string, error) { remoteAddr := strings.TrimSpace(f.CloneAddr) // Remote address can be HTTP/HTTPS/Git URL or local path. @@ -69,11 +69,11 @@ func (f MigrateRepo) ParseRemoteAddr(user *db.User) (string, error) { strings.HasPrefix(remoteAddr, "git://") { u, err := url.Parse(remoteAddr) if err != nil { - return "", db.ErrInvalidCloneAddr{IsURLError: true} + return "", database.ErrInvalidCloneAddr{IsURLError: true} } if netutil.IsBlockedLocalHostname(u.Hostname(), conf.Security.LocalNetworkAllowlist) { - return "", db.ErrInvalidCloneAddr{IsBlockedLocalAddress: true} + return "", database.ErrInvalidCloneAddr{IsBlockedLocalAddress: true} } if len(f.AuthUsername)+len(f.AuthPassword) > 0 { @@ -81,13 +81,13 @@ func (f MigrateRepo) ParseRemoteAddr(user *db.User) (string, error) { } // To prevent CRLF injection in git protocol, see https://github.com/gogs/gogs/issues/6413 if u.Scheme == "git" && (strings.Contains(remoteAddr, "%0d") || strings.Contains(remoteAddr, "%0a")) { - return "", db.ErrInvalidCloneAddr{IsURLError: true} + return "", database.ErrInvalidCloneAddr{IsURLError: true} } remoteAddr = u.String() } else if !user.CanImportLocal() { - return "", db.ErrInvalidCloneAddr{IsPermissionDenied: true} + return "", database.ErrInvalidCloneAddr{IsPermissionDenied: true} } else if !com.IsDir(remoteAddr) { - return "", db.ErrInvalidCloneAddr{IsInvalidPath: true} + return "", database.ErrInvalidCloneAddr{IsInvalidPath: true} } return remoteAddr, nil diff --git a/internal/route/admin/admin.go b/internal/route/admin/admin.go index f585163c2..f6d2a51bb 100644 --- a/internal/route/admin/admin.go +++ b/internal/route/admin/admin.go @@ -15,7 +15,7 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" "gogs.io/gogs/internal/cron" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/email" "gogs.io/gogs/internal/process" "gogs.io/gogs/internal/tool" @@ -119,7 +119,7 @@ func Dashboard(c *context.Context) { c.Data["BuildTime"] = conf.BuildTime c.Data["BuildCommit"] = conf.BuildCommit - c.Data["Stats"] = db.GetStatistic(c.Req.Context()) + c.Data["Stats"] = database.GetStatistic(c.Req.Context()) // FIXME: update periodically updateSystemStatus() c.Data["SysStatus"] = sysStatus @@ -145,25 +145,25 @@ func Operation(c *context.Context) { switch AdminOperation(c.QueryInt("op")) { case CleanInactivateUser: success = c.Tr("admin.dashboard.delete_inactivate_accounts_success") - err = db.Users.DeleteInactivated() + err = database.Users.DeleteInactivated() case CleanRepoArchives: success = c.Tr("admin.dashboard.delete_repo_archives_success") - err = db.DeleteRepositoryArchives() + err = database.DeleteRepositoryArchives() case CleanMissingRepos: success = c.Tr("admin.dashboard.delete_missing_repos_success") - err = db.DeleteMissingRepositories() + err = database.DeleteMissingRepositories() case GitGCRepos: success = c.Tr("admin.dashboard.git_gc_repos_success") - err = db.GitGcRepos() + err = database.GitGcRepos() case SyncSSHAuthorizedKey: success = c.Tr("admin.dashboard.resync_all_sshkeys_success") - err = db.RewriteAuthorizedKeys() + err = database.RewriteAuthorizedKeys() case SyncRepositoryHooks: success = c.Tr("admin.dashboard.resync_all_hooks_success") - err = db.SyncRepositoryHooks() + err = database.SyncRepositoryHooks() case ReinitMissingRepository: success = c.Tr("admin.dashboard.reinit_missing_repos_success") - err = db.ReinitMissingRepositories() + err = database.ReinitMissingRepositories() } if err != nil { diff --git a/internal/route/admin/auths.go b/internal/route/admin/auths.go index a19888bbb..7c8df5acd 100644 --- a/internal/route/admin/auths.go +++ b/internal/route/admin/auths.go @@ -19,7 +19,7 @@ import ( "gogs.io/gogs/internal/auth/smtp" "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/form" ) @@ -35,13 +35,13 @@ func Authentications(c *context.Context) { c.PageIs("AdminAuthentications") var err error - c.Data["Sources"], err = db.LoginSources.List(c.Req.Context(), db.ListLoginSourceOptions{}) + c.Data["Sources"], err = database.LoginSources.List(c.Req.Context(), database.ListLoginSourceOptions{}) if err != nil { c.Error(err, "list login sources") return } - c.Data["Total"] = db.LoginSources.Count(c.Req.Context()) + c.Data["Total"] = database.LoginSources.Count(c.Req.Context()) c.Success(AUTHS) } @@ -159,8 +159,8 @@ func NewAuthSourcePost(c *context.Context, f form.Authentication) { return } - source, err := db.LoginSources.Create(c.Req.Context(), - db.CreateLoginSourceOptions{ + source, err := database.LoginSources.Create(c.Req.Context(), + database.CreateLoginSourceOptions{ Type: auth.Type(f.Type), Name: f.Name, Activated: f.IsActive, @@ -169,7 +169,7 @@ func NewAuthSourcePost(c *context.Context, f form.Authentication) { }, ) if err != nil { - if db.IsErrLoginSourceAlreadyExist(err) { + if database.IsErrLoginSourceAlreadyExist(err) { c.FormErr("Name") c.RenderWithErr(c.Tr("admin.auths.login_source_exist", f.Name), AUTH_NEW, f) } else { @@ -179,7 +179,7 @@ func NewAuthSourcePost(c *context.Context, f form.Authentication) { } if source.IsDefault { - err = db.LoginSources.ResetNonDefault(c.Req.Context(), source) + err = database.LoginSources.ResetNonDefault(c.Req.Context(), source) if err != nil { c.Error(err, "reset non-default login sources") return @@ -200,7 +200,7 @@ func EditAuthSource(c *context.Context) { c.Data["SecurityProtocols"] = securityProtocols c.Data["SMTPAuths"] = smtp.AuthTypes - source, err := db.LoginSources.GetByID(c.Req.Context(), c.ParamsInt64(":authid")) + source, err := database.LoginSources.GetByID(c.Req.Context(), c.ParamsInt64(":authid")) if err != nil { c.Error(err, "get login source by ID") return @@ -218,7 +218,7 @@ func EditAuthSourcePost(c *context.Context, f form.Authentication) { c.Data["SMTPAuths"] = smtp.AuthTypes - source, err := db.LoginSources.GetByID(c.Req.Context(), c.ParamsInt64(":authid")) + source, err := database.LoginSources.GetByID(c.Req.Context(), c.ParamsInt64(":authid")) if err != nil { c.Error(err, "get login source by ID") return @@ -257,13 +257,13 @@ func EditAuthSourcePost(c *context.Context, f form.Authentication) { source.IsActived = f.IsActive source.IsDefault = f.IsDefault source.Provider = provider - if err := db.LoginSources.Save(c.Req.Context(), source); err != nil { + if err := database.LoginSources.Save(c.Req.Context(), source); err != nil { c.Error(err, "update login source") return } if source.IsDefault { - err = db.LoginSources.ResetNonDefault(c.Req.Context(), source) + err = database.LoginSources.ResetNonDefault(c.Req.Context(), source) if err != nil { c.Error(err, "reset non-default login sources") return @@ -278,8 +278,8 @@ func EditAuthSourcePost(c *context.Context, f form.Authentication) { func DeleteAuthSource(c *context.Context) { id := c.ParamsInt64(":authid") - if err := db.LoginSources.DeleteByID(c.Req.Context(), id); err != nil { - if db.IsErrLoginSourceInUse(err) { + if err := database.LoginSources.DeleteByID(c.Req.Context(), id); err != nil { + if database.IsErrLoginSourceInUse(err) { c.Flash.Error(c.Tr("admin.auths.still_in_used")) } else { c.Flash.Error(fmt.Sprintf("DeleteSource: %v", err)) diff --git a/internal/route/admin/notice.go b/internal/route/admin/notice.go index 87d9920cd..77e89e497 100644 --- a/internal/route/admin/notice.go +++ b/internal/route/admin/notice.go @@ -13,7 +13,7 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) const ( @@ -25,14 +25,14 @@ func Notices(c *context.Context) { c.Data["PageIsAdmin"] = true c.Data["PageIsAdminNotices"] = true - total := db.Notices.Count(c.Req.Context()) + total := database.Notices.Count(c.Req.Context()) page := c.QueryInt("page") if page <= 1 { page = 1 } c.Data["Page"] = paginater.New(int(total), conf.UI.Admin.NoticePagingNum, page, 5) - notices, err := db.Notices.List(c.Req.Context(), page, conf.UI.Admin.NoticePagingNum) + notices, err := database.Notices.List(c.Req.Context(), page, conf.UI.Admin.NoticePagingNum) if err != nil { c.Error(err, "list notices") return @@ -53,7 +53,7 @@ func DeleteNotices(c *context.Context) { } } - if err := db.Notices.DeleteByIDs(c.Req.Context(), ids...); err != nil { + if err := database.Notices.DeleteByIDs(c.Req.Context(), ids...); err != nil { c.Flash.Error("DeleteNoticesByIDs: " + err.Error()) c.Status(http.StatusInternalServerError) } else { @@ -63,7 +63,7 @@ func DeleteNotices(c *context.Context) { } func EmptyNotices(c *context.Context) { - if err := db.Notices.DeleteAll(c.Req.Context()); err != nil { + if err := database.Notices.DeleteAll(c.Req.Context()); err != nil { c.Error(err, "delete notices") return } diff --git a/internal/route/admin/orgs.go b/internal/route/admin/orgs.go index 922d7f863..83b98eccf 100644 --- a/internal/route/admin/orgs.go +++ b/internal/route/admin/orgs.go @@ -9,7 +9,7 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/route" ) @@ -23,12 +23,12 @@ func Organizations(c *context.Context) { c.Data["PageIsAdminOrganizations"] = true route.RenderUserSearch(c, &route.UserSearchOptions{ - Type: db.UserTypeOrganization, + Type: database.UserTypeOrganization, Counter: func(gocontext.Context) int64 { - return db.CountOrganizations() + return database.CountOrganizations() }, - Ranger: func(_ gocontext.Context, page, pageSize int) ([]*db.User, error) { - return db.Organizations(page, pageSize) + Ranger: func(_ gocontext.Context, page, pageSize int) ([]*database.User, error) { + return database.Organizations(page, pageSize) }, PageSize: conf.UI.Admin.OrgPagingNum, OrderBy: "id ASC", diff --git a/internal/route/admin/repos.go b/internal/route/admin/repos.go index 5ae8f7496..4e13c6543 100644 --- a/internal/route/admin/repos.go +++ b/internal/route/admin/repos.go @@ -10,7 +10,7 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) const ( @@ -28,21 +28,21 @@ func Repos(c *context.Context) { } var ( - repos []*db.Repository + repos []*database.Repository count int64 err error ) keyword := c.Query("q") if keyword == "" { - repos, err = db.Repositories(page, conf.UI.Admin.RepoPagingNum) + repos, err = database.Repositories(page, conf.UI.Admin.RepoPagingNum) if err != nil { c.Error(err, "list repositories") return } - count = db.CountRepositories(true) + count = database.CountRepositories(true) } else { - repos, count, err = db.SearchRepositoryByName(&db.SearchRepoOptions{ + repos, count, err = database.SearchRepositoryByName(&database.SearchRepoOptions{ Keyword: keyword, OrderBy: "id ASC", Private: true, @@ -58,7 +58,7 @@ func Repos(c *context.Context) { c.Data["Total"] = count c.Data["Page"] = paginater.New(int(count), conf.UI.Admin.RepoPagingNum, page, 5) - if err = db.RepositoryList(repos).LoadAttributes(); err != nil { + if err = database.RepositoryList(repos).LoadAttributes(); err != nil { c.Error(err, "load attributes") return } @@ -68,13 +68,13 @@ func Repos(c *context.Context) { } func DeleteRepo(c *context.Context) { - repo, err := db.GetRepositoryByID(c.QueryInt64("id")) + repo, err := database.GetRepositoryByID(c.QueryInt64("id")) if err != nil { c.Error(err, "get repository by ID") return } - if err := db.DeleteRepository(repo.MustOwner().ID, repo.ID); err != nil { + if err := database.DeleteRepository(repo.MustOwner().ID, repo.ID); err != nil { c.Error(err, "delete repository") return } diff --git a/internal/route/admin/users.go b/internal/route/admin/users.go index b00d447b2..f968dd565 100644 --- a/internal/route/admin/users.go +++ b/internal/route/admin/users.go @@ -12,7 +12,7 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/email" "gogs.io/gogs/internal/form" "gogs.io/gogs/internal/route" @@ -30,9 +30,9 @@ func Users(c *context.Context) { c.Data["PageIsAdminUsers"] = true route.RenderUserSearch(c, &route.UserSearchOptions{ - Type: db.UserTypeIndividual, - Counter: db.Users.Count, - Ranger: db.Users.List, + Type: database.UserTypeIndividual, + Counter: database.Users.Count, + Ranger: database.Users.List, PageSize: conf.UI.Admin.UserPagingNum, OrderBy: "id ASC", TplName: USERS, @@ -46,7 +46,7 @@ func NewUser(c *context.Context) { c.Data["login_type"] = "0-0" - sources, err := db.LoginSources.List(c.Req.Context(), db.ListLoginSourceOptions{}) + sources, err := database.LoginSources.List(c.Req.Context(), database.ListLoginSourceOptions{}) if err != nil { c.Error(err, "list login sources") return @@ -62,7 +62,7 @@ func NewUserPost(c *context.Context, f form.AdminCrateUser) { c.Data["PageIsAdmin"] = true c.Data["PageIsAdminUsers"] = true - sources, err := db.LoginSources.List(c.Req.Context(), db.ListLoginSourceOptions{}) + sources, err := database.LoginSources.List(c.Req.Context(), database.ListLoginSourceOptions{}) if err != nil { c.Error(err, "list login sources") return @@ -76,7 +76,7 @@ func NewUserPost(c *context.Context, f form.AdminCrateUser) { return } - createUserOpts := db.CreateUserOptions{ + createUserOpts := database.CreateUserOptions{ Password: f.Password, Activated: true, } @@ -88,18 +88,18 @@ func NewUserPost(c *context.Context, f form.AdminCrateUser) { } } - user, err := db.Users.Create(c.Req.Context(), f.UserName, f.Email, createUserOpts) + user, err := database.Users.Create(c.Req.Context(), f.UserName, f.Email, createUserOpts) if err != nil { switch { - case db.IsErrUserAlreadyExist(err): + case database.IsErrUserAlreadyExist(err): c.Data["Err_UserName"] = true c.RenderWithErr(c.Tr("form.username_been_taken"), USER_NEW, &f) - case db.IsErrEmailAlreadyUsed(err): + case database.IsErrEmailAlreadyUsed(err): c.Data["Err_Email"] = true c.RenderWithErr(c.Tr("form.email_been_used"), USER_NEW, &f) - case db.IsErrNameNotAllowed(err): + case database.IsErrNameNotAllowed(err): c.Data["Err_UserName"] = true - c.RenderWithErr(c.Tr("user.form.name_not_allowed", err.(db.ErrNameNotAllowed).Value()), USER_NEW, &f) + c.RenderWithErr(c.Tr("user.form.name_not_allowed", err.(database.ErrNameNotAllowed).Value()), USER_NEW, &f) default: c.Error(err, "create user") } @@ -109,15 +109,15 @@ func NewUserPost(c *context.Context, f form.AdminCrateUser) { // Send email notification. if f.SendNotify && conf.Email.Enabled { - email.SendRegisterNotifyMail(c.Context, db.NewMailerUser(user)) + email.SendRegisterNotifyMail(c.Context, database.NewMailerUser(user)) } c.Flash.Success(c.Tr("admin.users.new_success", user.Name)) c.Redirect(conf.Server.Subpath + "/admin/users/" + strconv.FormatInt(user.ID, 10)) } -func prepareUserInfo(c *context.Context) *db.User { - u, err := db.Users.GetByID(c.Req.Context(), c.ParamsInt64(":userid")) +func prepareUserInfo(c *context.Context) *database.User { + u, err := database.Users.GetByID(c.Req.Context(), c.ParamsInt64(":userid")) if err != nil { c.Error(err, "get user by ID") return nil @@ -125,16 +125,16 @@ func prepareUserInfo(c *context.Context) *db.User { c.Data["User"] = u if u.LoginSource > 0 { - c.Data["LoginSource"], err = db.LoginSources.GetByID(c.Req.Context(), u.LoginSource) + c.Data["LoginSource"], err = database.LoginSources.GetByID(c.Req.Context(), u.LoginSource) if err != nil { c.Error(err, "get login source by ID") return nil } } else { - c.Data["LoginSource"] = &db.LoginSource{} + c.Data["LoginSource"] = &database.LoginSource{} } - sources, err := db.LoginSources.List(c.Req.Context(), db.ListLoginSourceOptions{}) + sources, err := database.LoginSources.List(c.Req.Context(), database.ListLoginSourceOptions{}) if err != nil { c.Error(err, "list login sources") return nil @@ -174,7 +174,7 @@ func EditUserPost(c *context.Context, f form.AdminEditUser) { return } - opts := db.UpdateUserOptions{ + opts := database.UpdateUserOptions{ LoginName: &f.LoginName, FullName: &f.FullName, Website: &f.Website, @@ -203,9 +203,9 @@ func EditUserPost(c *context.Context, f form.AdminEditUser) { opts.Email = &f.Email } - err := db.Users.Update(c.Req.Context(), u.ID, opts) + err := database.Users.Update(c.Req.Context(), u.ID, opts) if err != nil { - if db.IsErrEmailAlreadyUsed(err) { + if database.IsErrEmailAlreadyUsed(err) { c.Data["Err_Email"] = true c.RenderWithErr(c.Tr("form.email_been_used"), USER_EDIT, &f) } else { @@ -220,20 +220,20 @@ func EditUserPost(c *context.Context, f form.AdminEditUser) { } func DeleteUser(c *context.Context) { - u, err := db.Users.GetByID(c.Req.Context(), c.ParamsInt64(":userid")) + u, err := database.Users.GetByID(c.Req.Context(), c.ParamsInt64(":userid")) if err != nil { c.Error(err, "get user by ID") return } - if err = db.Users.DeleteByID(c.Req.Context(), u.ID, false); err != nil { + if err = database.Users.DeleteByID(c.Req.Context(), u.ID, false); err != nil { switch { - case db.IsErrUserOwnRepos(err): + case database.IsErrUserOwnRepos(err): c.Flash.Error(c.Tr("admin.users.still_own_repo")) c.JSONSuccess(map[string]any{ "redirect": conf.Server.Subpath + "/admin/users/" + c.Params(":userid"), }) - case db.IsErrUserHasOrgs(err): + case database.IsErrUserHasOrgs(err): c.Flash.Error(c.Tr("admin.users.still_has_org")) c.JSONSuccess(map[string]any{ "redirect": conf.Server.Subpath + "/admin/users/" + c.Params(":userid"), diff --git a/internal/route/api/v1/admin/org_repo.go b/internal/route/api/v1/admin/org_repo.go index 63a638fad..7c4b457b5 100644 --- a/internal/route/api/v1/admin/org_repo.go +++ b/internal/route/api/v1/admin/org_repo.go @@ -6,11 +6,11 @@ package admin import ( "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) -func GetRepositoryByParams(c *context.APIContext) *db.Repository { - repo, err := db.GetRepositoryByName(c.Org.Team.OrgID, c.Params(":reponame")) +func GetRepositoryByParams(c *context.APIContext) *database.Repository { + repo, err := database.GetRepositoryByName(c.Org.Team.OrgID, c.Params(":reponame")) if err != nil { c.NotFoundOrError(err, "get repository by name") return nil diff --git a/internal/route/api/v1/admin/org_team.go b/internal/route/api/v1/admin/org_team.go index b0bc9accf..0d58ac6b8 100644 --- a/internal/route/api/v1/admin/org_team.go +++ b/internal/route/api/v1/admin/org_team.go @@ -10,20 +10,20 @@ import ( api "github.com/gogs/go-gogs-client" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/route/api/v1/convert" "gogs.io/gogs/internal/route/api/v1/user" ) func CreateTeam(c *context.APIContext, form api.CreateTeamOption) { - team := &db.Team{ + team := &database.Team{ OrgID: c.Org.Organization.ID, Name: form.Name, Description: form.Description, - Authorize: db.ParseAccessMode(form.Permission), + Authorize: database.ParseAccessMode(form.Permission), } - if err := db.NewTeam(team); err != nil { - if db.IsErrTeamAlreadyExist(err) { + if err := database.NewTeam(team); err != nil { + if database.IsErrTeamAlreadyExist(err) { c.ErrorStatus(http.StatusUnprocessableEntity, err) } else { c.Error(err, "new team") diff --git a/internal/route/api/v1/admin/user.go b/internal/route/api/v1/admin/user.go index cf511902f..3bf336eb5 100644 --- a/internal/route/api/v1/admin/user.go +++ b/internal/route/api/v1/admin/user.go @@ -12,7 +12,7 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/email" "gogs.io/gogs/internal/route/api/v1/user" ) @@ -22,9 +22,9 @@ func parseLoginSource(c *context.APIContext, sourceID int64) { return } - _, err := db.LoginSources.GetByID(c.Req.Context(), sourceID) + _, err := database.LoginSources.GetByID(c.Req.Context(), sourceID) if err != nil { - if db.IsErrLoginSourceNotExist(err) { + if database.IsErrLoginSourceNotExist(err) { c.ErrorStatus(http.StatusUnprocessableEntity, err) } else { c.Error(err, "get login source by ID") @@ -39,11 +39,11 @@ func CreateUser(c *context.APIContext, form api.CreateUserOption) { return } - user, err := db.Users.Create( + user, err := database.Users.Create( c.Req.Context(), form.Username, form.Email, - db.CreateUserOptions{ + database.CreateUserOptions{ FullName: form.FullName, Password: form.Password, LoginSource: form.SourceID, @@ -52,9 +52,9 @@ func CreateUser(c *context.APIContext, form api.CreateUserOption) { }, ) if err != nil { - if db.IsErrUserAlreadyExist(err) || - db.IsErrEmailAlreadyUsed(err) || - db.IsErrNameNotAllowed(err) { + if database.IsErrUserAlreadyExist(err) || + database.IsErrEmailAlreadyUsed(err) || + database.IsErrNameNotAllowed(err) { c.ErrorStatus(http.StatusUnprocessableEntity, err) } else { c.Error(err, "create user") @@ -65,7 +65,7 @@ func CreateUser(c *context.APIContext, form api.CreateUserOption) { // Send email notification. if form.SendNotify && conf.Email.Enabled { - email.SendRegisterNotifyMail(c.Context.Context, db.NewMailerUser(user)) + email.SendRegisterNotifyMail(c.Context.Context, database.NewMailerUser(user)) } c.JSON(http.StatusCreated, user.APIFormat()) @@ -82,7 +82,7 @@ func EditUser(c *context.APIContext, form api.EditUserOption) { return } - opts := db.UpdateUserOptions{ + opts := database.UpdateUserOptions{ LoginSource: &form.SourceID, LoginName: &form.LoginName, FullName: &form.FullName, @@ -104,9 +104,9 @@ func EditUser(c *context.APIContext, form api.EditUserOption) { opts.Email = &form.Email } - err := db.Users.Update(c.Req.Context(), u.ID, opts) + err := database.Users.Update(c.Req.Context(), u.ID, opts) if err != nil { - if db.IsErrEmailAlreadyUsed(err) { + if database.IsErrEmailAlreadyUsed(err) { c.ErrorStatus(http.StatusUnprocessableEntity, err) } else { c.Error(err, "update user") @@ -115,7 +115,7 @@ func EditUser(c *context.APIContext, form api.EditUserOption) { } log.Trace("Account updated by admin %q: %s", c.User.Name, u.Name) - u, err = db.Users.GetByID(c.Req.Context(), u.ID) + u, err = database.Users.GetByID(c.Req.Context(), u.ID) if err != nil { c.Error(err, "get user") return @@ -129,9 +129,9 @@ func DeleteUser(c *context.APIContext) { return } - if err := db.Users.DeleteByID(c.Req.Context(), u.ID, false); err != nil { - if db.IsErrUserOwnRepos(err) || - db.IsErrUserHasOrgs(err) { + if err := database.Users.DeleteByID(c.Req.Context(), u.ID, false); err != nil { + if database.IsErrUserOwnRepos(err) || + database.IsErrUserHasOrgs(err) { c.ErrorStatus(http.StatusUnprocessableEntity, err) } else { c.Error(err, "delete user") diff --git a/internal/route/api/v1/api.go b/internal/route/api/v1/api.go index 79d346fe6..2b141d5a7 100644 --- a/internal/route/api/v1/api.go +++ b/internal/route/api/v1/api.go @@ -14,7 +14,7 @@ import ( api "github.com/gogs/go-gogs-client" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/form" "gogs.io/gogs/internal/route/api/v1/admin" "gogs.io/gogs/internal/route/api/v1/misc" @@ -31,13 +31,13 @@ func repoAssignment() macaron.Handler { reponame := c.Params(":reponame") var err error - var owner *db.User + var owner *database.User // Check if the context user is the repository owner. if c.IsLogged && c.User.LowerName == strings.ToLower(username) { owner = c.User } else { - owner, err = db.Users.GetByUsername(c.Req.Context(), username) + owner, err = database.Users.GetByUsername(c.Req.Context(), username) if err != nil { c.NotFoundOrError(err, "get user by name") return @@ -45,7 +45,7 @@ func repoAssignment() macaron.Handler { } c.Repo.Owner = owner - repo, err := db.Repos.GetByName(c.Req.Context(), owner.ID, reponame) + repo, err := database.Repos.GetByName(c.Req.Context(), owner.ID, reponame) if err != nil { c.NotFoundOrError(err, "get repository by name") return @@ -55,10 +55,10 @@ func repoAssignment() macaron.Handler { } if c.IsTokenAuth && c.User.IsAdmin { - c.Repo.AccessMode = db.AccessModeOwner + c.Repo.AccessMode = database.AccessModeOwner } else { - c.Repo.AccessMode = db.Perms.AccessMode(c.Req.Context(), c.UserID(), repo.ID, - db.AccessModeOptions{ + c.Repo.AccessMode = database.Perms.AccessMode(c.Req.Context(), c.UserID(), repo.ID, + database.AccessModeOptions{ OwnerID: repo.OwnerID, Private: repo.IsPrivate, }, @@ -91,7 +91,7 @@ func orgAssignment(args ...bool) macaron.Handler { var err error if assignOrg { - c.Org.Organization, err = db.Users.GetByUsername(c.Req.Context(), c.Params(":orgname")) + c.Org.Organization, err = database.Users.GetByUsername(c.Req.Context(), c.Params(":orgname")) if err != nil { c.NotFoundOrError(err, "get organization by name") return @@ -99,7 +99,7 @@ func orgAssignment(args ...bool) macaron.Handler { } if assignTeam { - c.Org.Team, err = db.GetTeamByID(c.ParamsInt64(":teamid")) + c.Org.Team, err = database.GetTeamByID(c.ParamsInt64(":teamid")) if err != nil { c.NotFoundOrError(err, "get team by ID") return diff --git a/internal/route/api/v1/convert/convert.go b/internal/route/api/v1/convert/convert.go index a91432dde..4bd8cec4e 100644 --- a/internal/route/api/v1/convert/convert.go +++ b/internal/route/api/v1/convert/convert.go @@ -13,10 +13,10 @@ import ( "github.com/gogs/git-module" api "github.com/gogs/go-gogs-client" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) -func ToEmail(email *db.EmailAddress) *api.Email { +func ToEmail(email *database.EmailAddress) *api.Email { return &api.Email{ Email: email.Email, Verified: email.IsActivated, @@ -24,7 +24,7 @@ func ToEmail(email *db.EmailAddress) *api.Email { } } -func ToBranch(b *db.Branch, c *git.Commit) *api.Branch { +func ToBranch(b *database.Branch, c *git.Commit) *api.Branch { return &api.Branch{ Name: b.Name, Commit: ToCommit(c), @@ -36,7 +36,7 @@ type Tag struct { Commit *api.PayloadCommit `json:"commit"` } -func ToTag(b *db.Tag, c *git.Commit) *Tag { +func ToTag(b *database.Tag, c *git.Commit) *Tag { return &Tag{ Name: b.Name, Commit: ToCommit(c), @@ -45,12 +45,12 @@ func ToTag(b *db.Tag, c *git.Commit) *Tag { func ToCommit(c *git.Commit) *api.PayloadCommit { authorUsername := "" - author, err := db.Users.GetByEmail(context.TODO(), c.Author.Email) + author, err := database.Users.GetByEmail(context.TODO(), c.Author.Email) if err == nil { authorUsername = author.Name } committerUsername := "" - committer, err := db.Users.GetByEmail(context.TODO(), c.Committer.Email) + committer, err := database.Users.GetByEmail(context.TODO(), c.Committer.Email) if err == nil { committerUsername = committer.Name } @@ -72,7 +72,7 @@ func ToCommit(c *git.Commit) *api.PayloadCommit { } } -func ToPublicKey(apiLink string, key *db.PublicKey) *api.PublicKey { +func ToPublicKey(apiLink string, key *database.PublicKey) *api.PublicKey { return &api.PublicKey{ ID: key.ID, Key: key.Content, @@ -82,12 +82,12 @@ func ToPublicKey(apiLink string, key *db.PublicKey) *api.PublicKey { } } -func ToHook(repoLink string, w *db.Webhook) *api.Hook { +func ToHook(repoLink string, w *database.Webhook) *api.Hook { config := map[string]string{ "url": w.URL, "content_type": w.ContentType.Name(), } - if w.HookTaskType == db.SLACK { + if w.HookTaskType == database.SLACK { s := w.SlackMeta() config["channel"] = s.Channel config["username"] = s.Username @@ -107,7 +107,7 @@ func ToHook(repoLink string, w *db.Webhook) *api.Hook { } } -func ToDeployKey(apiLink string, key *db.DeployKey) *api.DeployKey { +func ToDeployKey(apiLink string, key *database.DeployKey) *api.DeployKey { return &api.DeployKey{ ID: key.ID, Key: key.Content, @@ -118,7 +118,7 @@ func ToDeployKey(apiLink string, key *db.DeployKey) *api.DeployKey { } } -func ToOrganization(org *db.User) *api.Organization { +func ToOrganization(org *database.User) *api.Organization { return &api.Organization{ ID: org.ID, AvatarUrl: org.AvatarURL(), @@ -130,7 +130,7 @@ func ToOrganization(org *db.User) *api.Organization { } } -func ToTeam(team *db.Team) *api.Team { +func ToTeam(team *database.Team) *api.Team { return &api.Team{ ID: team.ID, Name: team.Name, diff --git a/internal/route/api/v1/org/org.go b/internal/route/api/v1/org/org.go index 9b99bead7..92bb72db8 100644 --- a/internal/route/api/v1/org/org.go +++ b/internal/route/api/v1/org/org.go @@ -10,28 +10,28 @@ import ( api "github.com/gogs/go-gogs-client" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/route/api/v1/convert" "gogs.io/gogs/internal/route/api/v1/user" ) -func CreateOrgForUser(c *context.APIContext, apiForm api.CreateOrgOption, user *db.User) { +func CreateOrgForUser(c *context.APIContext, apiForm api.CreateOrgOption, user *database.User) { if c.Written() { return } - org := &db.User{ + org := &database.User{ Name: apiForm.UserName, FullName: apiForm.FullName, Description: apiForm.Description, Website: apiForm.Website, Location: apiForm.Location, IsActive: true, - Type: db.UserTypeOrganization, + Type: database.UserTypeOrganization, } - if err := db.CreateOrganization(org, user); err != nil { - if db.IsErrUserAlreadyExist(err) || - db.IsErrNameNotAllowed(err) { + if err := database.CreateOrganization(org, user); err != nil { + if database.IsErrUserAlreadyExist(err) || + database.IsErrNameNotAllowed(err) { c.ErrorStatus(http.StatusUnprocessableEntity, err) } else { c.Error(err, "create organization") @@ -42,10 +42,10 @@ func CreateOrgForUser(c *context.APIContext, apiForm api.CreateOrgOption, user * c.JSON(201, convert.ToOrganization(org)) } -func listUserOrgs(c *context.APIContext, u *db.User, all bool) { - orgs, err := db.Orgs.List( +func listUserOrgs(c *context.APIContext, u *database.User, all bool) { + orgs, err := database.Orgs.List( c.Req.Context(), - db.ListOrgsOptions{ + database.ListOrgsOptions{ MemberID: u.ID, IncludePrivateMembers: all, }, @@ -89,10 +89,10 @@ func Edit(c *context.APIContext, form api.EditOrgOption) { return } - err := db.Users.Update( + err := database.Users.Update( c.Req.Context(), c.Org.Organization.ID, - db.UpdateUserOptions{ + database.UpdateUserOptions{ FullName: &form.FullName, Website: &form.Website, Location: &form.Location, @@ -104,7 +104,7 @@ func Edit(c *context.APIContext, form api.EditOrgOption) { return } - org, err = db.GetOrgByName(org.Name) + org, err = database.GetOrgByName(org.Name) if err != nil { c.Error(err, "get organization") return diff --git a/internal/route/api/v1/repo/collaborators.go b/internal/route/api/v1/repo/collaborators.go index 4d813c071..d6f3c5f66 100644 --- a/internal/route/api/v1/repo/collaborators.go +++ b/internal/route/api/v1/repo/collaborators.go @@ -10,7 +10,7 @@ import ( api "github.com/gogs/go-gogs-client" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) func ListCollaborators(c *context.APIContext) { @@ -28,9 +28,9 @@ func ListCollaborators(c *context.APIContext) { } func AddCollaborator(c *context.APIContext, form api.AddCollaboratorOption) { - collaborator, err := db.Users.GetByUsername(c.Req.Context(), c.Params(":collaborator")) + collaborator, err := database.Users.GetByUsername(c.Req.Context(), c.Params(":collaborator")) if err != nil { - if db.IsErrUserNotExist(err) { + if database.IsErrUserNotExist(err) { c.Status(http.StatusUnprocessableEntity) } else { c.Error(err, "get user by name") @@ -44,7 +44,7 @@ func AddCollaborator(c *context.APIContext, form api.AddCollaboratorOption) { } if form.Permission != nil { - if err := c.Repo.Repository.ChangeCollaborationAccessMode(collaborator.ID, db.ParseAccessMode(*form.Permission)); err != nil { + if err := c.Repo.Repository.ChangeCollaborationAccessMode(collaborator.ID, database.ParseAccessMode(*form.Permission)); err != nil { c.Error(err, "change collaboration access mode") return } @@ -54,9 +54,9 @@ func AddCollaborator(c *context.APIContext, form api.AddCollaboratorOption) { } func IsCollaborator(c *context.APIContext) { - collaborator, err := db.Users.GetByUsername(c.Req.Context(), c.Params(":collaborator")) + collaborator, err := database.Users.GetByUsername(c.Req.Context(), c.Params(":collaborator")) if err != nil { - if db.IsErrUserNotExist(err) { + if database.IsErrUserNotExist(err) { c.Status(http.StatusUnprocessableEntity) } else { c.Error(err, "get user by name") @@ -72,9 +72,9 @@ func IsCollaborator(c *context.APIContext) { } func DeleteCollaborator(c *context.APIContext) { - collaborator, err := db.Users.GetByUsername(c.Req.Context(), c.Params(":collaborator")) + collaborator, err := database.Users.GetByUsername(c.Req.Context(), c.Params(":collaborator")) if err != nil { - if db.IsErrUserNotExist(err) { + if database.IsErrUserNotExist(err) { c.Status(http.StatusUnprocessableEntity) } else { c.Error(err, "get user by name") diff --git a/internal/route/api/v1/repo/commits.go b/internal/route/api/v1/repo/commits.go index 8d16c845f..59f482593 100644 --- a/internal/route/api/v1/repo/commits.go +++ b/internal/route/api/v1/repo/commits.go @@ -14,7 +14,7 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/gitutil" ) @@ -120,8 +120,8 @@ func GetReferenceSHA(c *context.APIContext) { func gitCommitToAPICommit(commit *git.Commit, c *context.APIContext) (*api.Commit, error) { // Retrieve author and committer information var apiAuthor, apiCommitter *api.User - author, err := db.Users.GetByEmail(c.Req.Context(), commit.Author.Email) - if err != nil && !db.IsErrUserNotExist(err) { + author, err := database.Users.GetByEmail(c.Req.Context(), commit.Author.Email) + if err != nil && !database.IsErrUserNotExist(err) { return nil, err } else if err == nil { apiAuthor = author.APIFormat() @@ -131,8 +131,8 @@ func gitCommitToAPICommit(commit *git.Commit, c *context.APIContext) (*api.Commi if commit.Committer.Email == commit.Author.Email { apiCommitter = apiAuthor } else { - committer, err := db.Users.GetByEmail(c.Req.Context(), commit.Committer.Email) - if err != nil && !db.IsErrUserNotExist(err) { + committer, err := database.Users.GetByEmail(c.Req.Context(), commit.Committer.Email) + if err != nil && !database.IsErrUserNotExist(err) { return nil, err } else if err == nil { apiCommitter = committer.APIFormat() diff --git a/internal/route/api/v1/repo/contents.go b/internal/route/api/v1/repo/contents.go index ed09e425b..e7c36c75e 100644 --- a/internal/route/api/v1/repo/contents.go +++ b/internal/route/api/v1/repo/contents.go @@ -14,7 +14,7 @@ import ( "github.com/pkg/errors" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/gitutil" "gogs.io/gogs/internal/repoutil" ) @@ -191,7 +191,7 @@ func PutContents(c *context.APIContext, r PutContentsRequest) { treePath := c.Params("*") err = c.Repo.Repository.UpdateRepoFile( c.User, - db.UpdateRepoFileOptions{ + database.UpdateRepoFileOptions{ OldBranch: c.Repo.Repository.DefaultBranch, NewBranch: r.Branch, OldTreeName: treePath, diff --git a/internal/route/api/v1/repo/file.go b/internal/route/api/v1/repo/file.go index 999a2a479..e8f1a003a 100644 --- a/internal/route/api/v1/repo/file.go +++ b/internal/route/api/v1/repo/file.go @@ -8,7 +8,7 @@ import ( "github.com/gogs/git-module" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/gitutil" "gogs.io/gogs/internal/route/repo" ) @@ -35,7 +35,7 @@ func GetRawFile(c *context.APIContext) { } func GetArchive(c *context.APIContext) { - repoPath := db.RepoPath(c.Params(":username"), c.Params(":reponame")) + repoPath := database.RepoPath(c.Params(":username"), c.Params(":reponame")) gitRepo, err := git.Open(repoPath) if err != nil { c.Error(err, "open repository") diff --git a/internal/route/api/v1/repo/hook.go b/internal/route/api/v1/repo/hook.go index 6aa3feb58..c795e2f6c 100644 --- a/internal/route/api/v1/repo/hook.go +++ b/internal/route/api/v1/repo/hook.go @@ -14,13 +14,13 @@ import ( api "github.com/gogs/go-gogs-client" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/route/api/v1/convert" ) // https://github.com/gogs/go-gogs-client/wiki/Repositories#list-hooks func ListHooks(c *context.APIContext) { - hooks, err := db.GetWebhooksByRepoID(c.Repo.Repository.ID) + hooks, err := database.GetWebhooksByRepoID(c.Repo.Repository.ID) if err != nil { c.Errorf(err, "get webhooks by repository ID") return @@ -35,7 +35,7 @@ func ListHooks(c *context.APIContext) { // https://github.com/gogs/go-gogs-client/wiki/Repositories#create-a-hook func CreateHook(c *context.APIContext, form api.CreateHookOption) { - if !db.IsValidHookTaskType(form.Type) { + if !database.IsValidHookTaskType(form.Type) { c.ErrorStatus(http.StatusUnprocessableEntity, errors.New("Invalid hook type.")) return } @@ -45,7 +45,7 @@ func CreateHook(c *context.APIContext, form api.CreateHookOption) { return } } - if !db.IsValidHookContentType(form.Config["content_type"]) { + if !database.IsValidHookContentType(form.Config["content_type"]) { c.ErrorStatus(http.StatusUnprocessableEntity, errors.New("Invalid content type.")) return } @@ -53,34 +53,34 @@ func CreateHook(c *context.APIContext, form api.CreateHookOption) { if len(form.Events) == 0 { form.Events = []string{"push"} } - w := &db.Webhook{ + w := &database.Webhook{ RepoID: c.Repo.Repository.ID, URL: form.Config["url"], - ContentType: db.ToHookContentType(form.Config["content_type"]), + ContentType: database.ToHookContentType(form.Config["content_type"]), Secret: form.Config["secret"], - HookEvent: &db.HookEvent{ + HookEvent: &database.HookEvent{ ChooseEvents: true, - HookEvents: db.HookEvents{ - Create: com.IsSliceContainsStr(form.Events, string(db.HOOK_EVENT_CREATE)), - Delete: com.IsSliceContainsStr(form.Events, string(db.HOOK_EVENT_DELETE)), - Fork: com.IsSliceContainsStr(form.Events, string(db.HOOK_EVENT_FORK)), - Push: com.IsSliceContainsStr(form.Events, string(db.HOOK_EVENT_PUSH)), - Issues: com.IsSliceContainsStr(form.Events, string(db.HOOK_EVENT_ISSUES)), - IssueComment: com.IsSliceContainsStr(form.Events, string(db.HOOK_EVENT_ISSUE_COMMENT)), - PullRequest: com.IsSliceContainsStr(form.Events, string(db.HOOK_EVENT_PULL_REQUEST)), - Release: com.IsSliceContainsStr(form.Events, string(db.HOOK_EVENT_RELEASE)), + HookEvents: database.HookEvents{ + Create: com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_CREATE)), + Delete: com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_DELETE)), + Fork: com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_FORK)), + Push: com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_PUSH)), + Issues: com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_ISSUES)), + IssueComment: com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_ISSUE_COMMENT)), + PullRequest: com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_PULL_REQUEST)), + Release: com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_RELEASE)), }, }, IsActive: form.Active, - HookTaskType: db.ToHookTaskType(form.Type), + HookTaskType: database.ToHookTaskType(form.Type), } - if w.HookTaskType == db.SLACK { + if w.HookTaskType == database.SLACK { channel, ok := form.Config["channel"] if !ok { c.ErrorStatus(http.StatusUnprocessableEntity, errors.New("Missing config option: channel")) return } - meta, err := jsoniter.Marshal(&db.SlackMeta{ + meta, err := jsoniter.Marshal(&database.SlackMeta{ Channel: channel, Username: form.Config["username"], IconURL: form.Config["icon_url"], @@ -96,7 +96,7 @@ func CreateHook(c *context.APIContext, form api.CreateHookOption) { if err := w.UpdateEvent(); err != nil { c.Errorf(err, "update event") return - } else if err := db.CreateWebhook(w); err != nil { + } else if err := database.CreateWebhook(w); err != nil { c.Errorf(err, "create webhook") return } @@ -106,7 +106,7 @@ func CreateHook(c *context.APIContext, form api.CreateHookOption) { // https://github.com/gogs/go-gogs-client/wiki/Repositories#edit-a-hook func EditHook(c *context.APIContext, form api.EditHookOption) { - w, err := db.GetWebhookOfRepoByID(c.Repo.Repository.ID, c.ParamsInt64(":id")) + w, err := database.GetWebhookOfRepoByID(c.Repo.Repository.ID, c.ParamsInt64(":id")) if err != nil { c.NotFoundOrError(err, "get webhook of repository by ID") return @@ -117,16 +117,16 @@ func EditHook(c *context.APIContext, form api.EditHookOption) { w.URL = url } if ct, ok := form.Config["content_type"]; ok { - if !db.IsValidHookContentType(ct) { + if !database.IsValidHookContentType(ct) { c.ErrorStatus(http.StatusUnprocessableEntity, errors.New("Invalid content type.")) return } - w.ContentType = db.ToHookContentType(ct) + w.ContentType = database.ToHookContentType(ct) } - if w.HookTaskType == db.SLACK { + if w.HookTaskType == database.SLACK { if channel, ok := form.Config["channel"]; ok { - meta, err := jsoniter.Marshal(&db.SlackMeta{ + meta, err := jsoniter.Marshal(&database.SlackMeta{ Channel: channel, Username: form.Config["username"], IconURL: form.Config["icon_url"], @@ -148,14 +148,14 @@ func EditHook(c *context.APIContext, form api.EditHookOption) { w.PushOnly = false w.SendEverything = false w.ChooseEvents = true - w.Create = com.IsSliceContainsStr(form.Events, string(db.HOOK_EVENT_CREATE)) - w.Delete = com.IsSliceContainsStr(form.Events, string(db.HOOK_EVENT_DELETE)) - w.Fork = com.IsSliceContainsStr(form.Events, string(db.HOOK_EVENT_FORK)) - w.Push = com.IsSliceContainsStr(form.Events, string(db.HOOK_EVENT_PUSH)) - w.Issues = com.IsSliceContainsStr(form.Events, string(db.HOOK_EVENT_ISSUES)) - w.IssueComment = com.IsSliceContainsStr(form.Events, string(db.HOOK_EVENT_ISSUE_COMMENT)) - w.PullRequest = com.IsSliceContainsStr(form.Events, string(db.HOOK_EVENT_PULL_REQUEST)) - w.Release = com.IsSliceContainsStr(form.Events, string(db.HOOK_EVENT_RELEASE)) + w.Create = com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_CREATE)) + w.Delete = com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_DELETE)) + w.Fork = com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_FORK)) + w.Push = com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_PUSH)) + w.Issues = com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_ISSUES)) + w.IssueComment = com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_ISSUE_COMMENT)) + w.PullRequest = com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_PULL_REQUEST)) + w.Release = com.IsSliceContainsStr(form.Events, string(database.HOOK_EVENT_RELEASE)) if err = w.UpdateEvent(); err != nil { c.Errorf(err, "update event") return @@ -165,7 +165,7 @@ func EditHook(c *context.APIContext, form api.EditHookOption) { w.IsActive = *form.Active } - if err := db.UpdateWebhook(w); err != nil { + if err := database.UpdateWebhook(w); err != nil { c.Errorf(err, "update webhook") return } @@ -174,7 +174,7 @@ func EditHook(c *context.APIContext, form api.EditHookOption) { } func DeleteHook(c *context.APIContext) { - if err := db.DeleteWebhookOfRepoByID(c.Repo.Repository.ID, c.ParamsInt64(":id")); err != nil { + if err := database.DeleteWebhookOfRepoByID(c.Repo.Repository.ID, c.ParamsInt64(":id")); err != nil { c.Errorf(err, "delete webhook of repository by ID") return } diff --git a/internal/route/api/v1/repo/issue.go b/internal/route/api/v1/repo/issue.go index c663a830b..c53e08673 100644 --- a/internal/route/api/v1/repo/issue.go +++ b/internal/route/api/v1/repo/issue.go @@ -13,17 +13,17 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) -func listIssues(c *context.APIContext, opts *db.IssuesOptions) { - issues, err := db.Issues(opts) +func listIssues(c *context.APIContext, opts *database.IssuesOptions) { + issues, err := database.Issues(opts) if err != nil { c.Error(err, "list issues") return } - count, err := db.IssuesCount(opts) + count, err := database.IssuesCount(opts) if err != nil { c.Error(err, "count issues") return @@ -44,7 +44,7 @@ func listIssues(c *context.APIContext, opts *db.IssuesOptions) { } func ListUserIssues(c *context.APIContext) { - opts := db.IssuesOptions{ + opts := database.IssuesOptions{ AssigneeID: c.User.ID, Page: c.QueryInt("page"), IsClosed: api.StateType(c.Query("state")) == api.STATE_CLOSED, @@ -54,7 +54,7 @@ func ListUserIssues(c *context.APIContext) { } func ListIssues(c *context.APIContext) { - opts := db.IssuesOptions{ + opts := database.IssuesOptions{ RepoID: c.Repo.Repository.ID, Page: c.QueryInt("page"), IsClosed: api.StateType(c.Query("state")) == api.STATE_CLOSED, @@ -64,7 +64,7 @@ func ListIssues(c *context.APIContext) { } func GetIssue(c *context.APIContext) { - issue, err := db.GetIssueByIndex(c.Repo.Repository.ID, c.ParamsInt64(":index")) + issue, err := database.GetIssueByIndex(c.Repo.Repository.ID, c.ParamsInt64(":index")) if err != nil { c.NotFoundOrError(err, "get issue by index") return @@ -73,7 +73,7 @@ func GetIssue(c *context.APIContext) { } func CreateIssue(c *context.APIContext, form api.CreateIssueOption) { - issue := &db.Issue{ + issue := &database.Issue{ RepoID: c.Repo.Repository.ID, Title: form.Title, PosterID: c.User.ID, @@ -83,9 +83,9 @@ func CreateIssue(c *context.APIContext, form api.CreateIssueOption) { if c.Repo.IsWriter() { if len(form.Assignee) > 0 { - assignee, err := db.Users.GetByUsername(c.Req.Context(), form.Assignee) + assignee, err := database.Users.GetByUsername(c.Req.Context(), form.Assignee) if err != nil { - if db.IsErrUserNotExist(err) { + if database.IsErrUserNotExist(err) { c.ErrorStatus(http.StatusUnprocessableEntity, fmt.Errorf("assignee does not exist: [name: %s]", form.Assignee)) } else { c.Error(err, "get user by name") @@ -99,7 +99,7 @@ func CreateIssue(c *context.APIContext, form api.CreateIssueOption) { form.Labels = nil } - if err := db.NewIssue(c.Repo.Repository, issue, form.Labels, nil); err != nil { + if err := database.NewIssue(c.Repo.Repository, issue, form.Labels, nil); err != nil { c.Error(err, "new issue") return } @@ -113,7 +113,7 @@ func CreateIssue(c *context.APIContext, form api.CreateIssueOption) { // Refetch from database to assign some automatic values var err error - issue, err = db.GetIssueByID(issue.ID) + issue, err = database.GetIssueByID(issue.ID) if err != nil { c.Error(err, "get issue by ID") return @@ -122,7 +122,7 @@ func CreateIssue(c *context.APIContext, form api.CreateIssueOption) { } func EditIssue(c *context.APIContext, form api.EditIssueOption) { - issue, err := db.GetIssueByIndex(c.Repo.Repository.ID, c.ParamsInt64(":index")) + issue, err := database.GetIssueByIndex(c.Repo.Repository.ID, c.ParamsInt64(":index")) if err != nil { c.NotFoundOrError(err, "get issue by index") return @@ -145,9 +145,9 @@ func EditIssue(c *context.APIContext, form api.EditIssueOption) { if *form.Assignee == "" { issue.AssigneeID = 0 } else { - assignee, err := db.Users.GetByUsername(c.Req.Context(), *form.Assignee) + assignee, err := database.Users.GetByUsername(c.Req.Context(), *form.Assignee) if err != nil { - if db.IsErrUserNotExist(err) { + if database.IsErrUserNotExist(err) { c.ErrorStatus(http.StatusUnprocessableEntity, fmt.Errorf("assignee does not exist: [name: %s]", *form.Assignee)) } else { c.Error(err, "get user by name") @@ -157,7 +157,7 @@ func EditIssue(c *context.APIContext, form api.EditIssueOption) { issue.AssigneeID = assignee.ID } - if err = db.UpdateIssueUserByAssignee(issue); err != nil { + if err = database.UpdateIssueUserByAssignee(issue); err != nil { c.Error(err, "update issue user by assignee") return } @@ -166,13 +166,13 @@ func EditIssue(c *context.APIContext, form api.EditIssueOption) { issue.MilestoneID != *form.Milestone { oldMilestoneID := issue.MilestoneID issue.MilestoneID = *form.Milestone - if err = db.ChangeMilestoneAssign(c.User, issue, oldMilestoneID); err != nil { + if err = database.ChangeMilestoneAssign(c.User, issue, oldMilestoneID); err != nil { c.Error(err, "change milestone assign") return } } - if err = db.UpdateIssue(issue); err != nil { + if err = database.UpdateIssue(issue); err != nil { c.Error(err, "update issue") return } @@ -184,7 +184,7 @@ func EditIssue(c *context.APIContext, form api.EditIssueOption) { } // Refetch from database to assign some automatic values - issue, err = db.GetIssueByID(issue.ID) + issue, err = database.GetIssueByID(issue.ID) if err != nil { c.Error(err, "get issue by ID") return diff --git a/internal/route/api/v1/repo/issue_comment.go b/internal/route/api/v1/repo/issue_comment.go index a309cc806..a816daad6 100644 --- a/internal/route/api/v1/repo/issue_comment.go +++ b/internal/route/api/v1/repo/issue_comment.go @@ -10,7 +10,7 @@ import ( api "github.com/gogs/go-gogs-client" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) func ListIssueComments(c *context.APIContext) { @@ -25,13 +25,13 @@ func ListIssueComments(c *context.APIContext) { } // comments,err:=db.GetCommentsByIssueIDSince(, since) - issue, err := db.GetRawIssueByIndex(c.Repo.Repository.ID, c.ParamsInt64(":index")) + issue, err := database.GetRawIssueByIndex(c.Repo.Repository.ID, c.ParamsInt64(":index")) if err != nil { c.Error(err, "get raw issue by index") return } - comments, err := db.GetCommentsByIssueIDSince(issue.ID, since.Unix()) + comments, err := database.GetCommentsByIssueIDSince(issue.ID, since.Unix()) if err != nil { c.Error(err, "get comments by issue ID") return @@ -55,7 +55,7 @@ func ListRepoIssueComments(c *context.APIContext) { } } - comments, err := db.GetCommentsByRepoIDSince(c.Repo.Repository.ID, since.Unix()) + comments, err := database.GetCommentsByRepoIDSince(c.Repo.Repository.ID, since.Unix()) if err != nil { c.Error(err, "get comments by repository ID") return @@ -69,13 +69,13 @@ func ListRepoIssueComments(c *context.APIContext) { } func CreateIssueComment(c *context.APIContext, form api.CreateIssueCommentOption) { - issue, err := db.GetIssueByIndex(c.Repo.Repository.ID, c.ParamsInt64(":index")) + issue, err := database.GetIssueByIndex(c.Repo.Repository.ID, c.ParamsInt64(":index")) if err != nil { c.Error(err, "get issue by index") return } - comment, err := db.CreateIssueComment(c.User, c.Repo.Repository, issue, form.Body, nil) + comment, err := database.CreateIssueComment(c.User, c.Repo.Repository, issue, form.Body, nil) if err != nil { c.Error(err, "create issue comment") return @@ -85,7 +85,7 @@ func CreateIssueComment(c *context.APIContext, form api.CreateIssueCommentOption } func EditIssueComment(c *context.APIContext, form api.EditIssueCommentOption) { - comment, err := db.GetCommentByID(c.ParamsInt64(":id")) + comment, err := database.GetCommentByID(c.ParamsInt64(":id")) if err != nil { c.NotFoundOrError(err, "get comment by ID") return @@ -94,14 +94,14 @@ func EditIssueComment(c *context.APIContext, form api.EditIssueCommentOption) { if c.User.ID != comment.PosterID && !c.Repo.IsAdmin() { c.Status(http.StatusForbidden) return - } else if comment.Type != db.COMMENT_TYPE_COMMENT { + } else if comment.Type != database.COMMENT_TYPE_COMMENT { c.NoContent() return } oldContent := comment.Content comment.Content = form.Body - if err := db.UpdateComment(c.User, comment, oldContent); err != nil { + if err := database.UpdateComment(c.User, comment, oldContent); err != nil { c.Error(err, "update comment") return } @@ -109,7 +109,7 @@ func EditIssueComment(c *context.APIContext, form api.EditIssueCommentOption) { } func DeleteIssueComment(c *context.APIContext) { - comment, err := db.GetCommentByID(c.ParamsInt64(":id")) + comment, err := database.GetCommentByID(c.ParamsInt64(":id")) if err != nil { c.NotFoundOrError(err, "get comment by ID") return @@ -118,12 +118,12 @@ func DeleteIssueComment(c *context.APIContext) { if c.User.ID != comment.PosterID && !c.Repo.IsAdmin() { c.Status(http.StatusForbidden) return - } else if comment.Type != db.COMMENT_TYPE_COMMENT { + } else if comment.Type != database.COMMENT_TYPE_COMMENT { c.NoContent() return } - if err = db.DeleteCommentByID(c.User, comment.ID); err != nil { + if err = database.DeleteCommentByID(c.User, comment.ID); err != nil { c.Error(err, "delete comment by ID") return } diff --git a/internal/route/api/v1/repo/issue_label.go b/internal/route/api/v1/repo/issue_label.go index 92fff47d1..943abb595 100644 --- a/internal/route/api/v1/repo/issue_label.go +++ b/internal/route/api/v1/repo/issue_label.go @@ -10,11 +10,11 @@ import ( api "github.com/gogs/go-gogs-client" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) func ListIssueLabels(c *context.APIContext) { - issue, err := db.GetIssueByIndex(c.Repo.Repository.ID, c.ParamsInt64(":index")) + issue, err := database.GetIssueByIndex(c.Repo.Repository.ID, c.ParamsInt64(":index")) if err != nil { c.NotFoundOrError(err, "get issue by index") return @@ -28,13 +28,13 @@ func ListIssueLabels(c *context.APIContext) { } func AddIssueLabels(c *context.APIContext, form api.IssueLabelsOption) { - issue, err := db.GetIssueByIndex(c.Repo.Repository.ID, c.ParamsInt64(":index")) + issue, err := database.GetIssueByIndex(c.Repo.Repository.ID, c.ParamsInt64(":index")) if err != nil { c.NotFoundOrError(err, "get issue by index") return } - labels, err := db.GetLabelsInRepoByIDs(c.Repo.Repository.ID, form.Labels) + labels, err := database.GetLabelsInRepoByIDs(c.Repo.Repository.ID, form.Labels) if err != nil { c.Error(err, "get labels in repository by IDs") return @@ -45,7 +45,7 @@ func AddIssueLabels(c *context.APIContext, form api.IssueLabelsOption) { return } - labels, err = db.GetLabelsByIssueID(issue.ID) + labels, err = database.GetLabelsByIssueID(issue.ID) if err != nil { c.Error(err, "get labels by issue ID") return @@ -59,15 +59,15 @@ func AddIssueLabels(c *context.APIContext, form api.IssueLabelsOption) { } func DeleteIssueLabel(c *context.APIContext) { - issue, err := db.GetIssueByIndex(c.Repo.Repository.ID, c.ParamsInt64(":index")) + issue, err := database.GetIssueByIndex(c.Repo.Repository.ID, c.ParamsInt64(":index")) if err != nil { c.NotFoundOrError(err, "get issue by index") return } - label, err := db.GetLabelOfRepoByID(c.Repo.Repository.ID, c.ParamsInt64(":id")) + label, err := database.GetLabelOfRepoByID(c.Repo.Repository.ID, c.ParamsInt64(":id")) if err != nil { - if db.IsErrLabelNotExist(err) { + if database.IsErrLabelNotExist(err) { c.ErrorStatus(http.StatusUnprocessableEntity, err) } else { c.Error(err, "get label of repository by ID") @@ -75,7 +75,7 @@ func DeleteIssueLabel(c *context.APIContext) { return } - if err := db.DeleteIssueLabel(issue, label); err != nil { + if err := database.DeleteIssueLabel(issue, label); err != nil { c.Error(err, "delete issue label") return } @@ -84,13 +84,13 @@ func DeleteIssueLabel(c *context.APIContext) { } func ReplaceIssueLabels(c *context.APIContext, form api.IssueLabelsOption) { - issue, err := db.GetIssueByIndex(c.Repo.Repository.ID, c.ParamsInt64(":index")) + issue, err := database.GetIssueByIndex(c.Repo.Repository.ID, c.ParamsInt64(":index")) if err != nil { c.NotFoundOrError(err, "get issue by index") return } - labels, err := db.GetLabelsInRepoByIDs(c.Repo.Repository.ID, form.Labels) + labels, err := database.GetLabelsInRepoByIDs(c.Repo.Repository.ID, form.Labels) if err != nil { c.Error(err, "get labels in repository by IDs") return @@ -101,7 +101,7 @@ func ReplaceIssueLabels(c *context.APIContext, form api.IssueLabelsOption) { return } - labels, err = db.GetLabelsByIssueID(issue.ID) + labels, err = database.GetLabelsByIssueID(issue.ID) if err != nil { c.Error(err, "get labels by issue ID") return @@ -115,7 +115,7 @@ func ReplaceIssueLabels(c *context.APIContext, form api.IssueLabelsOption) { } func ClearIssueLabels(c *context.APIContext) { - issue, err := db.GetIssueByIndex(c.Repo.Repository.ID, c.ParamsInt64(":index")) + issue, err := database.GetIssueByIndex(c.Repo.Repository.ID, c.ParamsInt64(":index")) if err != nil { c.NotFoundOrError(err, "get issue by index") return diff --git a/internal/route/api/v1/repo/key.go b/internal/route/api/v1/repo/key.go index 38c037b62..b8a58b131 100644 --- a/internal/route/api/v1/repo/key.go +++ b/internal/route/api/v1/repo/key.go @@ -12,7 +12,7 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/route/api/v1/convert" ) @@ -22,7 +22,7 @@ func composeDeployKeysAPILink(repoPath string) string { // https://github.com/gogs/go-gogs-client/wiki/Repositories-Deploy-Keys#list-deploy-keys func ListDeployKeys(c *context.APIContext) { - keys, err := db.ListDeployKeys(c.Repo.Repository.ID) + keys, err := database.ListDeployKeys(c.Repo.Repository.ID) if err != nil { c.Error(err, "list deploy keys") return @@ -43,7 +43,7 @@ func ListDeployKeys(c *context.APIContext) { // https://github.com/gogs/go-gogs-client/wiki/Repositories-Deploy-Keys#get-a-deploy-key func GetDeployKey(c *context.APIContext) { - key, err := db.GetDeployKeyByID(c.ParamsInt64(":id")) + key, err := database.GetDeployKeyByID(c.ParamsInt64(":id")) if err != nil { c.NotFoundOrError(err, "get deploy key by ID") return @@ -59,7 +59,7 @@ func GetDeployKey(c *context.APIContext) { } func HandleCheckKeyStringError(c *context.APIContext, err error) { - if db.IsErrKeyUnableVerify(err) { + if database.IsErrKeyUnableVerify(err) { c.ErrorStatus(http.StatusUnprocessableEntity, errors.New("Unable to verify key content")) } else { c.ErrorStatus(http.StatusUnprocessableEntity, errors.Wrap(err, "Invalid key content: %v")) @@ -68,9 +68,9 @@ func HandleCheckKeyStringError(c *context.APIContext, err error) { func HandleAddKeyError(c *context.APIContext, err error) { switch { - case db.IsErrKeyAlreadyExist(err): + case database.IsErrKeyAlreadyExist(err): c.ErrorStatus(http.StatusUnprocessableEntity, errors.New("Key content has been used as non-deploy key")) - case db.IsErrKeyNameAlreadyUsed(err): + case database.IsErrKeyNameAlreadyUsed(err): c.ErrorStatus(http.StatusUnprocessableEntity, errors.New("Key title has been used")) default: c.Error(err, "add key") @@ -79,13 +79,13 @@ func HandleAddKeyError(c *context.APIContext, err error) { // https://github.com/gogs/go-gogs-client/wiki/Repositories-Deploy-Keys#add-a-new-deploy-key func CreateDeployKey(c *context.APIContext, form api.CreateKeyOption) { - content, err := db.CheckPublicKeyString(form.Key) + content, err := database.CheckPublicKeyString(form.Key) if err != nil { HandleCheckKeyStringError(c, err) return } - key, err := db.AddDeployKey(c.Repo.Repository.ID, form.Title, content) + key, err := database.AddDeployKey(c.Repo.Repository.ID, form.Title, content) if err != nil { HandleAddKeyError(c, err) return @@ -98,8 +98,8 @@ func CreateDeployKey(c *context.APIContext, form api.CreateKeyOption) { // https://github.com/gogs/go-gogs-client/wiki/Repositories-Deploy-Keys#remove-a-deploy-key func DeleteDeploykey(c *context.APIContext) { - if err := db.DeleteDeployKey(c.User, c.ParamsInt64(":id")); err != nil { - if db.IsErrKeyAccessDenied(err) { + if err := database.DeleteDeployKey(c.User, c.ParamsInt64(":id")); err != nil { + if database.IsErrKeyAccessDenied(err) { c.ErrorStatus(http.StatusForbidden, errors.New("You do not have access to this key")) } else { c.Error(err, "delete deploy key") diff --git a/internal/route/api/v1/repo/label.go b/internal/route/api/v1/repo/label.go index 69fe5399d..8d587add3 100644 --- a/internal/route/api/v1/repo/label.go +++ b/internal/route/api/v1/repo/label.go @@ -11,11 +11,11 @@ import ( "github.com/unknwon/com" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) func ListLabels(c *context.APIContext) { - labels, err := db.GetLabelsByRepoID(c.Repo.Repository.ID) + labels, err := database.GetLabelsByRepoID(c.Repo.Repository.ID) if err != nil { c.Error(err, "get labels by repository ID") return @@ -29,13 +29,13 @@ func ListLabels(c *context.APIContext) { } func GetLabel(c *context.APIContext) { - var label *db.Label + var label *database.Label var err error idStr := c.Params(":id") if id := com.StrTo(idStr).MustInt64(); id > 0 { - label, err = db.GetLabelOfRepoByID(c.Repo.Repository.ID, id) + label, err = database.GetLabelOfRepoByID(c.Repo.Repository.ID, id) } else { - label, err = db.GetLabelOfRepoByName(c.Repo.Repository.ID, idStr) + label, err = database.GetLabelOfRepoByName(c.Repo.Repository.ID, idStr) } if err != nil { c.NotFoundOrError(err, "get label") @@ -46,12 +46,12 @@ func GetLabel(c *context.APIContext) { } func CreateLabel(c *context.APIContext, form api.CreateLabelOption) { - label := &db.Label{ + label := &database.Label{ Name: form.Name, Color: form.Color, RepoID: c.Repo.Repository.ID, } - if err := db.NewLabels(label); err != nil { + if err := database.NewLabels(label); err != nil { c.Error(err, "new labels") return } @@ -59,7 +59,7 @@ func CreateLabel(c *context.APIContext, form api.CreateLabelOption) { } func EditLabel(c *context.APIContext, form api.EditLabelOption) { - label, err := db.GetLabelOfRepoByID(c.Repo.Repository.ID, c.ParamsInt64(":id")) + label, err := database.GetLabelOfRepoByID(c.Repo.Repository.ID, c.ParamsInt64(":id")) if err != nil { c.NotFoundOrError(err, "get label of repository by ID") return @@ -71,7 +71,7 @@ func EditLabel(c *context.APIContext, form api.EditLabelOption) { if form.Color != nil { label.Color = *form.Color } - if err := db.UpdateLabel(label); err != nil { + if err := database.UpdateLabel(label); err != nil { c.Error(err, "update label") return } @@ -79,7 +79,7 @@ func EditLabel(c *context.APIContext, form api.EditLabelOption) { } func DeleteLabel(c *context.APIContext) { - if err := db.DeleteLabel(c.Repo.Repository.ID, c.ParamsInt64(":id")); err != nil { + if err := database.DeleteLabel(c.Repo.Repository.ID, c.ParamsInt64(":id")); err != nil { c.Error(err, "delete label") return } diff --git a/internal/route/api/v1/repo/milestone.go b/internal/route/api/v1/repo/milestone.go index a36a71d82..b0b3fbfea 100644 --- a/internal/route/api/v1/repo/milestone.go +++ b/internal/route/api/v1/repo/milestone.go @@ -11,11 +11,11 @@ import ( api "github.com/gogs/go-gogs-client" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) func ListMilestones(c *context.APIContext) { - milestones, err := db.GetMilestonesByRepoID(c.Repo.Repository.ID) + milestones, err := database.GetMilestonesByRepoID(c.Repo.Repository.ID) if err != nil { c.Error(err, "get milestones by repository ID") return @@ -29,7 +29,7 @@ func ListMilestones(c *context.APIContext) { } func GetMilestone(c *context.APIContext) { - milestone, err := db.GetMilestoneByRepoID(c.Repo.Repository.ID, c.ParamsInt64(":id")) + milestone, err := database.GetMilestoneByRepoID(c.Repo.Repository.ID, c.ParamsInt64(":id")) if err != nil { c.NotFoundOrError(err, "get milestone by repository ID") return @@ -43,14 +43,14 @@ func CreateMilestone(c *context.APIContext, form api.CreateMilestoneOption) { form.Deadline = &defaultDeadline } - milestone := &db.Milestone{ + milestone := &database.Milestone{ RepoID: c.Repo.Repository.ID, Name: form.Title, Content: form.Description, Deadline: *form.Deadline, } - if err := db.NewMilestone(milestone); err != nil { + if err := database.NewMilestone(milestone); err != nil { c.Error(err, "new milestone") return } @@ -58,7 +58,7 @@ func CreateMilestone(c *context.APIContext, form api.CreateMilestoneOption) { } func EditMilestone(c *context.APIContext, form api.EditMilestoneOption) { - milestone, err := db.GetMilestoneByRepoID(c.Repo.Repository.ID, c.ParamsInt64(":id")) + milestone, err := database.GetMilestoneByRepoID(c.Repo.Repository.ID, c.ParamsInt64(":id")) if err != nil { c.NotFoundOrError(err, "get milestone by repository ID") return @@ -79,7 +79,7 @@ func EditMilestone(c *context.APIContext, form api.EditMilestoneOption) { c.Error(err, "change status") return } - } else if err = db.UpdateMilestone(milestone); err != nil { + } else if err = database.UpdateMilestone(milestone); err != nil { c.Error(err, "update milestone") return } @@ -88,7 +88,7 @@ func EditMilestone(c *context.APIContext, form api.EditMilestoneOption) { } func DeleteMilestone(c *context.APIContext) { - if err := db.DeleteMilestoneOfRepoByID(c.Repo.Repository.ID, c.ParamsInt64(":id")); err != nil { + if err := database.DeleteMilestoneOfRepoByID(c.Repo.Repository.ID, c.ParamsInt64(":id")); err != nil { c.Error(err, "delete milestone of repository by ID") return } diff --git a/internal/route/api/v1/repo/repo.go b/internal/route/api/v1/repo/repo.go index a4cc36b30..364d087ac 100644 --- a/internal/route/api/v1/repo/repo.go +++ b/internal/route/api/v1/repo/repo.go @@ -14,13 +14,13 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/form" "gogs.io/gogs/internal/route/api/v1/convert" ) func Search(c *context.APIContext) { - opts := &db.SearchRepoOptions{ + opts := &database.SearchRepoOptions{ Keyword: path.Base(c.Query("q")), OwnerID: c.QueryInt64("uid"), PageSize: convert.ToCorrectPageSize(c.QueryInt("limit")), @@ -32,7 +32,7 @@ func Search(c *context.APIContext) { if c.User.ID == opts.OwnerID { opts.Private = true } else { - u, err := db.Users.GetByID(c.Req.Context(), opts.OwnerID) + u, err := database.Users.GetByID(c.Req.Context(), opts.OwnerID) if err != nil { c.JSON(http.StatusInternalServerError, map[string]any{ "ok": false, @@ -47,7 +47,7 @@ func Search(c *context.APIContext) { } } - repos, count, err := db.SearchRepositoryByName(opts) + repos, count, err := database.SearchRepositoryByName(opts) if err != nil { c.JSON(http.StatusInternalServerError, map[string]any{ "ok": false, @@ -56,7 +56,7 @@ func Search(c *context.APIContext) { return } - if err = db.RepositoryList(repos).LoadAttributes(); err != nil { + if err = database.RepositoryList(repos).LoadAttributes(); err != nil { c.JSON(http.StatusInternalServerError, map[string]any{ "ok": false, "error": err.Error(), @@ -77,7 +77,7 @@ func Search(c *context.APIContext) { } func listUserRepositories(c *context.APIContext, username string) { - user, err := db.Users.GetByUsername(c.Req.Context(), username) + user, err := database.Users.GetByUsername(c.Req.Context(), username) if err != nil { c.NotFoundOrError(err, "get user by name") return @@ -85,11 +85,11 @@ func listUserRepositories(c *context.APIContext, username string) { // Only list public repositories if user requests someone else's repository list, // or an organization isn't a member of. - var ownRepos []*db.Repository + var ownRepos []*database.Repository if user.IsOrganization() { ownRepos, _, err = user.GetUserRepositories(c.User.ID, 1, user.NumRepos) } else { - ownRepos, err = db.GetUserRepositories(&db.UserRepoOptions{ + ownRepos, err = database.GetUserRepositories(&database.UserRepoOptions{ UserID: user.ID, Private: c.User.ID == user.ID, Page: 1, @@ -101,7 +101,7 @@ func listUserRepositories(c *context.APIContext, username string) { return } - if err = db.RepositoryList(ownRepos).LoadAttributes(); err != nil { + if err = database.RepositoryList(ownRepos).LoadAttributes(); err != nil { c.Error(err, "load attributes") return } @@ -116,7 +116,7 @@ func listUserRepositories(c *context.APIContext, username string) { return } - accessibleRepos, err := db.Repos.GetByCollaboratorIDWithAccessMode(c.Req.Context(), user.ID) + accessibleRepos, err := database.Repos.GetByCollaboratorIDWithAccessMode(c.Req.Context(), user.ID) if err != nil { c.Error(err, "get repositories accesses by collaborator") return @@ -131,8 +131,8 @@ func listUserRepositories(c *context.APIContext, username string) { for repo, access := range accessibleRepos { repos = append(repos, repo.APIFormatLegacy(&api.Permission{ - Admin: access >= db.AccessModeAdmin, - Push: access >= db.AccessModeWrite, + Admin: access >= database.AccessModeAdmin, + Push: access >= database.AccessModeWrite, Pull: true, }), ) @@ -153,8 +153,8 @@ func ListOrgRepositories(c *context.APIContext) { listUserRepositories(c, c.Params(":org")) } -func CreateUserRepo(c *context.APIContext, owner *db.User, opt api.CreateRepoOption) { - repo, err := db.CreateRepository(c.User, owner, db.CreateRepoOptionsLegacy{ +func CreateUserRepo(c *context.APIContext, owner *database.User, opt api.CreateRepoOption) { + repo, err := database.CreateRepository(c.User, owner, database.CreateRepoOptionsLegacy{ Name: opt.Name, Description: opt.Description, Gitignores: opt.Gitignores, @@ -164,12 +164,12 @@ func CreateUserRepo(c *context.APIContext, owner *db.User, opt api.CreateRepoOpt AutoInit: opt.AutoInit, }) if err != nil { - if db.IsErrRepoAlreadyExist(err) || - db.IsErrNameNotAllowed(err) { + if database.IsErrRepoAlreadyExist(err) || + database.IsErrNameNotAllowed(err) { c.ErrorStatus(http.StatusUnprocessableEntity, err) } else { if repo != nil { - if err = db.DeleteRepository(c.User.ID, repo.ID); err != nil { + if err = database.DeleteRepository(c.User.ID, repo.ID); err != nil { log.Error("Failed to delete repository: %v", err) } } @@ -191,7 +191,7 @@ func Create(c *context.APIContext, opt api.CreateRepoOption) { } func CreateOrgRepo(c *context.APIContext, opt api.CreateRepoOption) { - org, err := db.GetOrgByName(c.Params(":org")) + org, err := database.GetOrgByName(c.Params(":org")) if err != nil { c.NotFoundOrError(err, "get organization by name") return @@ -209,9 +209,9 @@ func Migrate(c *context.APIContext, f form.MigrateRepo) { // Not equal means context user is an organization, // or is another user/organization if current user is admin. if f.Uid != ctxUser.ID { - org, err := db.Users.GetByID(c.Req.Context(), f.Uid) + org, err := database.Users.GetByID(c.Req.Context(), f.Uid) if err != nil { - if db.IsErrUserNotExist(err) { + if database.IsErrUserNotExist(err) { c.ErrorStatus(http.StatusUnprocessableEntity, err) } else { c.Error(err, "get user by ID") @@ -239,8 +239,8 @@ func Migrate(c *context.APIContext, f form.MigrateRepo) { remoteAddr, err := f.ParseRemoteAddr(c.User) if err != nil { - if db.IsErrInvalidCloneAddr(err) { - addrErr := err.(db.ErrInvalidCloneAddr) + if database.IsErrInvalidCloneAddr(err) { + addrErr := err.(database.ErrInvalidCloneAddr) switch { case addrErr.IsURLError: c.ErrorStatus(http.StatusUnprocessableEntity, err) @@ -259,7 +259,7 @@ func Migrate(c *context.APIContext, f form.MigrateRepo) { return } - repo, err := db.MigrateRepository(c.User, ctxUser, db.MigrateRepoOptions{ + repo, err := database.MigrateRepository(c.User, ctxUser, database.MigrateRepoOptions{ Name: f.RepoName, Description: f.Description, IsPrivate: f.Private || conf.Repository.ForcePrivate, @@ -268,15 +268,15 @@ func Migrate(c *context.APIContext, f form.MigrateRepo) { }) if err != nil { if repo != nil { - if errDelete := db.DeleteRepository(ctxUser.ID, repo.ID); errDelete != nil { + if errDelete := database.DeleteRepository(ctxUser.ID, repo.ID); errDelete != nil { log.Error("DeleteRepository: %v", errDelete) } } - if db.IsErrReachLimitOfRepo(err) { + if database.IsErrReachLimitOfRepo(err) { c.ErrorStatus(http.StatusUnprocessableEntity, err) } else { - c.Error(errors.New(db.HandleMirrorCredentials(err.Error(), true)), "migrate repository") + c.Error(errors.New(database.HandleMirrorCredentials(err.Error(), true)), "migrate repository") } return } @@ -286,10 +286,10 @@ func Migrate(c *context.APIContext, f form.MigrateRepo) { } // FIXME: inject in the handler chain -func parseOwnerAndRepo(c *context.APIContext) (*db.User, *db.Repository) { - owner, err := db.Users.GetByUsername(c.Req.Context(), c.Params(":username")) +func parseOwnerAndRepo(c *context.APIContext) (*database.User, *database.Repository) { + owner, err := database.Users.GetByUsername(c.Req.Context(), c.Params(":username")) if err != nil { - if db.IsErrUserNotExist(err) { + if database.IsErrUserNotExist(err) { c.ErrorStatus(http.StatusUnprocessableEntity, err) } else { c.Error(err, "get user by name") @@ -297,7 +297,7 @@ func parseOwnerAndRepo(c *context.APIContext) (*db.User, *db.Repository) { return nil, nil } - repo, err := db.GetRepositoryByName(owner.ID, c.Params(":reponame")) + repo, err := database.GetRepositoryByName(owner.ID, c.Params(":reponame")) if err != nil { c.NotFoundOrError(err, "get repository by name") return nil, nil @@ -330,7 +330,7 @@ func Delete(c *context.APIContext) { return } - if err := db.DeleteRepository(owner.ID, repo.ID); err != nil { + if err := database.DeleteRepository(owner.ID, repo.ID); err != nil { c.Error(err, "delete repository") return } @@ -353,11 +353,11 @@ func ListForks(c *context.APIContext) { return } - accessMode := db.Perms.AccessMode( + accessMode := database.Perms.AccessMode( c.Req.Context(), c.User.ID, forks[i].ID, - db.AccessModeOptions{ + database.AccessModeOptions{ OwnerID: forks[i].OwnerID, Private: forks[i].IsPrivate, }, @@ -365,8 +365,8 @@ func ListForks(c *context.APIContext) { apiForks[i] = forks[i].APIFormatLegacy( &api.Permission{ - Admin: accessMode >= db.AccessModeAdmin, - Push: accessMode >= db.AccessModeWrite, + Admin: accessMode >= database.AccessModeAdmin, + Push: accessMode >= database.AccessModeWrite, Pull: true, }, ) @@ -397,7 +397,7 @@ func IssueTracker(c *context.APIContext, form api.EditIssueTrackerOption) { repo.ExternalTrackerStyle = *form.TrackerIssueStyle } - if err := db.UpdateRepository(repo, false); err != nil { + if err := database.UpdateRepository(repo, false); err != nil { c.Error(err, "update repository") return } @@ -423,7 +423,7 @@ func Wiki(c *context.APIContext, form api.EditWikiOption) { if form.ExternalWikiURL != nil { repo.ExternalWikiURL = *form.ExternalWikiURL } - if err := db.UpdateRepository(repo, false); err != nil { + if err := database.UpdateRepository(repo, false); err != nil { c.Error(err, "update repository") return } @@ -440,20 +440,20 @@ func MirrorSync(c *context.APIContext) { return } - go db.MirrorQueue.Add(repo.ID) + go database.MirrorQueue.Add(repo.ID) c.Status(http.StatusAccepted) } func Releases(c *context.APIContext) { _, repo := parseOwnerAndRepo(c) - releases, err := db.GetReleasesByRepoID(repo.ID) + releases, err := database.GetReleasesByRepoID(repo.ID) if err != nil { c.Error(err, "get releases by repository ID") return } apiReleases := make([]*api.Release, 0, len(releases)) for _, r := range releases { - publisher, err := db.Users.GetByID(c.Req.Context(), r.PublisherID) + publisher, err := database.Users.GetByID(c.Req.Context(), r.PublisherID) if err != nil { c.Error(err, "get release publisher") return diff --git a/internal/route/api/v1/user/app.go b/internal/route/api/v1/user/app.go index dce7d4215..29c8a96d8 100644 --- a/internal/route/api/v1/user/app.go +++ b/internal/route/api/v1/user/app.go @@ -10,11 +10,11 @@ import ( api "github.com/gogs/go-gogs-client" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) func ListAccessTokens(c *context.APIContext) { - tokens, err := db.AccessTokens.List(c.Req.Context(), c.User.ID) + tokens, err := database.AccessTokens.List(c.Req.Context(), c.User.ID) if err != nil { c.Error(err, "list access tokens") return @@ -28,9 +28,9 @@ func ListAccessTokens(c *context.APIContext) { } func CreateAccessToken(c *context.APIContext, form api.CreateAccessTokenOption) { - t, err := db.AccessTokens.Create(c.Req.Context(), c.User.ID, form.Name) + t, err := database.AccessTokens.Create(c.Req.Context(), c.User.ID, form.Name) if err != nil { - if db.IsErrAccessTokenAlreadyExist(err) { + if database.IsErrAccessTokenAlreadyExist(err) { c.ErrorStatus(http.StatusUnprocessableEntity, err) } else { c.Error(err, "new access token") diff --git a/internal/route/api/v1/user/email.go b/internal/route/api/v1/user/email.go index b85d424a3..c4cca54fb 100644 --- a/internal/route/api/v1/user/email.go +++ b/internal/route/api/v1/user/email.go @@ -12,12 +12,12 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/route/api/v1/convert" ) func ListEmails(c *context.APIContext) { - emails, err := db.Users.ListEmails(c.Req.Context(), c.User.ID) + emails, err := database.Users.ListEmails(c.Req.Context(), c.User.ID) if err != nil { c.Error(err, "get email addresses") return @@ -37,10 +37,10 @@ func AddEmail(c *context.APIContext, form api.CreateEmailOption) { apiEmails := make([]*api.Email, 0, len(form.Emails)) for _, email := range form.Emails { - err := db.Users.AddEmail(c.Req.Context(), c.User.ID, email, !conf.Auth.RequireEmailConfirmation) + err := database.Users.AddEmail(c.Req.Context(), c.User.ID, email, !conf.Auth.RequireEmailConfirmation) if err != nil { - if db.IsErrEmailAlreadyUsed(err) { - c.ErrorStatus(http.StatusUnprocessableEntity, errors.Errorf("email address has been used: %s", err.(db.ErrEmailAlreadyUsed).Email())) + if database.IsErrEmailAlreadyUsed(err) { + c.ErrorStatus(http.StatusUnprocessableEntity, errors.Errorf("email address has been used: %s", err.(database.ErrEmailAlreadyUsed).Email())) } else { c.Error(err, "add email addresses") } @@ -64,7 +64,7 @@ func DeleteEmail(c *context.APIContext, form api.CreateEmailOption) { return } - err := db.Users.DeleteEmail(c.Req.Context(), c.User.ID, email) + err := database.Users.DeleteEmail(c.Req.Context(), c.User.ID, email) if err != nil { c.Error(err, "delete email addresses") return diff --git a/internal/route/api/v1/user/follower.go b/internal/route/api/v1/user/follower.go index 9615924c5..cc461b417 100644 --- a/internal/route/api/v1/user/follower.go +++ b/internal/route/api/v1/user/follower.go @@ -8,10 +8,10 @@ import ( api "github.com/gogs/go-gogs-client" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) -func responseApiUsers(c *context.APIContext, users []*db.User) { +func responseApiUsers(c *context.APIContext, users []*database.User) { apiUsers := make([]*api.User, len(users)) for i := range users { apiUsers[i] = users[i].APIFormat() @@ -19,8 +19,8 @@ func responseApiUsers(c *context.APIContext, users []*db.User) { c.JSONSuccess(&apiUsers) } -func listUserFollowers(c *context.APIContext, u *db.User) { - users, err := db.Users.ListFollowers(c.Req.Context(), u.ID, c.QueryInt("page"), db.ItemsPerPage) +func listUserFollowers(c *context.APIContext, u *database.User) { + users, err := database.Users.ListFollowers(c.Req.Context(), u.ID, c.QueryInt("page"), database.ItemsPerPage) if err != nil { c.Error(err, "list followers") return @@ -40,8 +40,8 @@ func ListFollowers(c *context.APIContext) { listUserFollowers(c, u) } -func listUserFollowing(c *context.APIContext, u *db.User) { - users, err := db.Users.ListFollowings(c.Req.Context(), u.ID, c.QueryInt("page"), db.ItemsPerPage) +func listUserFollowing(c *context.APIContext, u *database.User) { + users, err := database.Users.ListFollowings(c.Req.Context(), u.ID, c.QueryInt("page"), database.ItemsPerPage) if err != nil { c.Error(err, "list followings") return @@ -61,8 +61,8 @@ func ListFollowing(c *context.APIContext) { listUserFollowing(c, u) } -func checkUserFollowing(c *context.APIContext, u *db.User, followID int64) { - if db.Users.IsFollowing(c.Req.Context(), u.ID, followID) { +func checkUserFollowing(c *context.APIContext, u *database.User, followID int64) { + if database.Users.IsFollowing(c.Req.Context(), u.ID, followID) { c.NoContent() } else { c.NotFound() @@ -94,7 +94,7 @@ func Follow(c *context.APIContext) { if c.Written() { return } - if err := db.Users.Follow(c.Req.Context(), c.User.ID, target.ID); err != nil { + if err := database.Users.Follow(c.Req.Context(), c.User.ID, target.ID); err != nil { c.Error(err, "follow user") return } @@ -106,7 +106,7 @@ func Unfollow(c *context.APIContext) { if c.Written() { return } - if err := db.Users.Unfollow(c.Req.Context(), c.User.ID, target.ID); err != nil { + if err := database.Users.Unfollow(c.Req.Context(), c.User.ID, target.ID); err != nil { c.Error(err, "unfollow user") return } diff --git a/internal/route/api/v1/user/key.go b/internal/route/api/v1/user/key.go index c80e3bf0f..b1b95fcf5 100644 --- a/internal/route/api/v1/user/key.go +++ b/internal/route/api/v1/user/key.go @@ -12,13 +12,13 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/route/api/v1/convert" "gogs.io/gogs/internal/route/api/v1/repo" ) -func GetUserByParamsName(c *context.APIContext, name string) *db.User { - user, err := db.Users.GetByUsername(c.Req.Context(), c.Params(name)) +func GetUserByParamsName(c *context.APIContext, name string) *database.User { + user, err := database.Users.GetByUsername(c.Req.Context(), c.Params(name)) if err != nil { c.NotFoundOrError(err, "get user by name") return nil @@ -27,7 +27,7 @@ func GetUserByParamsName(c *context.APIContext, name string) *db.User { } // GetUserByParams returns user whose name is presented in URL parameter. -func GetUserByParams(c *context.APIContext) *db.User { +func GetUserByParams(c *context.APIContext) *database.User { return GetUserByParamsName(c, ":username") } @@ -36,7 +36,7 @@ func composePublicKeysAPILink() string { } func listPublicKeys(c *context.APIContext, uid int64) { - keys, err := db.ListPublicKeys(uid) + keys, err := database.ListPublicKeys(uid) if err != nil { c.Error(err, "list public keys") return @@ -64,7 +64,7 @@ func ListPublicKeys(c *context.APIContext) { } func GetPublicKey(c *context.APIContext) { - key, err := db.GetPublicKeyByID(c.ParamsInt64(":id")) + key, err := database.GetPublicKeyByID(c.ParamsInt64(":id")) if err != nil { c.NotFoundOrError(err, "get public key by ID") return @@ -76,13 +76,13 @@ func GetPublicKey(c *context.APIContext) { // CreateUserPublicKey creates new public key to given user by ID. func CreateUserPublicKey(c *context.APIContext, form api.CreateKeyOption, uid int64) { - content, err := db.CheckPublicKeyString(form.Key) + content, err := database.CheckPublicKeyString(form.Key) if err != nil { repo.HandleCheckKeyStringError(c, err) return } - key, err := db.AddPublicKey(uid, form.Title, content) + key, err := database.AddPublicKey(uid, form.Title, content) if err != nil { repo.HandleAddKeyError(c, err) return @@ -96,8 +96,8 @@ func CreatePublicKey(c *context.APIContext, form api.CreateKeyOption) { } func DeletePublicKey(c *context.APIContext) { - if err := db.DeletePublicKey(c.User, c.ParamsInt64(":id")); err != nil { - if db.IsErrKeyAccessDenied(err) { + if err := database.DeletePublicKey(c.User, c.ParamsInt64(":id")); err != nil { + if database.IsErrKeyAccessDenied(err) { c.ErrorStatus(http.StatusForbidden, errors.New("You do not have access to this key.")) } else { c.Error(err, "delete public key") diff --git a/internal/route/api/v1/user/user.go b/internal/route/api/v1/user/user.go index d956f0c62..a1af7a793 100644 --- a/internal/route/api/v1/user/user.go +++ b/internal/route/api/v1/user/user.go @@ -10,7 +10,7 @@ import ( api "github.com/gogs/go-gogs-client" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/markup" ) @@ -19,7 +19,7 @@ func Search(c *context.APIContext) { if pageSize <= 0 { pageSize = 10 } - users, _, err := db.Users.SearchByName(c.Req.Context(), c.Query("q"), 1, pageSize, "") + users, _, err := database.Users.SearchByName(c.Req.Context(), c.Query("q"), 1, pageSize, "") if err != nil { c.JSON(http.StatusInternalServerError, map[string]any{ "ok": false, @@ -48,7 +48,7 @@ func Search(c *context.APIContext) { } func GetInfo(c *context.APIContext) { - u, err := db.Users.GetByUsername(c.Req.Context(), c.Params(":username")) + u, err := database.Users.GetByUsername(c.Req.Context(), c.Params(":username")) if err != nil { c.NotFoundOrError(err, "get user by name") return diff --git a/internal/route/dev/template.go b/internal/route/dev/template.go index 8f59e9231..e1be56aca 100644 --- a/internal/route/dev/template.go +++ b/internal/route/dev/template.go @@ -7,11 +7,11 @@ package dev import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) func TemplatePreview(c *context.Context) { - c.Data["User"] = db.User{Name: "Unknown"} + c.Data["User"] = database.User{Name: "Unknown"} c.Data["AppName"] = conf.App.BrandName c.Data["AppVersion"] = conf.App.Version c.Data["AppURL"] = conf.Server.ExternalURL diff --git a/internal/route/home.go b/internal/route/home.go index a389c0801..8a2a25905 100644 --- a/internal/route/home.go +++ b/internal/route/home.go @@ -15,7 +15,7 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/route/user" ) @@ -59,7 +59,7 @@ func ExploreRepos(c *context.Context) { } keyword := c.Query("q") - repos, count, err := db.SearchRepositoryByName(&db.SearchRepoOptions{ + repos, count, err := database.SearchRepositoryByName(&database.SearchRepoOptions{ Keyword: keyword, UserID: c.UserID(), OrderBy: "updated_unix DESC", @@ -74,7 +74,7 @@ func ExploreRepos(c *context.Context) { c.Data["Total"] = count c.Data["Page"] = paginater.New(int(count), conf.UI.ExplorePagingNum, page, 5) - if err = db.RepositoryList(repos).LoadAttributes(); err != nil { + if err = database.RepositoryList(repos).LoadAttributes(); err != nil { c.Error(err, "load attributes") return } @@ -84,9 +84,9 @@ func ExploreRepos(c *context.Context) { } type UserSearchOptions struct { - Type db.UserType + Type database.UserType Counter func(ctx gocontext.Context) int64 - Ranger func(ctx gocontext.Context, page, pageSize int) ([]*db.User, error) + Ranger func(ctx gocontext.Context, page, pageSize int) ([]*database.User, error) PageSize int OrderBy string TplName string @@ -99,7 +99,7 @@ func RenderUserSearch(c *context.Context, opts *UserSearchOptions) { } var ( - users []*db.User + users []*database.User count int64 err error ) @@ -113,9 +113,9 @@ func RenderUserSearch(c *context.Context, opts *UserSearchOptions) { } count = opts.Counter(c.Req.Context()) } else { - search := db.Users.SearchByName - if opts.Type == db.UserTypeOrganization { - search = db.Orgs.SearchByName + search := database.Users.SearchByName + if opts.Type == database.UserTypeOrganization { + search = database.Orgs.SearchByName } users, count, err = search(c.Req.Context(), keyword, page, opts.PageSize, opts.OrderBy) if err != nil { @@ -137,9 +137,9 @@ func ExploreUsers(c *context.Context) { c.Data["PageIsExploreUsers"] = true RenderUserSearch(c, &UserSearchOptions{ - Type: db.UserTypeIndividual, - Counter: db.Users.Count, - Ranger: db.Users.List, + Type: database.UserTypeIndividual, + Counter: database.Users.Count, + Ranger: database.Users.List, PageSize: conf.UI.ExplorePagingNum, OrderBy: "updated_unix DESC", TplName: EXPLORE_USERS, @@ -152,12 +152,12 @@ func ExploreOrganizations(c *context.Context) { c.Data["PageIsExploreOrganizations"] = true RenderUserSearch(c, &UserSearchOptions{ - Type: db.UserTypeOrganization, + Type: database.UserTypeOrganization, Counter: func(gocontext.Context) int64 { - return db.CountOrganizations() + return database.CountOrganizations() }, - Ranger: func(_ gocontext.Context, page, pageSize int) ([]*db.User, error) { - return db.Organizations(page, pageSize) + Ranger: func(_ gocontext.Context, page, pageSize int) ([]*database.User, error) { + return database.Organizations(page, pageSize) }, PageSize: conf.UI.ExplorePagingNum, OrderBy: "updated_unix DESC", diff --git a/internal/route/install.go b/internal/route/install.go index 2c1dde1de..e2ab29018 100644 --- a/internal/route/install.go +++ b/internal/route/install.go @@ -21,7 +21,7 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" "gogs.io/gogs/internal/cron" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/email" "gogs.io/gogs/internal/form" "gogs.io/gogs/internal/markup" @@ -71,19 +71,19 @@ func GlobalInit(customConf string) error { if conf.Security.InstallLock { highlight.NewContext() markup.NewSanitizer() - if err := db.NewEngine(); err != nil { + if err := database.NewEngine(); err != nil { log.Fatal("Failed to initialize ORM engine: %v", err) } - db.HasEngine = true + database.HasEngine = true - db.LoadRepoConfig() - db.NewRepoContext() + database.LoadRepoConfig() + database.NewRepoContext() // Booting long running goroutines. cron.NewContext() - db.InitSyncMirrors() - db.InitDeliverHooks() - db.InitTestPullRequests() + database.InitSyncMirrors() + database.InitDeliverHooks() + database.InitTestPullRequests() } if conf.HasMinWinSvc { log.Info("Builtin Windows Service is supported") @@ -106,7 +106,7 @@ func GlobalInit(customConf string) error { } if conf.SSH.RewriteAuthorizedKeysAtStart { - if err := db.RewriteAuthorizedKeys(); err != nil { + if err := database.RewriteAuthorizedKeys(); err != nil { log.Warn("Failed to rewrite authorized_keys file: %v", err) } } @@ -230,7 +230,7 @@ func InstallPost(c *context.Context, f form.Install) { } // Set test engine. - if err := db.NewTestEngine(); err != nil { + if err := database.NewTestEngine(); err != nil { if strings.Contains(err.Error(), `Unknown database type: sqlite3`) { c.FormErr("DbType") c.RenderWithErr(c.Tr("install.sqlite3_not_available", "https://gogs.io/docs/installation/install_from_binary.html"), INSTALL, &f) @@ -390,18 +390,18 @@ func InstallPost(c *context.Context, f form.Install) { // Create admin account if len(f.AdminName) > 0 { - user, err := db.Users.Create( + user, err := database.Users.Create( c.Req.Context(), f.AdminName, f.AdminEmail, - db.CreateUserOptions{ + database.CreateUserOptions{ Password: f.AdminPasswd, Activated: true, Admin: true, }, ) if err != nil { - if !db.IsErrUserAlreadyExist(err) { + if !database.IsErrUserAlreadyExist(err) { conf.Security.InstallLock = false c.FormErr("AdminName", "AdminEmail") c.RenderWithErr(c.Tr("install.invalid_admin_setting", err), INSTALL, &f) @@ -409,7 +409,7 @@ func InstallPost(c *context.Context, f form.Install) { } log.Info("Admin account already exist") - user, err = db.Users.GetByUsername(c.Req.Context(), f.AdminName) + user, err = database.Users.GetByUsername(c.Req.Context(), f.AdminName) if err != nil { c.Error(err, "get user by name") return diff --git a/internal/route/lfs/basic.go b/internal/route/lfs/basic.go index 0006f174d..4c7817265 100644 --- a/internal/route/lfs/basic.go +++ b/internal/route/lfs/basic.go @@ -13,7 +13,7 @@ import ( "gopkg.in/macaron.v1" log "unknwon.dev/clog/v2" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/lfsutil" "gogs.io/gogs/internal/strutil" ) @@ -42,10 +42,10 @@ func (h *basicHandler) Storager(storage lfsutil.Storage) lfsutil.Storager { } // GET /{owner}/{repo}.git/info/lfs/object/basic/{oid} -func (h *basicHandler) serveDownload(c *macaron.Context, repo *db.Repository, oid lfsutil.OID) { - object, err := db.LFS.GetObjectByOID(c.Req.Context(), repo.ID, oid) +func (h *basicHandler) serveDownload(c *macaron.Context, repo *database.Repository, oid lfsutil.OID) { + object, err := database.LFS.GetObjectByOID(c.Req.Context(), repo.ID, oid) if err != nil { - if db.IsErrLFSObjectNotExist(err) { + if database.IsErrLFSObjectNotExist(err) { responseJSON(c.Resp, http.StatusNotFound, responseError{ Message: "Object does not exist", }) @@ -75,17 +75,17 @@ func (h *basicHandler) serveDownload(c *macaron.Context, repo *db.Repository, oi } // PUT /{owner}/{repo}.git/info/lfs/object/basic/{oid} -func (h *basicHandler) serveUpload(c *macaron.Context, repo *db.Repository, oid lfsutil.OID) { +func (h *basicHandler) serveUpload(c *macaron.Context, repo *database.Repository, oid lfsutil.OID) { // NOTE: LFS client will retry upload the same object if there was a partial failure, // therefore we would like to skip ones that already exist. - _, err := db.LFS.GetObjectByOID(c.Req.Context(), repo.ID, oid) + _, err := database.LFS.GetObjectByOID(c.Req.Context(), repo.ID, oid) if err == nil { // Object exists, drain the request body and we're good. _, _ = io.Copy(io.Discard, c.Req.Request.Body) c.Req.Request.Body.Close() c.Status(http.StatusOK) return - } else if !db.IsErrLFSObjectNotExist(err) { + } else if !database.IsErrLFSObjectNotExist(err) { internalServerError(c.Resp) log.Error("Failed to get object [repo_id: %d, oid: %s]: %v", repo.ID, oid, err) return @@ -105,7 +105,7 @@ func (h *basicHandler) serveUpload(c *macaron.Context, repo *db.Repository, oid return } - err = db.LFS.CreateObject(c.Req.Context(), repo.ID, oid, written, s.Storage()) + err = database.LFS.CreateObject(c.Req.Context(), repo.ID, oid, written, s.Storage()) if err != nil { // NOTE: It is OK to leave the file when the whole operation failed // with a DB error, a retry on client side can safely overwrite the @@ -120,7 +120,7 @@ func (h *basicHandler) serveUpload(c *macaron.Context, repo *db.Repository, oid } // POST /{owner}/{repo}.git/info/lfs/object/basic/verify -func (*basicHandler) serveVerify(c *macaron.Context, repo *db.Repository) { +func (*basicHandler) serveVerify(c *macaron.Context, repo *database.Repository) { var request basicVerifyRequest defer func() { _ = c.Req.Request.Body.Close() }() @@ -139,9 +139,9 @@ func (*basicHandler) serveVerify(c *macaron.Context, repo *db.Repository) { return } - object, err := db.LFS.GetObjectByOID(c.Req.Context(), repo.ID, request.Oid) + object, err := database.LFS.GetObjectByOID(c.Req.Context(), repo.ID, request.Oid) if err != nil { - if db.IsErrLFSObjectNotExist(err) { + if database.IsErrLFSObjectNotExist(err) { responseJSON(c.Resp, http.StatusNotFound, responseError{ Message: "Object does not exist", }) diff --git a/internal/route/lfs/basic_test.go b/internal/route/lfs/basic_test.go index 74c837d68..860e6daf5 100644 --- a/internal/route/lfs/basic_test.go +++ b/internal/route/lfs/basic_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/assert" "gopkg.in/macaron.v1" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/lfsutil" ) @@ -52,7 +52,7 @@ func Test_basicHandler_serveDownload(t *testing.T) { m := macaron.New() m.Use(macaron.Renderer()) m.Use(func(c *macaron.Context) { - c.Map(&db.Repository{Name: "repo"}) + c.Map(&database.Repository{Name: "repo"}) c.Map(lfsutil.OID("ef797c8118f02dfb649607dd5d3f8c7623048c9c063d532cc95c5ed7a898a64f")) }) m.Get("/", basic.serveDownload) @@ -60,16 +60,16 @@ func Test_basicHandler_serveDownload(t *testing.T) { tests := []struct { name string content string - mockLFSStore func() db.LFSStore + mockLFSStore func() database.LFSStore expStatusCode int expHeader http.Header expBody string }{ { name: "object does not exist", - mockLFSStore: func() db.LFSStore { + mockLFSStore: func() database.LFSStore { mock := NewMockLFSStore() - mock.GetObjectByOIDFunc.SetDefaultReturn(nil, db.ErrLFSObjectNotExist{}) + mock.GetObjectByOIDFunc.SetDefaultReturn(nil, database.ErrLFSObjectNotExist{}) return mock }, expStatusCode: http.StatusNotFound, @@ -80,9 +80,9 @@ func Test_basicHandler_serveDownload(t *testing.T) { }, { name: "storage not found", - mockLFSStore: func() db.LFSStore { + mockLFSStore: func() database.LFSStore { mock := NewMockLFSStore() - mock.GetObjectByOIDFunc.SetDefaultReturn(&db.LFSObject{Storage: "bad_storage"}, nil) + mock.GetObjectByOIDFunc.SetDefaultReturn(&database.LFSObject{Storage: "bad_storage"}, nil) return mock }, expStatusCode: http.StatusInternalServerError, @@ -95,10 +95,10 @@ func Test_basicHandler_serveDownload(t *testing.T) { { name: "object exists", content: "Hello world!", - mockLFSStore: func() db.LFSStore { + mockLFSStore: func() database.LFSStore { mock := NewMockLFSStore() mock.GetObjectByOIDFunc.SetDefaultReturn( - &db.LFSObject{ + &database.LFSObject{ Size: 12, Storage: s.Storage(), }, @@ -116,7 +116,7 @@ func Test_basicHandler_serveDownload(t *testing.T) { } for _, test := range tests { t.Run(test.name, func(t *testing.T) { - db.SetMockLFSStore(t, test.mockLFSStore()) + database.SetMockLFSStore(t, test.mockLFSStore()) s.buf = bytes.NewBufferString(test.content) @@ -153,31 +153,31 @@ func Test_basicHandler_serveUpload(t *testing.T) { m := macaron.New() m.Use(macaron.Renderer()) m.Use(func(c *macaron.Context) { - c.Map(&db.Repository{Name: "repo"}) + c.Map(&database.Repository{Name: "repo"}) c.Map(lfsutil.OID("ef797c8118f02dfb649607dd5d3f8c7623048c9c063d532cc95c5ed7a898a64f")) }) m.Put("/", basic.serveUpload) tests := []struct { name string - mockLFSStore func() db.LFSStore + mockLFSStore func() database.LFSStore expStatusCode int expBody string }{ { name: "object already exists", - mockLFSStore: func() db.LFSStore { + mockLFSStore: func() database.LFSStore { mock := NewMockLFSStore() - mock.GetObjectByOIDFunc.SetDefaultReturn(&db.LFSObject{}, nil) + mock.GetObjectByOIDFunc.SetDefaultReturn(&database.LFSObject{}, nil) return mock }, expStatusCode: http.StatusOK, }, { name: "new object", - mockLFSStore: func() db.LFSStore { + mockLFSStore: func() database.LFSStore { mock := NewMockLFSStore() - mock.GetObjectByOIDFunc.SetDefaultReturn(nil, db.ErrLFSObjectNotExist{}) + mock.GetObjectByOIDFunc.SetDefaultReturn(nil, database.ErrLFSObjectNotExist{}) return mock }, expStatusCode: http.StatusOK, @@ -185,7 +185,7 @@ func Test_basicHandler_serveUpload(t *testing.T) { } for _, test := range tests { t.Run(test.name, func(t *testing.T) { - db.SetMockLFSStore(t, test.mockLFSStore()) + database.SetMockLFSStore(t, test.mockLFSStore()) r, err := http.NewRequest("PUT", "/", strings.NewReader("Hello world!")) if err != nil { @@ -211,14 +211,14 @@ func Test_basicHandler_serveVerify(t *testing.T) { m := macaron.New() m.Use(macaron.Renderer()) m.Use(func(c *macaron.Context) { - c.Map(&db.Repository{Name: "repo"}) + c.Map(&database.Repository{Name: "repo"}) }) m.Post("/", (&basicHandler{}).serveVerify) tests := []struct { name string body string - mockLFSStore func() db.LFSStore + mockLFSStore func() database.LFSStore expStatusCode int expBody string }{ @@ -231,9 +231,9 @@ func Test_basicHandler_serveVerify(t *testing.T) { { name: "object does not exist", body: `{"oid":"ef797c8118f02dfb649607dd5d3f8c7623048c9c063d532cc95c5ed7a898a64f"}`, - mockLFSStore: func() db.LFSStore { + mockLFSStore: func() database.LFSStore { mock := NewMockLFSStore() - mock.GetObjectByOIDFunc.SetDefaultReturn(nil, db.ErrLFSObjectNotExist{}) + mock.GetObjectByOIDFunc.SetDefaultReturn(nil, database.ErrLFSObjectNotExist{}) return mock }, expStatusCode: http.StatusNotFound, @@ -242,9 +242,9 @@ func Test_basicHandler_serveVerify(t *testing.T) { { name: "object size mismatch", body: `{"oid":"ef797c8118f02dfb649607dd5d3f8c7623048c9c063d532cc95c5ed7a898a64f"}`, - mockLFSStore: func() db.LFSStore { + mockLFSStore: func() database.LFSStore { mock := NewMockLFSStore() - mock.GetObjectByOIDFunc.SetDefaultReturn(&db.LFSObject{Size: 12}, nil) + mock.GetObjectByOIDFunc.SetDefaultReturn(&database.LFSObject{Size: 12}, nil) return mock }, expStatusCode: http.StatusBadRequest, @@ -254,9 +254,9 @@ func Test_basicHandler_serveVerify(t *testing.T) { { name: "object exists", body: `{"oid":"ef797c8118f02dfb649607dd5d3f8c7623048c9c063d532cc95c5ed7a898a64f", "size":12}`, - mockLFSStore: func() db.LFSStore { + mockLFSStore: func() database.LFSStore { mock := NewMockLFSStore() - mock.GetObjectByOIDFunc.SetDefaultReturn(&db.LFSObject{Size: 12}, nil) + mock.GetObjectByOIDFunc.SetDefaultReturn(&database.LFSObject{Size: 12}, nil) return mock }, expStatusCode: http.StatusOK, @@ -265,7 +265,7 @@ func Test_basicHandler_serveVerify(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { if test.mockLFSStore != nil { - db.SetMockLFSStore(t, test.mockLFSStore()) + database.SetMockLFSStore(t, test.mockLFSStore()) } r, err := http.NewRequest("POST", "/", strings.NewReader(test.body)) diff --git a/internal/route/lfs/batch.go b/internal/route/lfs/batch.go index a6921648c..8b20223a4 100644 --- a/internal/route/lfs/batch.go +++ b/internal/route/lfs/batch.go @@ -13,13 +13,13 @@ import ( log "unknwon.dev/clog/v2" "gogs.io/gogs/internal/conf" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/lfsutil" "gogs.io/gogs/internal/strutil" ) // POST /{owner}/{repo}.git/info/lfs/object/batch -func serveBatch(c *macaron.Context, owner *db.User, repo *db.Repository) { +func serveBatch(c *macaron.Context, owner *database.User, repo *database.Repository) { var request batchRequest defer c.Req.Request.Body.Close() err := jsoniter.NewDecoder(c.Req.Request.Body).Decode(&request) @@ -75,13 +75,13 @@ func serveBatch(c *macaron.Context, owner *db.User, repo *db.Repository) { for _, obj := range request.Objects { oids = append(oids, obj.Oid) } - stored, err := db.LFS.GetObjectsByOIDs(c.Req.Context(), repo.ID, oids...) + stored, err := database.LFS.GetObjectsByOIDs(c.Req.Context(), repo.ID, oids...) if err != nil { internalServerError(c.Resp) log.Error("Failed to get objects [repo_id: %d, oids: %v]: %v", repo.ID, oids, err) return } - storedSet := make(map[lfsutil.OID]*db.LFSObject, len(stored)) + storedSet := make(map[lfsutil.OID]*database.LFSObject, len(stored)) for _, obj := range stored { storedSet[obj.OID] = obj } diff --git a/internal/route/lfs/batch_test.go b/internal/route/lfs/batch_test.go index e3feb7edf..c9e49e850 100644 --- a/internal/route/lfs/batch_test.go +++ b/internal/route/lfs/batch_test.go @@ -16,7 +16,7 @@ import ( "gopkg.in/macaron.v1" "gogs.io/gogs/internal/conf" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) func Test_serveBatch(t *testing.T) { @@ -26,15 +26,15 @@ func Test_serveBatch(t *testing.T) { m := macaron.New() m.Use(func(c *macaron.Context) { - c.Map(&db.User{Name: "owner"}) - c.Map(&db.Repository{Name: "repo"}) + c.Map(&database.User{Name: "owner"}) + c.Map(&database.Repository{Name: "repo"}) }) m.Post("/", serveBatch) tests := []struct { name string body string - mockLFSStore func() db.LFSStore + mockLFSStore func() database.LFSStore expStatusCode int expBody string }{ @@ -82,10 +82,10 @@ func Test_serveBatch(t *testing.T) { {"oid": "ef797c8118f02dfb649607dd5d3f8c7623048c9c063d532cc95c5ed7a898a64f", "size": 123}, {"oid": "5cac0a318669fadfee734fb340a5f5b70b428ac57a9f4b109cb6e150b2ba7e57", "size": 456} ]}`, - mockLFSStore: func() db.LFSStore { + mockLFSStore: func() database.LFSStore { mock := NewMockLFSStore() mock.GetObjectsByOIDsFunc.SetDefaultReturn( - []*db.LFSObject{ + []*database.LFSObject{ { OID: "ef797c8118f02dfb649607dd5d3f8c7623048c9c063d532cc95c5ed7a898a64f", Size: 1234, @@ -124,7 +124,7 @@ func Test_serveBatch(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { if test.mockLFSStore != nil { - db.SetMockLFSStore(t, test.mockLFSStore()) + database.SetMockLFSStore(t, test.mockLFSStore()) } r, err := http.NewRequest("POST", "/", bytes.NewBufferString(test.body)) diff --git a/internal/route/lfs/mocks_test.go b/internal/route/lfs/mocks_test.go index b313ce553..4ab5f2f99 100644 --- a/internal/route/lfs/mocks_test.go +++ b/internal/route/lfs/mocks_test.go @@ -10,12 +10,12 @@ import ( "context" "sync" - db "gogs.io/gogs/internal/db" + database "gogs.io/gogs/internal/database" lfsutil "gogs.io/gogs/internal/lfsutil" ) // MockAccessTokensStore is a mock implementation of the AccessTokensStore -// interface (from the package gogs.io/gogs/internal/db) used for unit +// interface (from the package gogs.io/gogs/internal/database) used for unit // testing. type MockAccessTokensStore struct { // CreateFunc is an instance of a mock function object controlling the @@ -41,7 +41,7 @@ type MockAccessTokensStore struct { func NewMockAccessTokensStore() *MockAccessTokensStore { return &MockAccessTokensStore{ CreateFunc: &AccessTokensStoreCreateFunc{ - defaultHook: func(context.Context, int64, string) (r0 *db.AccessToken, r1 error) { + defaultHook: func(context.Context, int64, string) (r0 *database.AccessToken, r1 error) { return }, }, @@ -51,12 +51,12 @@ func NewMockAccessTokensStore() *MockAccessTokensStore { }, }, GetBySHA1Func: &AccessTokensStoreGetBySHA1Func{ - defaultHook: func(context.Context, string) (r0 *db.AccessToken, r1 error) { + defaultHook: func(context.Context, string) (r0 *database.AccessToken, r1 error) { return }, }, ListFunc: &AccessTokensStoreListFunc{ - defaultHook: func(context.Context, int64) (r0 []*db.AccessToken, r1 error) { + defaultHook: func(context.Context, int64) (r0 []*database.AccessToken, r1 error) { return }, }, @@ -74,7 +74,7 @@ func NewMockAccessTokensStore() *MockAccessTokensStore { func NewStrictMockAccessTokensStore() *MockAccessTokensStore { return &MockAccessTokensStore{ CreateFunc: &AccessTokensStoreCreateFunc{ - defaultHook: func(context.Context, int64, string) (*db.AccessToken, error) { + defaultHook: func(context.Context, int64, string) (*database.AccessToken, error) { panic("unexpected invocation of MockAccessTokensStore.Create") }, }, @@ -84,12 +84,12 @@ func NewStrictMockAccessTokensStore() *MockAccessTokensStore { }, }, GetBySHA1Func: &AccessTokensStoreGetBySHA1Func{ - defaultHook: func(context.Context, string) (*db.AccessToken, error) { + defaultHook: func(context.Context, string) (*database.AccessToken, error) { panic("unexpected invocation of MockAccessTokensStore.GetBySHA1") }, }, ListFunc: &AccessTokensStoreListFunc{ - defaultHook: func(context.Context, int64) ([]*db.AccessToken, error) { + defaultHook: func(context.Context, int64) ([]*database.AccessToken, error) { panic("unexpected invocation of MockAccessTokensStore.List") }, }, @@ -104,7 +104,7 @@ func NewStrictMockAccessTokensStore() *MockAccessTokensStore { // NewMockAccessTokensStoreFrom creates a new mock of the // MockAccessTokensStore interface. All methods delegate to the given // implementation, unless overwritten. -func NewMockAccessTokensStoreFrom(i db.AccessTokensStore) *MockAccessTokensStore { +func NewMockAccessTokensStoreFrom(i database.AccessTokensStore) *MockAccessTokensStore { return &MockAccessTokensStore{ CreateFunc: &AccessTokensStoreCreateFunc{ defaultHook: i.Create, @@ -127,15 +127,15 @@ func NewMockAccessTokensStoreFrom(i db.AccessTokensStore) *MockAccessTokensStore // AccessTokensStoreCreateFunc describes the behavior when the Create method // of the parent MockAccessTokensStore instance is invoked. type AccessTokensStoreCreateFunc struct { - defaultHook func(context.Context, int64, string) (*db.AccessToken, error) - hooks []func(context.Context, int64, string) (*db.AccessToken, error) + defaultHook func(context.Context, int64, string) (*database.AccessToken, error) + hooks []func(context.Context, int64, string) (*database.AccessToken, error) history []AccessTokensStoreCreateFuncCall mutex sync.Mutex } // Create delegates to the next hook function in the queue and stores the // parameter and result values of this invocation. -func (m *MockAccessTokensStore) Create(v0 context.Context, v1 int64, v2 string) (*db.AccessToken, error) { +func (m *MockAccessTokensStore) Create(v0 context.Context, v1 int64, v2 string) (*database.AccessToken, error) { r0, r1 := m.CreateFunc.nextHook()(v0, v1, v2) m.CreateFunc.appendCall(AccessTokensStoreCreateFuncCall{v0, v1, v2, r0, r1}) return r0, r1 @@ -144,7 +144,7 @@ func (m *MockAccessTokensStore) Create(v0 context.Context, v1 int64, v2 string) // SetDefaultHook sets function that is called when the Create method of the // parent MockAccessTokensStore instance is invoked and the hook queue is // empty. -func (f *AccessTokensStoreCreateFunc) SetDefaultHook(hook func(context.Context, int64, string) (*db.AccessToken, error)) { +func (f *AccessTokensStoreCreateFunc) SetDefaultHook(hook func(context.Context, int64, string) (*database.AccessToken, error)) { f.defaultHook = hook } @@ -152,7 +152,7 @@ func (f *AccessTokensStoreCreateFunc) SetDefaultHook(hook func(context.Context, // Create method of the parent MockAccessTokensStore instance invokes the // hook at the front of the queue and discards it. After the queue is empty, // the default hook function is invoked for any future action. -func (f *AccessTokensStoreCreateFunc) PushHook(hook func(context.Context, int64, string) (*db.AccessToken, error)) { +func (f *AccessTokensStoreCreateFunc) PushHook(hook func(context.Context, int64, string) (*database.AccessToken, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -160,20 +160,20 @@ func (f *AccessTokensStoreCreateFunc) PushHook(hook func(context.Context, int64, // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *AccessTokensStoreCreateFunc) SetDefaultReturn(r0 *db.AccessToken, r1 error) { - f.SetDefaultHook(func(context.Context, int64, string) (*db.AccessToken, error) { +func (f *AccessTokensStoreCreateFunc) SetDefaultReturn(r0 *database.AccessToken, r1 error) { + f.SetDefaultHook(func(context.Context, int64, string) (*database.AccessToken, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *AccessTokensStoreCreateFunc) PushReturn(r0 *db.AccessToken, r1 error) { - f.PushHook(func(context.Context, int64, string) (*db.AccessToken, error) { +func (f *AccessTokensStoreCreateFunc) PushReturn(r0 *database.AccessToken, r1 error) { + f.PushHook(func(context.Context, int64, string) (*database.AccessToken, error) { return r0, r1 }) } -func (f *AccessTokensStoreCreateFunc) nextHook() func(context.Context, int64, string) (*db.AccessToken, error) { +func (f *AccessTokensStoreCreateFunc) nextHook() func(context.Context, int64, string) (*database.AccessToken, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -217,7 +217,7 @@ type AccessTokensStoreCreateFuncCall struct { Arg2 string // Result0 is the value of the 1st result returned from this method // invocation. - Result0 *db.AccessToken + Result0 *database.AccessToken // Result1 is the value of the 2nd result returned from this method // invocation. Result1 error @@ -347,15 +347,15 @@ func (c AccessTokensStoreDeleteByIDFuncCall) Results() []interface{} { // AccessTokensStoreGetBySHA1Func describes the behavior when the GetBySHA1 // method of the parent MockAccessTokensStore instance is invoked. type AccessTokensStoreGetBySHA1Func struct { - defaultHook func(context.Context, string) (*db.AccessToken, error) - hooks []func(context.Context, string) (*db.AccessToken, error) + defaultHook func(context.Context, string) (*database.AccessToken, error) + hooks []func(context.Context, string) (*database.AccessToken, error) history []AccessTokensStoreGetBySHA1FuncCall mutex sync.Mutex } // GetBySHA1 delegates to the next hook function in the queue and stores the // parameter and result values of this invocation. -func (m *MockAccessTokensStore) GetBySHA1(v0 context.Context, v1 string) (*db.AccessToken, error) { +func (m *MockAccessTokensStore) GetBySHA1(v0 context.Context, v1 string) (*database.AccessToken, error) { r0, r1 := m.GetBySHA1Func.nextHook()(v0, v1) m.GetBySHA1Func.appendCall(AccessTokensStoreGetBySHA1FuncCall{v0, v1, r0, r1}) return r0, r1 @@ -364,7 +364,7 @@ func (m *MockAccessTokensStore) GetBySHA1(v0 context.Context, v1 string) (*db.Ac // SetDefaultHook sets function that is called when the GetBySHA1 method of // the parent MockAccessTokensStore instance is invoked and the hook queue // is empty. -func (f *AccessTokensStoreGetBySHA1Func) SetDefaultHook(hook func(context.Context, string) (*db.AccessToken, error)) { +func (f *AccessTokensStoreGetBySHA1Func) SetDefaultHook(hook func(context.Context, string) (*database.AccessToken, error)) { f.defaultHook = hook } @@ -372,7 +372,7 @@ func (f *AccessTokensStoreGetBySHA1Func) SetDefaultHook(hook func(context.Contex // GetBySHA1 method of the parent MockAccessTokensStore instance invokes the // hook at the front of the queue and discards it. After the queue is empty, // the default hook function is invoked for any future action. -func (f *AccessTokensStoreGetBySHA1Func) PushHook(hook func(context.Context, string) (*db.AccessToken, error)) { +func (f *AccessTokensStoreGetBySHA1Func) PushHook(hook func(context.Context, string) (*database.AccessToken, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -380,20 +380,20 @@ func (f *AccessTokensStoreGetBySHA1Func) PushHook(hook func(context.Context, str // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *AccessTokensStoreGetBySHA1Func) SetDefaultReturn(r0 *db.AccessToken, r1 error) { - f.SetDefaultHook(func(context.Context, string) (*db.AccessToken, error) { +func (f *AccessTokensStoreGetBySHA1Func) SetDefaultReturn(r0 *database.AccessToken, r1 error) { + f.SetDefaultHook(func(context.Context, string) (*database.AccessToken, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *AccessTokensStoreGetBySHA1Func) PushReturn(r0 *db.AccessToken, r1 error) { - f.PushHook(func(context.Context, string) (*db.AccessToken, error) { +func (f *AccessTokensStoreGetBySHA1Func) PushReturn(r0 *database.AccessToken, r1 error) { + f.PushHook(func(context.Context, string) (*database.AccessToken, error) { return r0, r1 }) } -func (f *AccessTokensStoreGetBySHA1Func) nextHook() func(context.Context, string) (*db.AccessToken, error) { +func (f *AccessTokensStoreGetBySHA1Func) nextHook() func(context.Context, string) (*database.AccessToken, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -434,7 +434,7 @@ type AccessTokensStoreGetBySHA1FuncCall struct { Arg1 string // Result0 is the value of the 1st result returned from this method // invocation. - Result0 *db.AccessToken + Result0 *database.AccessToken // Result1 is the value of the 2nd result returned from this method // invocation. Result1 error @@ -455,15 +455,15 @@ func (c AccessTokensStoreGetBySHA1FuncCall) Results() []interface{} { // AccessTokensStoreListFunc describes the behavior when the List method of // the parent MockAccessTokensStore instance is invoked. type AccessTokensStoreListFunc struct { - defaultHook func(context.Context, int64) ([]*db.AccessToken, error) - hooks []func(context.Context, int64) ([]*db.AccessToken, error) + defaultHook func(context.Context, int64) ([]*database.AccessToken, error) + hooks []func(context.Context, int64) ([]*database.AccessToken, error) history []AccessTokensStoreListFuncCall mutex sync.Mutex } // List delegates to the next hook function in the queue and stores the // parameter and result values of this invocation. -func (m *MockAccessTokensStore) List(v0 context.Context, v1 int64) ([]*db.AccessToken, error) { +func (m *MockAccessTokensStore) List(v0 context.Context, v1 int64) ([]*database.AccessToken, error) { r0, r1 := m.ListFunc.nextHook()(v0, v1) m.ListFunc.appendCall(AccessTokensStoreListFuncCall{v0, v1, r0, r1}) return r0, r1 @@ -472,7 +472,7 @@ func (m *MockAccessTokensStore) List(v0 context.Context, v1 int64) ([]*db.Access // SetDefaultHook sets function that is called when the List method of the // parent MockAccessTokensStore instance is invoked and the hook queue is // empty. -func (f *AccessTokensStoreListFunc) SetDefaultHook(hook func(context.Context, int64) ([]*db.AccessToken, error)) { +func (f *AccessTokensStoreListFunc) SetDefaultHook(hook func(context.Context, int64) ([]*database.AccessToken, error)) { f.defaultHook = hook } @@ -480,7 +480,7 @@ func (f *AccessTokensStoreListFunc) SetDefaultHook(hook func(context.Context, in // List method of the parent MockAccessTokensStore instance invokes the hook // at the front of the queue and discards it. After the queue is empty, the // default hook function is invoked for any future action. -func (f *AccessTokensStoreListFunc) PushHook(hook func(context.Context, int64) ([]*db.AccessToken, error)) { +func (f *AccessTokensStoreListFunc) PushHook(hook func(context.Context, int64) ([]*database.AccessToken, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -488,20 +488,20 @@ func (f *AccessTokensStoreListFunc) PushHook(hook func(context.Context, int64) ( // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *AccessTokensStoreListFunc) SetDefaultReturn(r0 []*db.AccessToken, r1 error) { - f.SetDefaultHook(func(context.Context, int64) ([]*db.AccessToken, error) { +func (f *AccessTokensStoreListFunc) SetDefaultReturn(r0 []*database.AccessToken, r1 error) { + f.SetDefaultHook(func(context.Context, int64) ([]*database.AccessToken, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *AccessTokensStoreListFunc) PushReturn(r0 []*db.AccessToken, r1 error) { - f.PushHook(func(context.Context, int64) ([]*db.AccessToken, error) { +func (f *AccessTokensStoreListFunc) PushReturn(r0 []*database.AccessToken, r1 error) { + f.PushHook(func(context.Context, int64) ([]*database.AccessToken, error) { return r0, r1 }) } -func (f *AccessTokensStoreListFunc) nextHook() func(context.Context, int64) ([]*db.AccessToken, error) { +func (f *AccessTokensStoreListFunc) nextHook() func(context.Context, int64) ([]*database.AccessToken, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -542,7 +542,7 @@ type AccessTokensStoreListFuncCall struct { Arg1 int64 // Result0 is the value of the 1st result returned from this method // invocation. - Result0 []*db.AccessToken + Result0 []*database.AccessToken // Result1 is the value of the 2nd result returned from this method // invocation. Result1 error @@ -666,7 +666,7 @@ func (c AccessTokensStoreTouchFuncCall) Results() []interface{} { } // MockLFSStore is a mock implementation of the LFSStore interface (from the -// package gogs.io/gogs/internal/db) used for unit testing. +// package gogs.io/gogs/internal/database) used for unit testing. type MockLFSStore struct { // CreateObjectFunc is an instance of a mock function object controlling // the behavior of the method CreateObject. @@ -689,12 +689,12 @@ func NewMockLFSStore() *MockLFSStore { }, }, GetObjectByOIDFunc: &LFSStoreGetObjectByOIDFunc{ - defaultHook: func(context.Context, int64, lfsutil.OID) (r0 *db.LFSObject, r1 error) { + defaultHook: func(context.Context, int64, lfsutil.OID) (r0 *database.LFSObject, r1 error) { return }, }, GetObjectsByOIDsFunc: &LFSStoreGetObjectsByOIDsFunc{ - defaultHook: func(context.Context, int64, ...lfsutil.OID) (r0 []*db.LFSObject, r1 error) { + defaultHook: func(context.Context, int64, ...lfsutil.OID) (r0 []*database.LFSObject, r1 error) { return }, }, @@ -711,12 +711,12 @@ func NewStrictMockLFSStore() *MockLFSStore { }, }, GetObjectByOIDFunc: &LFSStoreGetObjectByOIDFunc{ - defaultHook: func(context.Context, int64, lfsutil.OID) (*db.LFSObject, error) { + defaultHook: func(context.Context, int64, lfsutil.OID) (*database.LFSObject, error) { panic("unexpected invocation of MockLFSStore.GetObjectByOID") }, }, GetObjectsByOIDsFunc: &LFSStoreGetObjectsByOIDsFunc{ - defaultHook: func(context.Context, int64, ...lfsutil.OID) ([]*db.LFSObject, error) { + defaultHook: func(context.Context, int64, ...lfsutil.OID) ([]*database.LFSObject, error) { panic("unexpected invocation of MockLFSStore.GetObjectsByOIDs") }, }, @@ -725,7 +725,7 @@ func NewStrictMockLFSStore() *MockLFSStore { // NewMockLFSStoreFrom creates a new mock of the MockLFSStore interface. All // methods delegate to the given implementation, unless overwritten. -func NewMockLFSStoreFrom(i db.LFSStore) *MockLFSStore { +func NewMockLFSStoreFrom(i database.LFSStore) *MockLFSStore { return &MockLFSStore{ CreateObjectFunc: &LFSStoreCreateObjectFunc{ defaultHook: i.CreateObject, @@ -856,15 +856,15 @@ func (c LFSStoreCreateObjectFuncCall) Results() []interface{} { // LFSStoreGetObjectByOIDFunc describes the behavior when the GetObjectByOID // method of the parent MockLFSStore instance is invoked. type LFSStoreGetObjectByOIDFunc struct { - defaultHook func(context.Context, int64, lfsutil.OID) (*db.LFSObject, error) - hooks []func(context.Context, int64, lfsutil.OID) (*db.LFSObject, error) + defaultHook func(context.Context, int64, lfsutil.OID) (*database.LFSObject, error) + hooks []func(context.Context, int64, lfsutil.OID) (*database.LFSObject, error) history []LFSStoreGetObjectByOIDFuncCall mutex sync.Mutex } // GetObjectByOID delegates to the next hook function in the queue and // stores the parameter and result values of this invocation. -func (m *MockLFSStore) GetObjectByOID(v0 context.Context, v1 int64, v2 lfsutil.OID) (*db.LFSObject, error) { +func (m *MockLFSStore) GetObjectByOID(v0 context.Context, v1 int64, v2 lfsutil.OID) (*database.LFSObject, error) { r0, r1 := m.GetObjectByOIDFunc.nextHook()(v0, v1, v2) m.GetObjectByOIDFunc.appendCall(LFSStoreGetObjectByOIDFuncCall{v0, v1, v2, r0, r1}) return r0, r1 @@ -873,7 +873,7 @@ func (m *MockLFSStore) GetObjectByOID(v0 context.Context, v1 int64, v2 lfsutil.O // SetDefaultHook sets function that is called when the GetObjectByOID // method of the parent MockLFSStore instance is invoked and the hook queue // is empty. -func (f *LFSStoreGetObjectByOIDFunc) SetDefaultHook(hook func(context.Context, int64, lfsutil.OID) (*db.LFSObject, error)) { +func (f *LFSStoreGetObjectByOIDFunc) SetDefaultHook(hook func(context.Context, int64, lfsutil.OID) (*database.LFSObject, error)) { f.defaultHook = hook } @@ -881,7 +881,7 @@ func (f *LFSStoreGetObjectByOIDFunc) SetDefaultHook(hook func(context.Context, i // GetObjectByOID method of the parent MockLFSStore instance invokes the // hook at the front of the queue and discards it. After the queue is empty, // the default hook function is invoked for any future action. -func (f *LFSStoreGetObjectByOIDFunc) PushHook(hook func(context.Context, int64, lfsutil.OID) (*db.LFSObject, error)) { +func (f *LFSStoreGetObjectByOIDFunc) PushHook(hook func(context.Context, int64, lfsutil.OID) (*database.LFSObject, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -889,20 +889,20 @@ func (f *LFSStoreGetObjectByOIDFunc) PushHook(hook func(context.Context, int64, // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *LFSStoreGetObjectByOIDFunc) SetDefaultReturn(r0 *db.LFSObject, r1 error) { - f.SetDefaultHook(func(context.Context, int64, lfsutil.OID) (*db.LFSObject, error) { +func (f *LFSStoreGetObjectByOIDFunc) SetDefaultReturn(r0 *database.LFSObject, r1 error) { + f.SetDefaultHook(func(context.Context, int64, lfsutil.OID) (*database.LFSObject, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *LFSStoreGetObjectByOIDFunc) PushReturn(r0 *db.LFSObject, r1 error) { - f.PushHook(func(context.Context, int64, lfsutil.OID) (*db.LFSObject, error) { +func (f *LFSStoreGetObjectByOIDFunc) PushReturn(r0 *database.LFSObject, r1 error) { + f.PushHook(func(context.Context, int64, lfsutil.OID) (*database.LFSObject, error) { return r0, r1 }) } -func (f *LFSStoreGetObjectByOIDFunc) nextHook() func(context.Context, int64, lfsutil.OID) (*db.LFSObject, error) { +func (f *LFSStoreGetObjectByOIDFunc) nextHook() func(context.Context, int64, lfsutil.OID) (*database.LFSObject, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -946,7 +946,7 @@ type LFSStoreGetObjectByOIDFuncCall struct { Arg2 lfsutil.OID // Result0 is the value of the 1st result returned from this method // invocation. - Result0 *db.LFSObject + Result0 *database.LFSObject // Result1 is the value of the 2nd result returned from this method // invocation. Result1 error @@ -967,15 +967,15 @@ func (c LFSStoreGetObjectByOIDFuncCall) Results() []interface{} { // LFSStoreGetObjectsByOIDsFunc describes the behavior when the // GetObjectsByOIDs method of the parent MockLFSStore instance is invoked. type LFSStoreGetObjectsByOIDsFunc struct { - defaultHook func(context.Context, int64, ...lfsutil.OID) ([]*db.LFSObject, error) - hooks []func(context.Context, int64, ...lfsutil.OID) ([]*db.LFSObject, error) + defaultHook func(context.Context, int64, ...lfsutil.OID) ([]*database.LFSObject, error) + hooks []func(context.Context, int64, ...lfsutil.OID) ([]*database.LFSObject, error) history []LFSStoreGetObjectsByOIDsFuncCall mutex sync.Mutex } // GetObjectsByOIDs delegates to the next hook function in the queue and // stores the parameter and result values of this invocation. -func (m *MockLFSStore) GetObjectsByOIDs(v0 context.Context, v1 int64, v2 ...lfsutil.OID) ([]*db.LFSObject, error) { +func (m *MockLFSStore) GetObjectsByOIDs(v0 context.Context, v1 int64, v2 ...lfsutil.OID) ([]*database.LFSObject, error) { r0, r1 := m.GetObjectsByOIDsFunc.nextHook()(v0, v1, v2...) m.GetObjectsByOIDsFunc.appendCall(LFSStoreGetObjectsByOIDsFuncCall{v0, v1, v2, r0, r1}) return r0, r1 @@ -984,7 +984,7 @@ func (m *MockLFSStore) GetObjectsByOIDs(v0 context.Context, v1 int64, v2 ...lfsu // SetDefaultHook sets function that is called when the GetObjectsByOIDs // method of the parent MockLFSStore instance is invoked and the hook queue // is empty. -func (f *LFSStoreGetObjectsByOIDsFunc) SetDefaultHook(hook func(context.Context, int64, ...lfsutil.OID) ([]*db.LFSObject, error)) { +func (f *LFSStoreGetObjectsByOIDsFunc) SetDefaultHook(hook func(context.Context, int64, ...lfsutil.OID) ([]*database.LFSObject, error)) { f.defaultHook = hook } @@ -992,7 +992,7 @@ func (f *LFSStoreGetObjectsByOIDsFunc) SetDefaultHook(hook func(context.Context, // GetObjectsByOIDs method of the parent MockLFSStore instance invokes the // hook at the front of the queue and discards it. After the queue is empty, // the default hook function is invoked for any future action. -func (f *LFSStoreGetObjectsByOIDsFunc) PushHook(hook func(context.Context, int64, ...lfsutil.OID) ([]*db.LFSObject, error)) { +func (f *LFSStoreGetObjectsByOIDsFunc) PushHook(hook func(context.Context, int64, ...lfsutil.OID) ([]*database.LFSObject, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -1000,20 +1000,20 @@ func (f *LFSStoreGetObjectsByOIDsFunc) PushHook(hook func(context.Context, int64 // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *LFSStoreGetObjectsByOIDsFunc) SetDefaultReturn(r0 []*db.LFSObject, r1 error) { - f.SetDefaultHook(func(context.Context, int64, ...lfsutil.OID) ([]*db.LFSObject, error) { +func (f *LFSStoreGetObjectsByOIDsFunc) SetDefaultReturn(r0 []*database.LFSObject, r1 error) { + f.SetDefaultHook(func(context.Context, int64, ...lfsutil.OID) ([]*database.LFSObject, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *LFSStoreGetObjectsByOIDsFunc) PushReturn(r0 []*db.LFSObject, r1 error) { - f.PushHook(func(context.Context, int64, ...lfsutil.OID) ([]*db.LFSObject, error) { +func (f *LFSStoreGetObjectsByOIDsFunc) PushReturn(r0 []*database.LFSObject, r1 error) { + f.PushHook(func(context.Context, int64, ...lfsutil.OID) ([]*database.LFSObject, error) { return r0, r1 }) } -func (f *LFSStoreGetObjectsByOIDsFunc) nextHook() func(context.Context, int64, ...lfsutil.OID) ([]*db.LFSObject, error) { +func (f *LFSStoreGetObjectsByOIDsFunc) nextHook() func(context.Context, int64, ...lfsutil.OID) ([]*database.LFSObject, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -1057,7 +1057,7 @@ type LFSStoreGetObjectsByOIDsFuncCall struct { Arg2 []lfsutil.OID // Result0 is the value of the 1st result returned from this method // invocation. - Result0 []*db.LFSObject + Result0 []*database.LFSObject // Result1 is the value of the 2nd result returned from this method // invocation. Result1 error @@ -1083,7 +1083,7 @@ func (c LFSStoreGetObjectsByOIDsFuncCall) Results() []interface{} { } // MockPermsStore is a mock implementation of the PermsStore interface (from -// the package gogs.io/gogs/internal/db) used for unit testing. +// the package gogs.io/gogs/internal/database) used for unit testing. type MockPermsStore struct { // AccessModeFunc is an instance of a mock function object controlling // the behavior of the method AccessMode. @@ -1101,17 +1101,17 @@ type MockPermsStore struct { func NewMockPermsStore() *MockPermsStore { return &MockPermsStore{ AccessModeFunc: &PermsStoreAccessModeFunc{ - defaultHook: func(context.Context, int64, int64, db.AccessModeOptions) (r0 db.AccessMode) { + defaultHook: func(context.Context, int64, int64, database.AccessModeOptions) (r0 database.AccessMode) { return }, }, AuthorizeFunc: &PermsStoreAuthorizeFunc{ - defaultHook: func(context.Context, int64, int64, db.AccessMode, db.AccessModeOptions) (r0 bool) { + defaultHook: func(context.Context, int64, int64, database.AccessMode, database.AccessModeOptions) (r0 bool) { return }, }, SetRepoPermsFunc: &PermsStoreSetRepoPermsFunc{ - defaultHook: func(context.Context, int64, map[int64]db.AccessMode) (r0 error) { + defaultHook: func(context.Context, int64, map[int64]database.AccessMode) (r0 error) { return }, }, @@ -1123,17 +1123,17 @@ func NewMockPermsStore() *MockPermsStore { func NewStrictMockPermsStore() *MockPermsStore { return &MockPermsStore{ AccessModeFunc: &PermsStoreAccessModeFunc{ - defaultHook: func(context.Context, int64, int64, db.AccessModeOptions) db.AccessMode { + defaultHook: func(context.Context, int64, int64, database.AccessModeOptions) database.AccessMode { panic("unexpected invocation of MockPermsStore.AccessMode") }, }, AuthorizeFunc: &PermsStoreAuthorizeFunc{ - defaultHook: func(context.Context, int64, int64, db.AccessMode, db.AccessModeOptions) bool { + defaultHook: func(context.Context, int64, int64, database.AccessMode, database.AccessModeOptions) bool { panic("unexpected invocation of MockPermsStore.Authorize") }, }, SetRepoPermsFunc: &PermsStoreSetRepoPermsFunc{ - defaultHook: func(context.Context, int64, map[int64]db.AccessMode) error { + defaultHook: func(context.Context, int64, map[int64]database.AccessMode) error { panic("unexpected invocation of MockPermsStore.SetRepoPerms") }, }, @@ -1142,7 +1142,7 @@ func NewStrictMockPermsStore() *MockPermsStore { // NewMockPermsStoreFrom creates a new mock of the MockPermsStore interface. // All methods delegate to the given implementation, unless overwritten. -func NewMockPermsStoreFrom(i db.PermsStore) *MockPermsStore { +func NewMockPermsStoreFrom(i database.PermsStore) *MockPermsStore { return &MockPermsStore{ AccessModeFunc: &PermsStoreAccessModeFunc{ defaultHook: i.AccessMode, @@ -1159,15 +1159,15 @@ func NewMockPermsStoreFrom(i db.PermsStore) *MockPermsStore { // PermsStoreAccessModeFunc describes the behavior when the AccessMode // method of the parent MockPermsStore instance is invoked. type PermsStoreAccessModeFunc struct { - defaultHook func(context.Context, int64, int64, db.AccessModeOptions) db.AccessMode - hooks []func(context.Context, int64, int64, db.AccessModeOptions) db.AccessMode + defaultHook func(context.Context, int64, int64, database.AccessModeOptions) database.AccessMode + hooks []func(context.Context, int64, int64, database.AccessModeOptions) database.AccessMode history []PermsStoreAccessModeFuncCall mutex sync.Mutex } // AccessMode delegates to the next hook function in the queue and stores // the parameter and result values of this invocation. -func (m *MockPermsStore) AccessMode(v0 context.Context, v1 int64, v2 int64, v3 db.AccessModeOptions) db.AccessMode { +func (m *MockPermsStore) AccessMode(v0 context.Context, v1 int64, v2 int64, v3 database.AccessModeOptions) database.AccessMode { r0 := m.AccessModeFunc.nextHook()(v0, v1, v2, v3) m.AccessModeFunc.appendCall(PermsStoreAccessModeFuncCall{v0, v1, v2, v3, r0}) return r0 @@ -1176,7 +1176,7 @@ func (m *MockPermsStore) AccessMode(v0 context.Context, v1 int64, v2 int64, v3 d // SetDefaultHook sets function that is called when the AccessMode method of // the parent MockPermsStore instance is invoked and the hook queue is // empty. -func (f *PermsStoreAccessModeFunc) SetDefaultHook(hook func(context.Context, int64, int64, db.AccessModeOptions) db.AccessMode) { +func (f *PermsStoreAccessModeFunc) SetDefaultHook(hook func(context.Context, int64, int64, database.AccessModeOptions) database.AccessMode) { f.defaultHook = hook } @@ -1184,7 +1184,7 @@ func (f *PermsStoreAccessModeFunc) SetDefaultHook(hook func(context.Context, int // AccessMode method of the parent MockPermsStore instance invokes the hook // at the front of the queue and discards it. After the queue is empty, the // default hook function is invoked for any future action. -func (f *PermsStoreAccessModeFunc) PushHook(hook func(context.Context, int64, int64, db.AccessModeOptions) db.AccessMode) { +func (f *PermsStoreAccessModeFunc) PushHook(hook func(context.Context, int64, int64, database.AccessModeOptions) database.AccessMode) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -1192,20 +1192,20 @@ func (f *PermsStoreAccessModeFunc) PushHook(hook func(context.Context, int64, in // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *PermsStoreAccessModeFunc) SetDefaultReturn(r0 db.AccessMode) { - f.SetDefaultHook(func(context.Context, int64, int64, db.AccessModeOptions) db.AccessMode { +func (f *PermsStoreAccessModeFunc) SetDefaultReturn(r0 database.AccessMode) { + f.SetDefaultHook(func(context.Context, int64, int64, database.AccessModeOptions) database.AccessMode { return r0 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *PermsStoreAccessModeFunc) PushReturn(r0 db.AccessMode) { - f.PushHook(func(context.Context, int64, int64, db.AccessModeOptions) db.AccessMode { +func (f *PermsStoreAccessModeFunc) PushReturn(r0 database.AccessMode) { + f.PushHook(func(context.Context, int64, int64, database.AccessModeOptions) database.AccessMode { return r0 }) } -func (f *PermsStoreAccessModeFunc) nextHook() func(context.Context, int64, int64, db.AccessModeOptions) db.AccessMode { +func (f *PermsStoreAccessModeFunc) nextHook() func(context.Context, int64, int64, database.AccessModeOptions) database.AccessMode { f.mutex.Lock() defer f.mutex.Unlock() @@ -1249,10 +1249,10 @@ type PermsStoreAccessModeFuncCall struct { Arg2 int64 // Arg3 is the value of the 4th argument passed to this method // invocation. - Arg3 db.AccessModeOptions + Arg3 database.AccessModeOptions // Result0 is the value of the 1st result returned from this method // invocation. - Result0 db.AccessMode + Result0 database.AccessMode } // Args returns an interface slice containing the arguments of this @@ -1270,15 +1270,15 @@ func (c PermsStoreAccessModeFuncCall) Results() []interface{} { // PermsStoreAuthorizeFunc describes the behavior when the Authorize method // of the parent MockPermsStore instance is invoked. type PermsStoreAuthorizeFunc struct { - defaultHook func(context.Context, int64, int64, db.AccessMode, db.AccessModeOptions) bool - hooks []func(context.Context, int64, int64, db.AccessMode, db.AccessModeOptions) bool + defaultHook func(context.Context, int64, int64, database.AccessMode, database.AccessModeOptions) bool + hooks []func(context.Context, int64, int64, database.AccessMode, database.AccessModeOptions) bool history []PermsStoreAuthorizeFuncCall mutex sync.Mutex } // Authorize delegates to the next hook function in the queue and stores the // parameter and result values of this invocation. -func (m *MockPermsStore) Authorize(v0 context.Context, v1 int64, v2 int64, v3 db.AccessMode, v4 db.AccessModeOptions) bool { +func (m *MockPermsStore) Authorize(v0 context.Context, v1 int64, v2 int64, v3 database.AccessMode, v4 database.AccessModeOptions) bool { r0 := m.AuthorizeFunc.nextHook()(v0, v1, v2, v3, v4) m.AuthorizeFunc.appendCall(PermsStoreAuthorizeFuncCall{v0, v1, v2, v3, v4, r0}) return r0 @@ -1287,7 +1287,7 @@ func (m *MockPermsStore) Authorize(v0 context.Context, v1 int64, v2 int64, v3 db // SetDefaultHook sets function that is called when the Authorize method of // the parent MockPermsStore instance is invoked and the hook queue is // empty. -func (f *PermsStoreAuthorizeFunc) SetDefaultHook(hook func(context.Context, int64, int64, db.AccessMode, db.AccessModeOptions) bool) { +func (f *PermsStoreAuthorizeFunc) SetDefaultHook(hook func(context.Context, int64, int64, database.AccessMode, database.AccessModeOptions) bool) { f.defaultHook = hook } @@ -1295,7 +1295,7 @@ func (f *PermsStoreAuthorizeFunc) SetDefaultHook(hook func(context.Context, int6 // Authorize method of the parent MockPermsStore instance invokes the hook // at the front of the queue and discards it. After the queue is empty, the // default hook function is invoked for any future action. -func (f *PermsStoreAuthorizeFunc) PushHook(hook func(context.Context, int64, int64, db.AccessMode, db.AccessModeOptions) bool) { +func (f *PermsStoreAuthorizeFunc) PushHook(hook func(context.Context, int64, int64, database.AccessMode, database.AccessModeOptions) bool) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -1304,19 +1304,19 @@ func (f *PermsStoreAuthorizeFunc) PushHook(hook func(context.Context, int64, int // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. func (f *PermsStoreAuthorizeFunc) SetDefaultReturn(r0 bool) { - f.SetDefaultHook(func(context.Context, int64, int64, db.AccessMode, db.AccessModeOptions) bool { + f.SetDefaultHook(func(context.Context, int64, int64, database.AccessMode, database.AccessModeOptions) bool { return r0 }) } // PushReturn calls PushHook with a function that returns the given values. func (f *PermsStoreAuthorizeFunc) PushReturn(r0 bool) { - f.PushHook(func(context.Context, int64, int64, db.AccessMode, db.AccessModeOptions) bool { + f.PushHook(func(context.Context, int64, int64, database.AccessMode, database.AccessModeOptions) bool { return r0 }) } -func (f *PermsStoreAuthorizeFunc) nextHook() func(context.Context, int64, int64, db.AccessMode, db.AccessModeOptions) bool { +func (f *PermsStoreAuthorizeFunc) nextHook() func(context.Context, int64, int64, database.AccessMode, database.AccessModeOptions) bool { f.mutex.Lock() defer f.mutex.Unlock() @@ -1360,10 +1360,10 @@ type PermsStoreAuthorizeFuncCall struct { Arg2 int64 // Arg3 is the value of the 4th argument passed to this method // invocation. - Arg3 db.AccessMode + Arg3 database.AccessMode // Arg4 is the value of the 5th argument passed to this method // invocation. - Arg4 db.AccessModeOptions + Arg4 database.AccessModeOptions // Result0 is the value of the 1st result returned from this method // invocation. Result0 bool @@ -1384,15 +1384,15 @@ func (c PermsStoreAuthorizeFuncCall) Results() []interface{} { // PermsStoreSetRepoPermsFunc describes the behavior when the SetRepoPerms // method of the parent MockPermsStore instance is invoked. type PermsStoreSetRepoPermsFunc struct { - defaultHook func(context.Context, int64, map[int64]db.AccessMode) error - hooks []func(context.Context, int64, map[int64]db.AccessMode) error + defaultHook func(context.Context, int64, map[int64]database.AccessMode) error + hooks []func(context.Context, int64, map[int64]database.AccessMode) error history []PermsStoreSetRepoPermsFuncCall mutex sync.Mutex } // SetRepoPerms delegates to the next hook function in the queue and stores // the parameter and result values of this invocation. -func (m *MockPermsStore) SetRepoPerms(v0 context.Context, v1 int64, v2 map[int64]db.AccessMode) error { +func (m *MockPermsStore) SetRepoPerms(v0 context.Context, v1 int64, v2 map[int64]database.AccessMode) error { r0 := m.SetRepoPermsFunc.nextHook()(v0, v1, v2) m.SetRepoPermsFunc.appendCall(PermsStoreSetRepoPermsFuncCall{v0, v1, v2, r0}) return r0 @@ -1401,7 +1401,7 @@ func (m *MockPermsStore) SetRepoPerms(v0 context.Context, v1 int64, v2 map[int64 // SetDefaultHook sets function that is called when the SetRepoPerms method // of the parent MockPermsStore instance is invoked and the hook queue is // empty. -func (f *PermsStoreSetRepoPermsFunc) SetDefaultHook(hook func(context.Context, int64, map[int64]db.AccessMode) error) { +func (f *PermsStoreSetRepoPermsFunc) SetDefaultHook(hook func(context.Context, int64, map[int64]database.AccessMode) error) { f.defaultHook = hook } @@ -1409,7 +1409,7 @@ func (f *PermsStoreSetRepoPermsFunc) SetDefaultHook(hook func(context.Context, i // SetRepoPerms method of the parent MockPermsStore instance invokes the // hook at the front of the queue and discards it. After the queue is empty, // the default hook function is invoked for any future action. -func (f *PermsStoreSetRepoPermsFunc) PushHook(hook func(context.Context, int64, map[int64]db.AccessMode) error) { +func (f *PermsStoreSetRepoPermsFunc) PushHook(hook func(context.Context, int64, map[int64]database.AccessMode) error) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -1418,19 +1418,19 @@ func (f *PermsStoreSetRepoPermsFunc) PushHook(hook func(context.Context, int64, // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. func (f *PermsStoreSetRepoPermsFunc) SetDefaultReturn(r0 error) { - f.SetDefaultHook(func(context.Context, int64, map[int64]db.AccessMode) error { + f.SetDefaultHook(func(context.Context, int64, map[int64]database.AccessMode) error { return r0 }) } // PushReturn calls PushHook with a function that returns the given values. func (f *PermsStoreSetRepoPermsFunc) PushReturn(r0 error) { - f.PushHook(func(context.Context, int64, map[int64]db.AccessMode) error { + f.PushHook(func(context.Context, int64, map[int64]database.AccessMode) error { return r0 }) } -func (f *PermsStoreSetRepoPermsFunc) nextHook() func(context.Context, int64, map[int64]db.AccessMode) error { +func (f *PermsStoreSetRepoPermsFunc) nextHook() func(context.Context, int64, map[int64]database.AccessMode) error { f.mutex.Lock() defer f.mutex.Unlock() @@ -1471,7 +1471,7 @@ type PermsStoreSetRepoPermsFuncCall struct { Arg1 int64 // Arg2 is the value of the 3rd argument passed to this method // invocation. - Arg2 map[int64]db.AccessMode + Arg2 map[int64]database.AccessMode // Result0 is the value of the 1st result returned from this method // invocation. Result0 error @@ -1490,7 +1490,7 @@ func (c PermsStoreSetRepoPermsFuncCall) Results() []interface{} { } // MockReposStore is a mock implementation of the ReposStore interface (from -// the package gogs.io/gogs/internal/db) used for unit testing. +// the package gogs.io/gogs/internal/database) used for unit testing. type MockReposStore struct { // CreateFunc is an instance of a mock function object controlling the // behavior of the method Create. @@ -1530,27 +1530,27 @@ type MockReposStore struct { func NewMockReposStore() *MockReposStore { return &MockReposStore{ CreateFunc: &ReposStoreCreateFunc{ - defaultHook: func(context.Context, int64, db.CreateRepoOptions) (r0 *db.Repository, r1 error) { + defaultHook: func(context.Context, int64, database.CreateRepoOptions) (r0 *database.Repository, r1 error) { return }, }, GetByCollaboratorIDFunc: &ReposStoreGetByCollaboratorIDFunc{ - defaultHook: func(context.Context, int64, int, string) (r0 []*db.Repository, r1 error) { + defaultHook: func(context.Context, int64, int, string) (r0 []*database.Repository, r1 error) { return }, }, GetByCollaboratorIDWithAccessModeFunc: &ReposStoreGetByCollaboratorIDWithAccessModeFunc{ - defaultHook: func(context.Context, int64) (r0 map[*db.Repository]db.AccessMode, r1 error) { + defaultHook: func(context.Context, int64) (r0 map[*database.Repository]database.AccessMode, r1 error) { return }, }, GetByIDFunc: &ReposStoreGetByIDFunc{ - defaultHook: func(context.Context, int64) (r0 *db.Repository, r1 error) { + defaultHook: func(context.Context, int64) (r0 *database.Repository, r1 error) { return }, }, GetByNameFunc: &ReposStoreGetByNameFunc{ - defaultHook: func(context.Context, int64, string) (r0 *db.Repository, r1 error) { + defaultHook: func(context.Context, int64, string) (r0 *database.Repository, r1 error) { return }, }, @@ -1560,7 +1560,7 @@ func NewMockReposStore() *MockReposStore { }, }, ListWatchesFunc: &ReposStoreListWatchesFunc{ - defaultHook: func(context.Context, int64) (r0 []*db.Watch, r1 error) { + defaultHook: func(context.Context, int64) (r0 []*database.Watch, r1 error) { return }, }, @@ -1587,27 +1587,27 @@ func NewMockReposStore() *MockReposStore { func NewStrictMockReposStore() *MockReposStore { return &MockReposStore{ CreateFunc: &ReposStoreCreateFunc{ - defaultHook: func(context.Context, int64, db.CreateRepoOptions) (*db.Repository, error) { + defaultHook: func(context.Context, int64, database.CreateRepoOptions) (*database.Repository, error) { panic("unexpected invocation of MockReposStore.Create") }, }, GetByCollaboratorIDFunc: &ReposStoreGetByCollaboratorIDFunc{ - defaultHook: func(context.Context, int64, int, string) ([]*db.Repository, error) { + defaultHook: func(context.Context, int64, int, string) ([]*database.Repository, error) { panic("unexpected invocation of MockReposStore.GetByCollaboratorID") }, }, GetByCollaboratorIDWithAccessModeFunc: &ReposStoreGetByCollaboratorIDWithAccessModeFunc{ - defaultHook: func(context.Context, int64) (map[*db.Repository]db.AccessMode, error) { + defaultHook: func(context.Context, int64) (map[*database.Repository]database.AccessMode, error) { panic("unexpected invocation of MockReposStore.GetByCollaboratorIDWithAccessMode") }, }, GetByIDFunc: &ReposStoreGetByIDFunc{ - defaultHook: func(context.Context, int64) (*db.Repository, error) { + defaultHook: func(context.Context, int64) (*database.Repository, error) { panic("unexpected invocation of MockReposStore.GetByID") }, }, GetByNameFunc: &ReposStoreGetByNameFunc{ - defaultHook: func(context.Context, int64, string) (*db.Repository, error) { + defaultHook: func(context.Context, int64, string) (*database.Repository, error) { panic("unexpected invocation of MockReposStore.GetByName") }, }, @@ -1617,7 +1617,7 @@ func NewStrictMockReposStore() *MockReposStore { }, }, ListWatchesFunc: &ReposStoreListWatchesFunc{ - defaultHook: func(context.Context, int64) ([]*db.Watch, error) { + defaultHook: func(context.Context, int64) ([]*database.Watch, error) { panic("unexpected invocation of MockReposStore.ListWatches") }, }, @@ -1641,7 +1641,7 @@ func NewStrictMockReposStore() *MockReposStore { // NewMockReposStoreFrom creates a new mock of the MockReposStore interface. // All methods delegate to the given implementation, unless overwritten. -func NewMockReposStoreFrom(i db.ReposStore) *MockReposStore { +func NewMockReposStoreFrom(i database.ReposStore) *MockReposStore { return &MockReposStore{ CreateFunc: &ReposStoreCreateFunc{ defaultHook: i.Create, @@ -1679,15 +1679,15 @@ func NewMockReposStoreFrom(i db.ReposStore) *MockReposStore { // ReposStoreCreateFunc describes the behavior when the Create method of the // parent MockReposStore instance is invoked. type ReposStoreCreateFunc struct { - defaultHook func(context.Context, int64, db.CreateRepoOptions) (*db.Repository, error) - hooks []func(context.Context, int64, db.CreateRepoOptions) (*db.Repository, error) + defaultHook func(context.Context, int64, database.CreateRepoOptions) (*database.Repository, error) + hooks []func(context.Context, int64, database.CreateRepoOptions) (*database.Repository, error) history []ReposStoreCreateFuncCall mutex sync.Mutex } // Create delegates to the next hook function in the queue and stores the // parameter and result values of this invocation. -func (m *MockReposStore) Create(v0 context.Context, v1 int64, v2 db.CreateRepoOptions) (*db.Repository, error) { +func (m *MockReposStore) Create(v0 context.Context, v1 int64, v2 database.CreateRepoOptions) (*database.Repository, error) { r0, r1 := m.CreateFunc.nextHook()(v0, v1, v2) m.CreateFunc.appendCall(ReposStoreCreateFuncCall{v0, v1, v2, r0, r1}) return r0, r1 @@ -1695,7 +1695,7 @@ func (m *MockReposStore) Create(v0 context.Context, v1 int64, v2 db.CreateRepoOp // SetDefaultHook sets function that is called when the Create method of the // parent MockReposStore instance is invoked and the hook queue is empty. -func (f *ReposStoreCreateFunc) SetDefaultHook(hook func(context.Context, int64, db.CreateRepoOptions) (*db.Repository, error)) { +func (f *ReposStoreCreateFunc) SetDefaultHook(hook func(context.Context, int64, database.CreateRepoOptions) (*database.Repository, error)) { f.defaultHook = hook } @@ -1703,7 +1703,7 @@ func (f *ReposStoreCreateFunc) SetDefaultHook(hook func(context.Context, int64, // Create method of the parent MockReposStore instance invokes the hook at // the front of the queue and discards it. After the queue is empty, the // default hook function is invoked for any future action. -func (f *ReposStoreCreateFunc) PushHook(hook func(context.Context, int64, db.CreateRepoOptions) (*db.Repository, error)) { +func (f *ReposStoreCreateFunc) PushHook(hook func(context.Context, int64, database.CreateRepoOptions) (*database.Repository, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -1711,20 +1711,20 @@ func (f *ReposStoreCreateFunc) PushHook(hook func(context.Context, int64, db.Cre // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *ReposStoreCreateFunc) SetDefaultReturn(r0 *db.Repository, r1 error) { - f.SetDefaultHook(func(context.Context, int64, db.CreateRepoOptions) (*db.Repository, error) { +func (f *ReposStoreCreateFunc) SetDefaultReturn(r0 *database.Repository, r1 error) { + f.SetDefaultHook(func(context.Context, int64, database.CreateRepoOptions) (*database.Repository, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *ReposStoreCreateFunc) PushReturn(r0 *db.Repository, r1 error) { - f.PushHook(func(context.Context, int64, db.CreateRepoOptions) (*db.Repository, error) { +func (f *ReposStoreCreateFunc) PushReturn(r0 *database.Repository, r1 error) { + f.PushHook(func(context.Context, int64, database.CreateRepoOptions) (*database.Repository, error) { return r0, r1 }) } -func (f *ReposStoreCreateFunc) nextHook() func(context.Context, int64, db.CreateRepoOptions) (*db.Repository, error) { +func (f *ReposStoreCreateFunc) nextHook() func(context.Context, int64, database.CreateRepoOptions) (*database.Repository, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -1765,10 +1765,10 @@ type ReposStoreCreateFuncCall struct { Arg1 int64 // Arg2 is the value of the 3rd argument passed to this method // invocation. - Arg2 db.CreateRepoOptions + Arg2 database.CreateRepoOptions // Result0 is the value of the 1st result returned from this method // invocation. - Result0 *db.Repository + Result0 *database.Repository // Result1 is the value of the 2nd result returned from this method // invocation. Result1 error @@ -1790,15 +1790,15 @@ func (c ReposStoreCreateFuncCall) Results() []interface{} { // GetByCollaboratorID method of the parent MockReposStore instance is // invoked. type ReposStoreGetByCollaboratorIDFunc struct { - defaultHook func(context.Context, int64, int, string) ([]*db.Repository, error) - hooks []func(context.Context, int64, int, string) ([]*db.Repository, error) + defaultHook func(context.Context, int64, int, string) ([]*database.Repository, error) + hooks []func(context.Context, int64, int, string) ([]*database.Repository, error) history []ReposStoreGetByCollaboratorIDFuncCall mutex sync.Mutex } // GetByCollaboratorID delegates to the next hook function in the queue and // stores the parameter and result values of this invocation. -func (m *MockReposStore) GetByCollaboratorID(v0 context.Context, v1 int64, v2 int, v3 string) ([]*db.Repository, error) { +func (m *MockReposStore) GetByCollaboratorID(v0 context.Context, v1 int64, v2 int, v3 string) ([]*database.Repository, error) { r0, r1 := m.GetByCollaboratorIDFunc.nextHook()(v0, v1, v2, v3) m.GetByCollaboratorIDFunc.appendCall(ReposStoreGetByCollaboratorIDFuncCall{v0, v1, v2, v3, r0, r1}) return r0, r1 @@ -1807,7 +1807,7 @@ func (m *MockReposStore) GetByCollaboratorID(v0 context.Context, v1 int64, v2 in // SetDefaultHook sets function that is called when the GetByCollaboratorID // method of the parent MockReposStore instance is invoked and the hook // queue is empty. -func (f *ReposStoreGetByCollaboratorIDFunc) SetDefaultHook(hook func(context.Context, int64, int, string) ([]*db.Repository, error)) { +func (f *ReposStoreGetByCollaboratorIDFunc) SetDefaultHook(hook func(context.Context, int64, int, string) ([]*database.Repository, error)) { f.defaultHook = hook } @@ -1815,7 +1815,7 @@ func (f *ReposStoreGetByCollaboratorIDFunc) SetDefaultHook(hook func(context.Con // GetByCollaboratorID method of the parent MockReposStore instance invokes // the hook at the front of the queue and discards it. After the queue is // empty, the default hook function is invoked for any future action. -func (f *ReposStoreGetByCollaboratorIDFunc) PushHook(hook func(context.Context, int64, int, string) ([]*db.Repository, error)) { +func (f *ReposStoreGetByCollaboratorIDFunc) PushHook(hook func(context.Context, int64, int, string) ([]*database.Repository, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -1823,20 +1823,20 @@ func (f *ReposStoreGetByCollaboratorIDFunc) PushHook(hook func(context.Context, // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *ReposStoreGetByCollaboratorIDFunc) SetDefaultReturn(r0 []*db.Repository, r1 error) { - f.SetDefaultHook(func(context.Context, int64, int, string) ([]*db.Repository, error) { +func (f *ReposStoreGetByCollaboratorIDFunc) SetDefaultReturn(r0 []*database.Repository, r1 error) { + f.SetDefaultHook(func(context.Context, int64, int, string) ([]*database.Repository, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *ReposStoreGetByCollaboratorIDFunc) PushReturn(r0 []*db.Repository, r1 error) { - f.PushHook(func(context.Context, int64, int, string) ([]*db.Repository, error) { +func (f *ReposStoreGetByCollaboratorIDFunc) PushReturn(r0 []*database.Repository, r1 error) { + f.PushHook(func(context.Context, int64, int, string) ([]*database.Repository, error) { return r0, r1 }) } -func (f *ReposStoreGetByCollaboratorIDFunc) nextHook() func(context.Context, int64, int, string) ([]*db.Repository, error) { +func (f *ReposStoreGetByCollaboratorIDFunc) nextHook() func(context.Context, int64, int, string) ([]*database.Repository, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -1884,7 +1884,7 @@ type ReposStoreGetByCollaboratorIDFuncCall struct { Arg3 string // Result0 is the value of the 1st result returned from this method // invocation. - Result0 []*db.Repository + Result0 []*database.Repository // Result1 is the value of the 2nd result returned from this method // invocation. Result1 error @@ -1906,15 +1906,15 @@ func (c ReposStoreGetByCollaboratorIDFuncCall) Results() []interface{} { // when the GetByCollaboratorIDWithAccessMode method of the parent // MockReposStore instance is invoked. type ReposStoreGetByCollaboratorIDWithAccessModeFunc struct { - defaultHook func(context.Context, int64) (map[*db.Repository]db.AccessMode, error) - hooks []func(context.Context, int64) (map[*db.Repository]db.AccessMode, error) + defaultHook func(context.Context, int64) (map[*database.Repository]database.AccessMode, error) + hooks []func(context.Context, int64) (map[*database.Repository]database.AccessMode, error) history []ReposStoreGetByCollaboratorIDWithAccessModeFuncCall mutex sync.Mutex } // GetByCollaboratorIDWithAccessMode delegates to the next hook function in // the queue and stores the parameter and result values of this invocation. -func (m *MockReposStore) GetByCollaboratorIDWithAccessMode(v0 context.Context, v1 int64) (map[*db.Repository]db.AccessMode, error) { +func (m *MockReposStore) GetByCollaboratorIDWithAccessMode(v0 context.Context, v1 int64) (map[*database.Repository]database.AccessMode, error) { r0, r1 := m.GetByCollaboratorIDWithAccessModeFunc.nextHook()(v0, v1) m.GetByCollaboratorIDWithAccessModeFunc.appendCall(ReposStoreGetByCollaboratorIDWithAccessModeFuncCall{v0, v1, r0, r1}) return r0, r1 @@ -1923,7 +1923,7 @@ func (m *MockReposStore) GetByCollaboratorIDWithAccessMode(v0 context.Context, v // SetDefaultHook sets function that is called when the // GetByCollaboratorIDWithAccessMode method of the parent MockReposStore // instance is invoked and the hook queue is empty. -func (f *ReposStoreGetByCollaboratorIDWithAccessModeFunc) SetDefaultHook(hook func(context.Context, int64) (map[*db.Repository]db.AccessMode, error)) { +func (f *ReposStoreGetByCollaboratorIDWithAccessModeFunc) SetDefaultHook(hook func(context.Context, int64) (map[*database.Repository]database.AccessMode, error)) { f.defaultHook = hook } @@ -1932,7 +1932,7 @@ func (f *ReposStoreGetByCollaboratorIDWithAccessModeFunc) SetDefaultHook(hook fu // instance invokes the hook at the front of the queue and discards it. // After the queue is empty, the default hook function is invoked for any // future action. -func (f *ReposStoreGetByCollaboratorIDWithAccessModeFunc) PushHook(hook func(context.Context, int64) (map[*db.Repository]db.AccessMode, error)) { +func (f *ReposStoreGetByCollaboratorIDWithAccessModeFunc) PushHook(hook func(context.Context, int64) (map[*database.Repository]database.AccessMode, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -1940,20 +1940,20 @@ func (f *ReposStoreGetByCollaboratorIDWithAccessModeFunc) PushHook(hook func(con // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *ReposStoreGetByCollaboratorIDWithAccessModeFunc) SetDefaultReturn(r0 map[*db.Repository]db.AccessMode, r1 error) { - f.SetDefaultHook(func(context.Context, int64) (map[*db.Repository]db.AccessMode, error) { +func (f *ReposStoreGetByCollaboratorIDWithAccessModeFunc) SetDefaultReturn(r0 map[*database.Repository]database.AccessMode, r1 error) { + f.SetDefaultHook(func(context.Context, int64) (map[*database.Repository]database.AccessMode, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *ReposStoreGetByCollaboratorIDWithAccessModeFunc) PushReturn(r0 map[*db.Repository]db.AccessMode, r1 error) { - f.PushHook(func(context.Context, int64) (map[*db.Repository]db.AccessMode, error) { +func (f *ReposStoreGetByCollaboratorIDWithAccessModeFunc) PushReturn(r0 map[*database.Repository]database.AccessMode, r1 error) { + f.PushHook(func(context.Context, int64) (map[*database.Repository]database.AccessMode, error) { return r0, r1 }) } -func (f *ReposStoreGetByCollaboratorIDWithAccessModeFunc) nextHook() func(context.Context, int64) (map[*db.Repository]db.AccessMode, error) { +func (f *ReposStoreGetByCollaboratorIDWithAccessModeFunc) nextHook() func(context.Context, int64) (map[*database.Repository]database.AccessMode, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -1996,7 +1996,7 @@ type ReposStoreGetByCollaboratorIDWithAccessModeFuncCall struct { Arg1 int64 // Result0 is the value of the 1st result returned from this method // invocation. - Result0 map[*db.Repository]db.AccessMode + Result0 map[*database.Repository]database.AccessMode // Result1 is the value of the 2nd result returned from this method // invocation. Result1 error @@ -2017,15 +2017,15 @@ func (c ReposStoreGetByCollaboratorIDWithAccessModeFuncCall) Results() []interfa // ReposStoreGetByIDFunc describes the behavior when the GetByID method of // the parent MockReposStore instance is invoked. type ReposStoreGetByIDFunc struct { - defaultHook func(context.Context, int64) (*db.Repository, error) - hooks []func(context.Context, int64) (*db.Repository, error) + defaultHook func(context.Context, int64) (*database.Repository, error) + hooks []func(context.Context, int64) (*database.Repository, error) history []ReposStoreGetByIDFuncCall mutex sync.Mutex } // GetByID delegates to the next hook function in the queue and stores the // parameter and result values of this invocation. -func (m *MockReposStore) GetByID(v0 context.Context, v1 int64) (*db.Repository, error) { +func (m *MockReposStore) GetByID(v0 context.Context, v1 int64) (*database.Repository, error) { r0, r1 := m.GetByIDFunc.nextHook()(v0, v1) m.GetByIDFunc.appendCall(ReposStoreGetByIDFuncCall{v0, v1, r0, r1}) return r0, r1 @@ -2034,7 +2034,7 @@ func (m *MockReposStore) GetByID(v0 context.Context, v1 int64) (*db.Repository, // SetDefaultHook sets function that is called when the GetByID method of // the parent MockReposStore instance is invoked and the hook queue is // empty. -func (f *ReposStoreGetByIDFunc) SetDefaultHook(hook func(context.Context, int64) (*db.Repository, error)) { +func (f *ReposStoreGetByIDFunc) SetDefaultHook(hook func(context.Context, int64) (*database.Repository, error)) { f.defaultHook = hook } @@ -2042,7 +2042,7 @@ func (f *ReposStoreGetByIDFunc) SetDefaultHook(hook func(context.Context, int64) // GetByID method of the parent MockReposStore instance invokes the hook at // the front of the queue and discards it. After the queue is empty, the // default hook function is invoked for any future action. -func (f *ReposStoreGetByIDFunc) PushHook(hook func(context.Context, int64) (*db.Repository, error)) { +func (f *ReposStoreGetByIDFunc) PushHook(hook func(context.Context, int64) (*database.Repository, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -2050,20 +2050,20 @@ func (f *ReposStoreGetByIDFunc) PushHook(hook func(context.Context, int64) (*db. // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *ReposStoreGetByIDFunc) SetDefaultReturn(r0 *db.Repository, r1 error) { - f.SetDefaultHook(func(context.Context, int64) (*db.Repository, error) { +func (f *ReposStoreGetByIDFunc) SetDefaultReturn(r0 *database.Repository, r1 error) { + f.SetDefaultHook(func(context.Context, int64) (*database.Repository, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *ReposStoreGetByIDFunc) PushReturn(r0 *db.Repository, r1 error) { - f.PushHook(func(context.Context, int64) (*db.Repository, error) { +func (f *ReposStoreGetByIDFunc) PushReturn(r0 *database.Repository, r1 error) { + f.PushHook(func(context.Context, int64) (*database.Repository, error) { return r0, r1 }) } -func (f *ReposStoreGetByIDFunc) nextHook() func(context.Context, int64) (*db.Repository, error) { +func (f *ReposStoreGetByIDFunc) nextHook() func(context.Context, int64) (*database.Repository, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -2104,7 +2104,7 @@ type ReposStoreGetByIDFuncCall struct { Arg1 int64 // Result0 is the value of the 1st result returned from this method // invocation. - Result0 *db.Repository + Result0 *database.Repository // Result1 is the value of the 2nd result returned from this method // invocation. Result1 error @@ -2125,15 +2125,15 @@ func (c ReposStoreGetByIDFuncCall) Results() []interface{} { // ReposStoreGetByNameFunc describes the behavior when the GetByName method // of the parent MockReposStore instance is invoked. type ReposStoreGetByNameFunc struct { - defaultHook func(context.Context, int64, string) (*db.Repository, error) - hooks []func(context.Context, int64, string) (*db.Repository, error) + defaultHook func(context.Context, int64, string) (*database.Repository, error) + hooks []func(context.Context, int64, string) (*database.Repository, error) history []ReposStoreGetByNameFuncCall mutex sync.Mutex } // GetByName delegates to the next hook function in the queue and stores the // parameter and result values of this invocation. -func (m *MockReposStore) GetByName(v0 context.Context, v1 int64, v2 string) (*db.Repository, error) { +func (m *MockReposStore) GetByName(v0 context.Context, v1 int64, v2 string) (*database.Repository, error) { r0, r1 := m.GetByNameFunc.nextHook()(v0, v1, v2) m.GetByNameFunc.appendCall(ReposStoreGetByNameFuncCall{v0, v1, v2, r0, r1}) return r0, r1 @@ -2142,7 +2142,7 @@ func (m *MockReposStore) GetByName(v0 context.Context, v1 int64, v2 string) (*db // SetDefaultHook sets function that is called when the GetByName method of // the parent MockReposStore instance is invoked and the hook queue is // empty. -func (f *ReposStoreGetByNameFunc) SetDefaultHook(hook func(context.Context, int64, string) (*db.Repository, error)) { +func (f *ReposStoreGetByNameFunc) SetDefaultHook(hook func(context.Context, int64, string) (*database.Repository, error)) { f.defaultHook = hook } @@ -2150,7 +2150,7 @@ func (f *ReposStoreGetByNameFunc) SetDefaultHook(hook func(context.Context, int6 // GetByName method of the parent MockReposStore instance invokes the hook // at the front of the queue and discards it. After the queue is empty, the // default hook function is invoked for any future action. -func (f *ReposStoreGetByNameFunc) PushHook(hook func(context.Context, int64, string) (*db.Repository, error)) { +func (f *ReposStoreGetByNameFunc) PushHook(hook func(context.Context, int64, string) (*database.Repository, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -2158,20 +2158,20 @@ func (f *ReposStoreGetByNameFunc) PushHook(hook func(context.Context, int64, str // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *ReposStoreGetByNameFunc) SetDefaultReturn(r0 *db.Repository, r1 error) { - f.SetDefaultHook(func(context.Context, int64, string) (*db.Repository, error) { +func (f *ReposStoreGetByNameFunc) SetDefaultReturn(r0 *database.Repository, r1 error) { + f.SetDefaultHook(func(context.Context, int64, string) (*database.Repository, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *ReposStoreGetByNameFunc) PushReturn(r0 *db.Repository, r1 error) { - f.PushHook(func(context.Context, int64, string) (*db.Repository, error) { +func (f *ReposStoreGetByNameFunc) PushReturn(r0 *database.Repository, r1 error) { + f.PushHook(func(context.Context, int64, string) (*database.Repository, error) { return r0, r1 }) } -func (f *ReposStoreGetByNameFunc) nextHook() func(context.Context, int64, string) (*db.Repository, error) { +func (f *ReposStoreGetByNameFunc) nextHook() func(context.Context, int64, string) (*database.Repository, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -2215,7 +2215,7 @@ type ReposStoreGetByNameFuncCall struct { Arg2 string // Result0 is the value of the 1st result returned from this method // invocation. - Result0 *db.Repository + Result0 *database.Repository // Result1 is the value of the 2nd result returned from this method // invocation. Result1 error @@ -2344,15 +2344,15 @@ func (c ReposStoreHasForkedByFuncCall) Results() []interface{} { // ReposStoreListWatchesFunc describes the behavior when the ListWatches // method of the parent MockReposStore instance is invoked. type ReposStoreListWatchesFunc struct { - defaultHook func(context.Context, int64) ([]*db.Watch, error) - hooks []func(context.Context, int64) ([]*db.Watch, error) + defaultHook func(context.Context, int64) ([]*database.Watch, error) + hooks []func(context.Context, int64) ([]*database.Watch, error) history []ReposStoreListWatchesFuncCall mutex sync.Mutex } // ListWatches delegates to the next hook function in the queue and stores // the parameter and result values of this invocation. -func (m *MockReposStore) ListWatches(v0 context.Context, v1 int64) ([]*db.Watch, error) { +func (m *MockReposStore) ListWatches(v0 context.Context, v1 int64) ([]*database.Watch, error) { r0, r1 := m.ListWatchesFunc.nextHook()(v0, v1) m.ListWatchesFunc.appendCall(ReposStoreListWatchesFuncCall{v0, v1, r0, r1}) return r0, r1 @@ -2361,7 +2361,7 @@ func (m *MockReposStore) ListWatches(v0 context.Context, v1 int64) ([]*db.Watch, // SetDefaultHook sets function that is called when the ListWatches method // of the parent MockReposStore instance is invoked and the hook queue is // empty. -func (f *ReposStoreListWatchesFunc) SetDefaultHook(hook func(context.Context, int64) ([]*db.Watch, error)) { +func (f *ReposStoreListWatchesFunc) SetDefaultHook(hook func(context.Context, int64) ([]*database.Watch, error)) { f.defaultHook = hook } @@ -2369,7 +2369,7 @@ func (f *ReposStoreListWatchesFunc) SetDefaultHook(hook func(context.Context, in // ListWatches method of the parent MockReposStore instance invokes the hook // at the front of the queue and discards it. After the queue is empty, the // default hook function is invoked for any future action. -func (f *ReposStoreListWatchesFunc) PushHook(hook func(context.Context, int64) ([]*db.Watch, error)) { +func (f *ReposStoreListWatchesFunc) PushHook(hook func(context.Context, int64) ([]*database.Watch, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -2377,20 +2377,20 @@ func (f *ReposStoreListWatchesFunc) PushHook(hook func(context.Context, int64) ( // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *ReposStoreListWatchesFunc) SetDefaultReturn(r0 []*db.Watch, r1 error) { - f.SetDefaultHook(func(context.Context, int64) ([]*db.Watch, error) { +func (f *ReposStoreListWatchesFunc) SetDefaultReturn(r0 []*database.Watch, r1 error) { + f.SetDefaultHook(func(context.Context, int64) ([]*database.Watch, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *ReposStoreListWatchesFunc) PushReturn(r0 []*db.Watch, r1 error) { - f.PushHook(func(context.Context, int64) ([]*db.Watch, error) { +func (f *ReposStoreListWatchesFunc) PushReturn(r0 []*database.Watch, r1 error) { + f.PushHook(func(context.Context, int64) ([]*database.Watch, error) { return r0, r1 }) } -func (f *ReposStoreListWatchesFunc) nextHook() func(context.Context, int64) ([]*db.Watch, error) { +func (f *ReposStoreListWatchesFunc) nextHook() func(context.Context, int64) ([]*database.Watch, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -2431,7 +2431,7 @@ type ReposStoreListWatchesFuncCall struct { Arg1 int64 // Result0 is the value of the 1st result returned from this method // invocation. - Result0 []*db.Watch + Result0 []*database.Watch // Result1 is the value of the 2nd result returned from this method // invocation. Result1 error @@ -2768,7 +2768,7 @@ func (c ReposStoreWatchFuncCall) Results() []interface{} { } // MockTwoFactorsStore is a mock implementation of the TwoFactorsStore -// interface (from the package gogs.io/gogs/internal/db) used for unit +// interface (from the package gogs.io/gogs/internal/database) used for unit // testing. type MockTwoFactorsStore struct { // CreateFunc is an instance of a mock function object controlling the @@ -2793,7 +2793,7 @@ func NewMockTwoFactorsStore() *MockTwoFactorsStore { }, }, GetByUserIDFunc: &TwoFactorsStoreGetByUserIDFunc{ - defaultHook: func(context.Context, int64) (r0 *db.TwoFactor, r1 error) { + defaultHook: func(context.Context, int64) (r0 *database.TwoFactor, r1 error) { return }, }, @@ -2815,7 +2815,7 @@ func NewStrictMockTwoFactorsStore() *MockTwoFactorsStore { }, }, GetByUserIDFunc: &TwoFactorsStoreGetByUserIDFunc{ - defaultHook: func(context.Context, int64) (*db.TwoFactor, error) { + defaultHook: func(context.Context, int64) (*database.TwoFactor, error) { panic("unexpected invocation of MockTwoFactorsStore.GetByUserID") }, }, @@ -2830,7 +2830,7 @@ func NewStrictMockTwoFactorsStore() *MockTwoFactorsStore { // NewMockTwoFactorsStoreFrom creates a new mock of the MockTwoFactorsStore // interface. All methods delegate to the given implementation, unless // overwritten. -func NewMockTwoFactorsStoreFrom(i db.TwoFactorsStore) *MockTwoFactorsStore { +func NewMockTwoFactorsStoreFrom(i database.TwoFactorsStore) *MockTwoFactorsStore { return &MockTwoFactorsStore{ CreateFunc: &TwoFactorsStoreCreateFunc{ defaultHook: i.Create, @@ -2958,15 +2958,15 @@ func (c TwoFactorsStoreCreateFuncCall) Results() []interface{} { // TwoFactorsStoreGetByUserIDFunc describes the behavior when the // GetByUserID method of the parent MockTwoFactorsStore instance is invoked. type TwoFactorsStoreGetByUserIDFunc struct { - defaultHook func(context.Context, int64) (*db.TwoFactor, error) - hooks []func(context.Context, int64) (*db.TwoFactor, error) + defaultHook func(context.Context, int64) (*database.TwoFactor, error) + hooks []func(context.Context, int64) (*database.TwoFactor, error) history []TwoFactorsStoreGetByUserIDFuncCall mutex sync.Mutex } // GetByUserID delegates to the next hook function in the queue and stores // the parameter and result values of this invocation. -func (m *MockTwoFactorsStore) GetByUserID(v0 context.Context, v1 int64) (*db.TwoFactor, error) { +func (m *MockTwoFactorsStore) GetByUserID(v0 context.Context, v1 int64) (*database.TwoFactor, error) { r0, r1 := m.GetByUserIDFunc.nextHook()(v0, v1) m.GetByUserIDFunc.appendCall(TwoFactorsStoreGetByUserIDFuncCall{v0, v1, r0, r1}) return r0, r1 @@ -2975,7 +2975,7 @@ func (m *MockTwoFactorsStore) GetByUserID(v0 context.Context, v1 int64) (*db.Two // SetDefaultHook sets function that is called when the GetByUserID method // of the parent MockTwoFactorsStore instance is invoked and the hook queue // is empty. -func (f *TwoFactorsStoreGetByUserIDFunc) SetDefaultHook(hook func(context.Context, int64) (*db.TwoFactor, error)) { +func (f *TwoFactorsStoreGetByUserIDFunc) SetDefaultHook(hook func(context.Context, int64) (*database.TwoFactor, error)) { f.defaultHook = hook } @@ -2983,7 +2983,7 @@ func (f *TwoFactorsStoreGetByUserIDFunc) SetDefaultHook(hook func(context.Contex // GetByUserID method of the parent MockTwoFactorsStore instance invokes the // hook at the front of the queue and discards it. After the queue is empty, // the default hook function is invoked for any future action. -func (f *TwoFactorsStoreGetByUserIDFunc) PushHook(hook func(context.Context, int64) (*db.TwoFactor, error)) { +func (f *TwoFactorsStoreGetByUserIDFunc) PushHook(hook func(context.Context, int64) (*database.TwoFactor, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -2991,20 +2991,20 @@ func (f *TwoFactorsStoreGetByUserIDFunc) PushHook(hook func(context.Context, int // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *TwoFactorsStoreGetByUserIDFunc) SetDefaultReturn(r0 *db.TwoFactor, r1 error) { - f.SetDefaultHook(func(context.Context, int64) (*db.TwoFactor, error) { +func (f *TwoFactorsStoreGetByUserIDFunc) SetDefaultReturn(r0 *database.TwoFactor, r1 error) { + f.SetDefaultHook(func(context.Context, int64) (*database.TwoFactor, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *TwoFactorsStoreGetByUserIDFunc) PushReturn(r0 *db.TwoFactor, r1 error) { - f.PushHook(func(context.Context, int64) (*db.TwoFactor, error) { +func (f *TwoFactorsStoreGetByUserIDFunc) PushReturn(r0 *database.TwoFactor, r1 error) { + f.PushHook(func(context.Context, int64) (*database.TwoFactor, error) { return r0, r1 }) } -func (f *TwoFactorsStoreGetByUserIDFunc) nextHook() func(context.Context, int64) (*db.TwoFactor, error) { +func (f *TwoFactorsStoreGetByUserIDFunc) nextHook() func(context.Context, int64) (*database.TwoFactor, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -3045,7 +3045,7 @@ type TwoFactorsStoreGetByUserIDFuncCall struct { Arg1 int64 // Result0 is the value of the 1st result returned from this method // invocation. - Result0 *db.TwoFactor + Result0 *database.TwoFactor // Result1 is the value of the 2nd result returned from this method // invocation. Result1 error @@ -3169,7 +3169,7 @@ func (c TwoFactorsStoreIsEnabledFuncCall) Results() []interface{} { } // MockUsersStore is a mock implementation of the UsersStore interface (from -// the package gogs.io/gogs/internal/db) used for unit testing. +// the package gogs.io/gogs/internal/database) used for unit testing. type MockUsersStore struct { // AddEmailFunc is an instance of a mock function object controlling the // behavior of the method AddEmail. @@ -3268,7 +3268,7 @@ func NewMockUsersStore() *MockUsersStore { }, }, AuthenticateFunc: &UsersStoreAuthenticateFunc{ - defaultHook: func(context.Context, string, string, int64) (r0 *db.User, r1 error) { + defaultHook: func(context.Context, string, string, int64) (r0 *database.User, r1 error) { return }, }, @@ -3283,7 +3283,7 @@ func NewMockUsersStore() *MockUsersStore { }, }, CreateFunc: &UsersStoreCreateFunc{ - defaultHook: func(context.Context, string, string, db.CreateUserOptions) (r0 *db.User, r1 error) { + defaultHook: func(context.Context, string, string, database.CreateUserOptions) (r0 *database.User, r1 error) { return }, }, @@ -3313,27 +3313,27 @@ func NewMockUsersStore() *MockUsersStore { }, }, GetByEmailFunc: &UsersStoreGetByEmailFunc{ - defaultHook: func(context.Context, string) (r0 *db.User, r1 error) { + defaultHook: func(context.Context, string) (r0 *database.User, r1 error) { return }, }, GetByIDFunc: &UsersStoreGetByIDFunc{ - defaultHook: func(context.Context, int64) (r0 *db.User, r1 error) { + defaultHook: func(context.Context, int64) (r0 *database.User, r1 error) { return }, }, GetByKeyIDFunc: &UsersStoreGetByKeyIDFunc{ - defaultHook: func(context.Context, int64) (r0 *db.User, r1 error) { + defaultHook: func(context.Context, int64) (r0 *database.User, r1 error) { return }, }, GetByUsernameFunc: &UsersStoreGetByUsernameFunc{ - defaultHook: func(context.Context, string) (r0 *db.User, r1 error) { + defaultHook: func(context.Context, string) (r0 *database.User, r1 error) { return }, }, GetEmailFunc: &UsersStoreGetEmailFunc{ - defaultHook: func(context.Context, int64, string, bool) (r0 *db.EmailAddress, r1 error) { + defaultHook: func(context.Context, int64, string, bool) (r0 *database.EmailAddress, r1 error) { return }, }, @@ -3353,22 +3353,22 @@ func NewMockUsersStore() *MockUsersStore { }, }, ListFunc: &UsersStoreListFunc{ - defaultHook: func(context.Context, int, int) (r0 []*db.User, r1 error) { + defaultHook: func(context.Context, int, int) (r0 []*database.User, r1 error) { return }, }, ListEmailsFunc: &UsersStoreListEmailsFunc{ - defaultHook: func(context.Context, int64) (r0 []*db.EmailAddress, r1 error) { + defaultHook: func(context.Context, int64) (r0 []*database.EmailAddress, r1 error) { return }, }, ListFollowersFunc: &UsersStoreListFollowersFunc{ - defaultHook: func(context.Context, int64, int, int) (r0 []*db.User, r1 error) { + defaultHook: func(context.Context, int64, int, int) (r0 []*database.User, r1 error) { return }, }, ListFollowingsFunc: &UsersStoreListFollowingsFunc{ - defaultHook: func(context.Context, int64, int, int) (r0 []*db.User, r1 error) { + defaultHook: func(context.Context, int64, int, int) (r0 []*database.User, r1 error) { return }, }, @@ -3383,7 +3383,7 @@ func NewMockUsersStore() *MockUsersStore { }, }, SearchByNameFunc: &UsersStoreSearchByNameFunc{ - defaultHook: func(context.Context, string, int, int, string) (r0 []*db.User, r1 int64, r2 error) { + defaultHook: func(context.Context, string, int, int, string) (r0 []*database.User, r1 int64, r2 error) { return }, }, @@ -3393,7 +3393,7 @@ func NewMockUsersStore() *MockUsersStore { }, }, UpdateFunc: &UsersStoreUpdateFunc{ - defaultHook: func(context.Context, int64, db.UpdateUserOptions) (r0 error) { + defaultHook: func(context.Context, int64, database.UpdateUserOptions) (r0 error) { return }, }, @@ -3415,7 +3415,7 @@ func NewStrictMockUsersStore() *MockUsersStore { }, }, AuthenticateFunc: &UsersStoreAuthenticateFunc{ - defaultHook: func(context.Context, string, string, int64) (*db.User, error) { + defaultHook: func(context.Context, string, string, int64) (*database.User, error) { panic("unexpected invocation of MockUsersStore.Authenticate") }, }, @@ -3430,7 +3430,7 @@ func NewStrictMockUsersStore() *MockUsersStore { }, }, CreateFunc: &UsersStoreCreateFunc{ - defaultHook: func(context.Context, string, string, db.CreateUserOptions) (*db.User, error) { + defaultHook: func(context.Context, string, string, database.CreateUserOptions) (*database.User, error) { panic("unexpected invocation of MockUsersStore.Create") }, }, @@ -3460,27 +3460,27 @@ func NewStrictMockUsersStore() *MockUsersStore { }, }, GetByEmailFunc: &UsersStoreGetByEmailFunc{ - defaultHook: func(context.Context, string) (*db.User, error) { + defaultHook: func(context.Context, string) (*database.User, error) { panic("unexpected invocation of MockUsersStore.GetByEmail") }, }, GetByIDFunc: &UsersStoreGetByIDFunc{ - defaultHook: func(context.Context, int64) (*db.User, error) { + defaultHook: func(context.Context, int64) (*database.User, error) { panic("unexpected invocation of MockUsersStore.GetByID") }, }, GetByKeyIDFunc: &UsersStoreGetByKeyIDFunc{ - defaultHook: func(context.Context, int64) (*db.User, error) { + defaultHook: func(context.Context, int64) (*database.User, error) { panic("unexpected invocation of MockUsersStore.GetByKeyID") }, }, GetByUsernameFunc: &UsersStoreGetByUsernameFunc{ - defaultHook: func(context.Context, string) (*db.User, error) { + defaultHook: func(context.Context, string) (*database.User, error) { panic("unexpected invocation of MockUsersStore.GetByUsername") }, }, GetEmailFunc: &UsersStoreGetEmailFunc{ - defaultHook: func(context.Context, int64, string, bool) (*db.EmailAddress, error) { + defaultHook: func(context.Context, int64, string, bool) (*database.EmailAddress, error) { panic("unexpected invocation of MockUsersStore.GetEmail") }, }, @@ -3500,22 +3500,22 @@ func NewStrictMockUsersStore() *MockUsersStore { }, }, ListFunc: &UsersStoreListFunc{ - defaultHook: func(context.Context, int, int) ([]*db.User, error) { + defaultHook: func(context.Context, int, int) ([]*database.User, error) { panic("unexpected invocation of MockUsersStore.List") }, }, ListEmailsFunc: &UsersStoreListEmailsFunc{ - defaultHook: func(context.Context, int64) ([]*db.EmailAddress, error) { + defaultHook: func(context.Context, int64) ([]*database.EmailAddress, error) { panic("unexpected invocation of MockUsersStore.ListEmails") }, }, ListFollowersFunc: &UsersStoreListFollowersFunc{ - defaultHook: func(context.Context, int64, int, int) ([]*db.User, error) { + defaultHook: func(context.Context, int64, int, int) ([]*database.User, error) { panic("unexpected invocation of MockUsersStore.ListFollowers") }, }, ListFollowingsFunc: &UsersStoreListFollowingsFunc{ - defaultHook: func(context.Context, int64, int, int) ([]*db.User, error) { + defaultHook: func(context.Context, int64, int, int) ([]*database.User, error) { panic("unexpected invocation of MockUsersStore.ListFollowings") }, }, @@ -3530,7 +3530,7 @@ func NewStrictMockUsersStore() *MockUsersStore { }, }, SearchByNameFunc: &UsersStoreSearchByNameFunc{ - defaultHook: func(context.Context, string, int, int, string) ([]*db.User, int64, error) { + defaultHook: func(context.Context, string, int, int, string) ([]*database.User, int64, error) { panic("unexpected invocation of MockUsersStore.SearchByName") }, }, @@ -3540,7 +3540,7 @@ func NewStrictMockUsersStore() *MockUsersStore { }, }, UpdateFunc: &UsersStoreUpdateFunc{ - defaultHook: func(context.Context, int64, db.UpdateUserOptions) error { + defaultHook: func(context.Context, int64, database.UpdateUserOptions) error { panic("unexpected invocation of MockUsersStore.Update") }, }, @@ -3554,7 +3554,7 @@ func NewStrictMockUsersStore() *MockUsersStore { // NewMockUsersStoreFrom creates a new mock of the MockUsersStore interface. // All methods delegate to the given implementation, unless overwritten. -func NewMockUsersStoreFrom(i db.UsersStore) *MockUsersStore { +func NewMockUsersStoreFrom(i database.UsersStore) *MockUsersStore { return &MockUsersStore{ AddEmailFunc: &UsersStoreAddEmailFunc{ defaultHook: i.AddEmail, @@ -3757,15 +3757,15 @@ func (c UsersStoreAddEmailFuncCall) Results() []interface{} { // UsersStoreAuthenticateFunc describes the behavior when the Authenticate // method of the parent MockUsersStore instance is invoked. type UsersStoreAuthenticateFunc struct { - defaultHook func(context.Context, string, string, int64) (*db.User, error) - hooks []func(context.Context, string, string, int64) (*db.User, error) + defaultHook func(context.Context, string, string, int64) (*database.User, error) + hooks []func(context.Context, string, string, int64) (*database.User, error) history []UsersStoreAuthenticateFuncCall mutex sync.Mutex } // Authenticate delegates to the next hook function in the queue and stores // the parameter and result values of this invocation. -func (m *MockUsersStore) Authenticate(v0 context.Context, v1 string, v2 string, v3 int64) (*db.User, error) { +func (m *MockUsersStore) Authenticate(v0 context.Context, v1 string, v2 string, v3 int64) (*database.User, error) { r0, r1 := m.AuthenticateFunc.nextHook()(v0, v1, v2, v3) m.AuthenticateFunc.appendCall(UsersStoreAuthenticateFuncCall{v0, v1, v2, v3, r0, r1}) return r0, r1 @@ -3774,7 +3774,7 @@ func (m *MockUsersStore) Authenticate(v0 context.Context, v1 string, v2 string, // SetDefaultHook sets function that is called when the Authenticate method // of the parent MockUsersStore instance is invoked and the hook queue is // empty. -func (f *UsersStoreAuthenticateFunc) SetDefaultHook(hook func(context.Context, string, string, int64) (*db.User, error)) { +func (f *UsersStoreAuthenticateFunc) SetDefaultHook(hook func(context.Context, string, string, int64) (*database.User, error)) { f.defaultHook = hook } @@ -3782,7 +3782,7 @@ func (f *UsersStoreAuthenticateFunc) SetDefaultHook(hook func(context.Context, s // Authenticate method of the parent MockUsersStore instance invokes the // hook at the front of the queue and discards it. After the queue is empty, // the default hook function is invoked for any future action. -func (f *UsersStoreAuthenticateFunc) PushHook(hook func(context.Context, string, string, int64) (*db.User, error)) { +func (f *UsersStoreAuthenticateFunc) PushHook(hook func(context.Context, string, string, int64) (*database.User, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -3790,20 +3790,20 @@ func (f *UsersStoreAuthenticateFunc) PushHook(hook func(context.Context, string, // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *UsersStoreAuthenticateFunc) SetDefaultReturn(r0 *db.User, r1 error) { - f.SetDefaultHook(func(context.Context, string, string, int64) (*db.User, error) { +func (f *UsersStoreAuthenticateFunc) SetDefaultReturn(r0 *database.User, r1 error) { + f.SetDefaultHook(func(context.Context, string, string, int64) (*database.User, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *UsersStoreAuthenticateFunc) PushReturn(r0 *db.User, r1 error) { - f.PushHook(func(context.Context, string, string, int64) (*db.User, error) { +func (f *UsersStoreAuthenticateFunc) PushReturn(r0 *database.User, r1 error) { + f.PushHook(func(context.Context, string, string, int64) (*database.User, error) { return r0, r1 }) } -func (f *UsersStoreAuthenticateFunc) nextHook() func(context.Context, string, string, int64) (*db.User, error) { +func (f *UsersStoreAuthenticateFunc) nextHook() func(context.Context, string, string, int64) (*database.User, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -3850,7 +3850,7 @@ type UsersStoreAuthenticateFuncCall struct { Arg3 int64 // Result0 is the value of the 1st result returned from this method // invocation. - Result0 *db.User + Result0 *database.User // Result1 is the value of the 2nd result returned from this method // invocation. Result1 error @@ -4080,15 +4080,15 @@ func (c UsersStoreCountFuncCall) Results() []interface{} { // UsersStoreCreateFunc describes the behavior when the Create method of the // parent MockUsersStore instance is invoked. type UsersStoreCreateFunc struct { - defaultHook func(context.Context, string, string, db.CreateUserOptions) (*db.User, error) - hooks []func(context.Context, string, string, db.CreateUserOptions) (*db.User, error) + defaultHook func(context.Context, string, string, database.CreateUserOptions) (*database.User, error) + hooks []func(context.Context, string, string, database.CreateUserOptions) (*database.User, error) history []UsersStoreCreateFuncCall mutex sync.Mutex } // Create delegates to the next hook function in the queue and stores the // parameter and result values of this invocation. -func (m *MockUsersStore) Create(v0 context.Context, v1 string, v2 string, v3 db.CreateUserOptions) (*db.User, error) { +func (m *MockUsersStore) Create(v0 context.Context, v1 string, v2 string, v3 database.CreateUserOptions) (*database.User, error) { r0, r1 := m.CreateFunc.nextHook()(v0, v1, v2, v3) m.CreateFunc.appendCall(UsersStoreCreateFuncCall{v0, v1, v2, v3, r0, r1}) return r0, r1 @@ -4096,7 +4096,7 @@ func (m *MockUsersStore) Create(v0 context.Context, v1 string, v2 string, v3 db. // SetDefaultHook sets function that is called when the Create method of the // parent MockUsersStore instance is invoked and the hook queue is empty. -func (f *UsersStoreCreateFunc) SetDefaultHook(hook func(context.Context, string, string, db.CreateUserOptions) (*db.User, error)) { +func (f *UsersStoreCreateFunc) SetDefaultHook(hook func(context.Context, string, string, database.CreateUserOptions) (*database.User, error)) { f.defaultHook = hook } @@ -4104,7 +4104,7 @@ func (f *UsersStoreCreateFunc) SetDefaultHook(hook func(context.Context, string, // Create method of the parent MockUsersStore instance invokes the hook at // the front of the queue and discards it. After the queue is empty, the // default hook function is invoked for any future action. -func (f *UsersStoreCreateFunc) PushHook(hook func(context.Context, string, string, db.CreateUserOptions) (*db.User, error)) { +func (f *UsersStoreCreateFunc) PushHook(hook func(context.Context, string, string, database.CreateUserOptions) (*database.User, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -4112,20 +4112,20 @@ func (f *UsersStoreCreateFunc) PushHook(hook func(context.Context, string, strin // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *UsersStoreCreateFunc) SetDefaultReturn(r0 *db.User, r1 error) { - f.SetDefaultHook(func(context.Context, string, string, db.CreateUserOptions) (*db.User, error) { +func (f *UsersStoreCreateFunc) SetDefaultReturn(r0 *database.User, r1 error) { + f.SetDefaultHook(func(context.Context, string, string, database.CreateUserOptions) (*database.User, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *UsersStoreCreateFunc) PushReturn(r0 *db.User, r1 error) { - f.PushHook(func(context.Context, string, string, db.CreateUserOptions) (*db.User, error) { +func (f *UsersStoreCreateFunc) PushReturn(r0 *database.User, r1 error) { + f.PushHook(func(context.Context, string, string, database.CreateUserOptions) (*database.User, error) { return r0, r1 }) } -func (f *UsersStoreCreateFunc) nextHook() func(context.Context, string, string, db.CreateUserOptions) (*db.User, error) { +func (f *UsersStoreCreateFunc) nextHook() func(context.Context, string, string, database.CreateUserOptions) (*database.User, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -4169,10 +4169,10 @@ type UsersStoreCreateFuncCall struct { Arg2 string // Arg3 is the value of the 4th argument passed to this method // invocation. - Arg3 db.CreateUserOptions + Arg3 database.CreateUserOptions // Result0 is the value of the 1st result returned from this method // invocation. - Result0 *db.User + Result0 *database.User // Result1 is the value of the 2nd result returned from this method // invocation. Result1 error @@ -4722,15 +4722,15 @@ func (c UsersStoreFollowFuncCall) Results() []interface{} { // UsersStoreGetByEmailFunc describes the behavior when the GetByEmail // method of the parent MockUsersStore instance is invoked. type UsersStoreGetByEmailFunc struct { - defaultHook func(context.Context, string) (*db.User, error) - hooks []func(context.Context, string) (*db.User, error) + defaultHook func(context.Context, string) (*database.User, error) + hooks []func(context.Context, string) (*database.User, error) history []UsersStoreGetByEmailFuncCall mutex sync.Mutex } // GetByEmail delegates to the next hook function in the queue and stores // the parameter and result values of this invocation. -func (m *MockUsersStore) GetByEmail(v0 context.Context, v1 string) (*db.User, error) { +func (m *MockUsersStore) GetByEmail(v0 context.Context, v1 string) (*database.User, error) { r0, r1 := m.GetByEmailFunc.nextHook()(v0, v1) m.GetByEmailFunc.appendCall(UsersStoreGetByEmailFuncCall{v0, v1, r0, r1}) return r0, r1 @@ -4739,7 +4739,7 @@ func (m *MockUsersStore) GetByEmail(v0 context.Context, v1 string) (*db.User, er // SetDefaultHook sets function that is called when the GetByEmail method of // the parent MockUsersStore instance is invoked and the hook queue is // empty. -func (f *UsersStoreGetByEmailFunc) SetDefaultHook(hook func(context.Context, string) (*db.User, error)) { +func (f *UsersStoreGetByEmailFunc) SetDefaultHook(hook func(context.Context, string) (*database.User, error)) { f.defaultHook = hook } @@ -4747,7 +4747,7 @@ func (f *UsersStoreGetByEmailFunc) SetDefaultHook(hook func(context.Context, str // GetByEmail method of the parent MockUsersStore instance invokes the hook // at the front of the queue and discards it. After the queue is empty, the // default hook function is invoked for any future action. -func (f *UsersStoreGetByEmailFunc) PushHook(hook func(context.Context, string) (*db.User, error)) { +func (f *UsersStoreGetByEmailFunc) PushHook(hook func(context.Context, string) (*database.User, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -4755,20 +4755,20 @@ func (f *UsersStoreGetByEmailFunc) PushHook(hook func(context.Context, string) ( // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *UsersStoreGetByEmailFunc) SetDefaultReturn(r0 *db.User, r1 error) { - f.SetDefaultHook(func(context.Context, string) (*db.User, error) { +func (f *UsersStoreGetByEmailFunc) SetDefaultReturn(r0 *database.User, r1 error) { + f.SetDefaultHook(func(context.Context, string) (*database.User, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *UsersStoreGetByEmailFunc) PushReturn(r0 *db.User, r1 error) { - f.PushHook(func(context.Context, string) (*db.User, error) { +func (f *UsersStoreGetByEmailFunc) PushReturn(r0 *database.User, r1 error) { + f.PushHook(func(context.Context, string) (*database.User, error) { return r0, r1 }) } -func (f *UsersStoreGetByEmailFunc) nextHook() func(context.Context, string) (*db.User, error) { +func (f *UsersStoreGetByEmailFunc) nextHook() func(context.Context, string) (*database.User, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -4809,7 +4809,7 @@ type UsersStoreGetByEmailFuncCall struct { Arg1 string // Result0 is the value of the 1st result returned from this method // invocation. - Result0 *db.User + Result0 *database.User // Result1 is the value of the 2nd result returned from this method // invocation. Result1 error @@ -4830,15 +4830,15 @@ func (c UsersStoreGetByEmailFuncCall) Results() []interface{} { // UsersStoreGetByIDFunc describes the behavior when the GetByID method of // the parent MockUsersStore instance is invoked. type UsersStoreGetByIDFunc struct { - defaultHook func(context.Context, int64) (*db.User, error) - hooks []func(context.Context, int64) (*db.User, error) + defaultHook func(context.Context, int64) (*database.User, error) + hooks []func(context.Context, int64) (*database.User, error) history []UsersStoreGetByIDFuncCall mutex sync.Mutex } // GetByID delegates to the next hook function in the queue and stores the // parameter and result values of this invocation. -func (m *MockUsersStore) GetByID(v0 context.Context, v1 int64) (*db.User, error) { +func (m *MockUsersStore) GetByID(v0 context.Context, v1 int64) (*database.User, error) { r0, r1 := m.GetByIDFunc.nextHook()(v0, v1) m.GetByIDFunc.appendCall(UsersStoreGetByIDFuncCall{v0, v1, r0, r1}) return r0, r1 @@ -4847,7 +4847,7 @@ func (m *MockUsersStore) GetByID(v0 context.Context, v1 int64) (*db.User, error) // SetDefaultHook sets function that is called when the GetByID method of // the parent MockUsersStore instance is invoked and the hook queue is // empty. -func (f *UsersStoreGetByIDFunc) SetDefaultHook(hook func(context.Context, int64) (*db.User, error)) { +func (f *UsersStoreGetByIDFunc) SetDefaultHook(hook func(context.Context, int64) (*database.User, error)) { f.defaultHook = hook } @@ -4855,7 +4855,7 @@ func (f *UsersStoreGetByIDFunc) SetDefaultHook(hook func(context.Context, int64) // GetByID method of the parent MockUsersStore instance invokes the hook at // the front of the queue and discards it. After the queue is empty, the // default hook function is invoked for any future action. -func (f *UsersStoreGetByIDFunc) PushHook(hook func(context.Context, int64) (*db.User, error)) { +func (f *UsersStoreGetByIDFunc) PushHook(hook func(context.Context, int64) (*database.User, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -4863,20 +4863,20 @@ func (f *UsersStoreGetByIDFunc) PushHook(hook func(context.Context, int64) (*db. // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *UsersStoreGetByIDFunc) SetDefaultReturn(r0 *db.User, r1 error) { - f.SetDefaultHook(func(context.Context, int64) (*db.User, error) { +func (f *UsersStoreGetByIDFunc) SetDefaultReturn(r0 *database.User, r1 error) { + f.SetDefaultHook(func(context.Context, int64) (*database.User, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *UsersStoreGetByIDFunc) PushReturn(r0 *db.User, r1 error) { - f.PushHook(func(context.Context, int64) (*db.User, error) { +func (f *UsersStoreGetByIDFunc) PushReturn(r0 *database.User, r1 error) { + f.PushHook(func(context.Context, int64) (*database.User, error) { return r0, r1 }) } -func (f *UsersStoreGetByIDFunc) nextHook() func(context.Context, int64) (*db.User, error) { +func (f *UsersStoreGetByIDFunc) nextHook() func(context.Context, int64) (*database.User, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -4917,7 +4917,7 @@ type UsersStoreGetByIDFuncCall struct { Arg1 int64 // Result0 is the value of the 1st result returned from this method // invocation. - Result0 *db.User + Result0 *database.User // Result1 is the value of the 2nd result returned from this method // invocation. Result1 error @@ -4938,15 +4938,15 @@ func (c UsersStoreGetByIDFuncCall) Results() []interface{} { // UsersStoreGetByKeyIDFunc describes the behavior when the GetByKeyID // method of the parent MockUsersStore instance is invoked. type UsersStoreGetByKeyIDFunc struct { - defaultHook func(context.Context, int64) (*db.User, error) - hooks []func(context.Context, int64) (*db.User, error) + defaultHook func(context.Context, int64) (*database.User, error) + hooks []func(context.Context, int64) (*database.User, error) history []UsersStoreGetByKeyIDFuncCall mutex sync.Mutex } // GetByKeyID delegates to the next hook function in the queue and stores // the parameter and result values of this invocation. -func (m *MockUsersStore) GetByKeyID(v0 context.Context, v1 int64) (*db.User, error) { +func (m *MockUsersStore) GetByKeyID(v0 context.Context, v1 int64) (*database.User, error) { r0, r1 := m.GetByKeyIDFunc.nextHook()(v0, v1) m.GetByKeyIDFunc.appendCall(UsersStoreGetByKeyIDFuncCall{v0, v1, r0, r1}) return r0, r1 @@ -4955,7 +4955,7 @@ func (m *MockUsersStore) GetByKeyID(v0 context.Context, v1 int64) (*db.User, err // SetDefaultHook sets function that is called when the GetByKeyID method of // the parent MockUsersStore instance is invoked and the hook queue is // empty. -func (f *UsersStoreGetByKeyIDFunc) SetDefaultHook(hook func(context.Context, int64) (*db.User, error)) { +func (f *UsersStoreGetByKeyIDFunc) SetDefaultHook(hook func(context.Context, int64) (*database.User, error)) { f.defaultHook = hook } @@ -4963,7 +4963,7 @@ func (f *UsersStoreGetByKeyIDFunc) SetDefaultHook(hook func(context.Context, int // GetByKeyID method of the parent MockUsersStore instance invokes the hook // at the front of the queue and discards it. After the queue is empty, the // default hook function is invoked for any future action. -func (f *UsersStoreGetByKeyIDFunc) PushHook(hook func(context.Context, int64) (*db.User, error)) { +func (f *UsersStoreGetByKeyIDFunc) PushHook(hook func(context.Context, int64) (*database.User, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -4971,20 +4971,20 @@ func (f *UsersStoreGetByKeyIDFunc) PushHook(hook func(context.Context, int64) (* // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *UsersStoreGetByKeyIDFunc) SetDefaultReturn(r0 *db.User, r1 error) { - f.SetDefaultHook(func(context.Context, int64) (*db.User, error) { +func (f *UsersStoreGetByKeyIDFunc) SetDefaultReturn(r0 *database.User, r1 error) { + f.SetDefaultHook(func(context.Context, int64) (*database.User, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *UsersStoreGetByKeyIDFunc) PushReturn(r0 *db.User, r1 error) { - f.PushHook(func(context.Context, int64) (*db.User, error) { +func (f *UsersStoreGetByKeyIDFunc) PushReturn(r0 *database.User, r1 error) { + f.PushHook(func(context.Context, int64) (*database.User, error) { return r0, r1 }) } -func (f *UsersStoreGetByKeyIDFunc) nextHook() func(context.Context, int64) (*db.User, error) { +func (f *UsersStoreGetByKeyIDFunc) nextHook() func(context.Context, int64) (*database.User, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -5025,7 +5025,7 @@ type UsersStoreGetByKeyIDFuncCall struct { Arg1 int64 // Result0 is the value of the 1st result returned from this method // invocation. - Result0 *db.User + Result0 *database.User // Result1 is the value of the 2nd result returned from this method // invocation. Result1 error @@ -5046,15 +5046,15 @@ func (c UsersStoreGetByKeyIDFuncCall) Results() []interface{} { // UsersStoreGetByUsernameFunc describes the behavior when the GetByUsername // method of the parent MockUsersStore instance is invoked. type UsersStoreGetByUsernameFunc struct { - defaultHook func(context.Context, string) (*db.User, error) - hooks []func(context.Context, string) (*db.User, error) + defaultHook func(context.Context, string) (*database.User, error) + hooks []func(context.Context, string) (*database.User, error) history []UsersStoreGetByUsernameFuncCall mutex sync.Mutex } // GetByUsername delegates to the next hook function in the queue and stores // the parameter and result values of this invocation. -func (m *MockUsersStore) GetByUsername(v0 context.Context, v1 string) (*db.User, error) { +func (m *MockUsersStore) GetByUsername(v0 context.Context, v1 string) (*database.User, error) { r0, r1 := m.GetByUsernameFunc.nextHook()(v0, v1) m.GetByUsernameFunc.appendCall(UsersStoreGetByUsernameFuncCall{v0, v1, r0, r1}) return r0, r1 @@ -5063,7 +5063,7 @@ func (m *MockUsersStore) GetByUsername(v0 context.Context, v1 string) (*db.User, // SetDefaultHook sets function that is called when the GetByUsername method // of the parent MockUsersStore instance is invoked and the hook queue is // empty. -func (f *UsersStoreGetByUsernameFunc) SetDefaultHook(hook func(context.Context, string) (*db.User, error)) { +func (f *UsersStoreGetByUsernameFunc) SetDefaultHook(hook func(context.Context, string) (*database.User, error)) { f.defaultHook = hook } @@ -5071,7 +5071,7 @@ func (f *UsersStoreGetByUsernameFunc) SetDefaultHook(hook func(context.Context, // GetByUsername method of the parent MockUsersStore instance invokes the // hook at the front of the queue and discards it. After the queue is empty, // the default hook function is invoked for any future action. -func (f *UsersStoreGetByUsernameFunc) PushHook(hook func(context.Context, string) (*db.User, error)) { +func (f *UsersStoreGetByUsernameFunc) PushHook(hook func(context.Context, string) (*database.User, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -5079,20 +5079,20 @@ func (f *UsersStoreGetByUsernameFunc) PushHook(hook func(context.Context, string // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *UsersStoreGetByUsernameFunc) SetDefaultReturn(r0 *db.User, r1 error) { - f.SetDefaultHook(func(context.Context, string) (*db.User, error) { +func (f *UsersStoreGetByUsernameFunc) SetDefaultReturn(r0 *database.User, r1 error) { + f.SetDefaultHook(func(context.Context, string) (*database.User, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *UsersStoreGetByUsernameFunc) PushReturn(r0 *db.User, r1 error) { - f.PushHook(func(context.Context, string) (*db.User, error) { +func (f *UsersStoreGetByUsernameFunc) PushReturn(r0 *database.User, r1 error) { + f.PushHook(func(context.Context, string) (*database.User, error) { return r0, r1 }) } -func (f *UsersStoreGetByUsernameFunc) nextHook() func(context.Context, string) (*db.User, error) { +func (f *UsersStoreGetByUsernameFunc) nextHook() func(context.Context, string) (*database.User, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -5133,7 +5133,7 @@ type UsersStoreGetByUsernameFuncCall struct { Arg1 string // Result0 is the value of the 1st result returned from this method // invocation. - Result0 *db.User + Result0 *database.User // Result1 is the value of the 2nd result returned from this method // invocation. Result1 error @@ -5154,15 +5154,15 @@ func (c UsersStoreGetByUsernameFuncCall) Results() []interface{} { // UsersStoreGetEmailFunc describes the behavior when the GetEmail method of // the parent MockUsersStore instance is invoked. type UsersStoreGetEmailFunc struct { - defaultHook func(context.Context, int64, string, bool) (*db.EmailAddress, error) - hooks []func(context.Context, int64, string, bool) (*db.EmailAddress, error) + defaultHook func(context.Context, int64, string, bool) (*database.EmailAddress, error) + hooks []func(context.Context, int64, string, bool) (*database.EmailAddress, error) history []UsersStoreGetEmailFuncCall mutex sync.Mutex } // GetEmail delegates to the next hook function in the queue and stores the // parameter and result values of this invocation. -func (m *MockUsersStore) GetEmail(v0 context.Context, v1 int64, v2 string, v3 bool) (*db.EmailAddress, error) { +func (m *MockUsersStore) GetEmail(v0 context.Context, v1 int64, v2 string, v3 bool) (*database.EmailAddress, error) { r0, r1 := m.GetEmailFunc.nextHook()(v0, v1, v2, v3) m.GetEmailFunc.appendCall(UsersStoreGetEmailFuncCall{v0, v1, v2, v3, r0, r1}) return r0, r1 @@ -5171,7 +5171,7 @@ func (m *MockUsersStore) GetEmail(v0 context.Context, v1 int64, v2 string, v3 bo // SetDefaultHook sets function that is called when the GetEmail method of // the parent MockUsersStore instance is invoked and the hook queue is // empty. -func (f *UsersStoreGetEmailFunc) SetDefaultHook(hook func(context.Context, int64, string, bool) (*db.EmailAddress, error)) { +func (f *UsersStoreGetEmailFunc) SetDefaultHook(hook func(context.Context, int64, string, bool) (*database.EmailAddress, error)) { f.defaultHook = hook } @@ -5179,7 +5179,7 @@ func (f *UsersStoreGetEmailFunc) SetDefaultHook(hook func(context.Context, int64 // GetEmail method of the parent MockUsersStore instance invokes the hook at // the front of the queue and discards it. After the queue is empty, the // default hook function is invoked for any future action. -func (f *UsersStoreGetEmailFunc) PushHook(hook func(context.Context, int64, string, bool) (*db.EmailAddress, error)) { +func (f *UsersStoreGetEmailFunc) PushHook(hook func(context.Context, int64, string, bool) (*database.EmailAddress, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -5187,20 +5187,20 @@ func (f *UsersStoreGetEmailFunc) PushHook(hook func(context.Context, int64, stri // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *UsersStoreGetEmailFunc) SetDefaultReturn(r0 *db.EmailAddress, r1 error) { - f.SetDefaultHook(func(context.Context, int64, string, bool) (*db.EmailAddress, error) { +func (f *UsersStoreGetEmailFunc) SetDefaultReturn(r0 *database.EmailAddress, r1 error) { + f.SetDefaultHook(func(context.Context, int64, string, bool) (*database.EmailAddress, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *UsersStoreGetEmailFunc) PushReturn(r0 *db.EmailAddress, r1 error) { - f.PushHook(func(context.Context, int64, string, bool) (*db.EmailAddress, error) { +func (f *UsersStoreGetEmailFunc) PushReturn(r0 *database.EmailAddress, r1 error) { + f.PushHook(func(context.Context, int64, string, bool) (*database.EmailAddress, error) { return r0, r1 }) } -func (f *UsersStoreGetEmailFunc) nextHook() func(context.Context, int64, string, bool) (*db.EmailAddress, error) { +func (f *UsersStoreGetEmailFunc) nextHook() func(context.Context, int64, string, bool) (*database.EmailAddress, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -5247,7 +5247,7 @@ type UsersStoreGetEmailFuncCall struct { Arg3 bool // Result0 is the value of the 1st result returned from this method // invocation. - Result0 *db.EmailAddress + Result0 *database.EmailAddress // Result1 is the value of the 2nd result returned from this method // invocation. Result1 error @@ -5596,15 +5596,15 @@ func (c UsersStoreIsUsernameUsedFuncCall) Results() []interface{} { // UsersStoreListFunc describes the behavior when the List method of the // parent MockUsersStore instance is invoked. type UsersStoreListFunc struct { - defaultHook func(context.Context, int, int) ([]*db.User, error) - hooks []func(context.Context, int, int) ([]*db.User, error) + defaultHook func(context.Context, int, int) ([]*database.User, error) + hooks []func(context.Context, int, int) ([]*database.User, error) history []UsersStoreListFuncCall mutex sync.Mutex } // List delegates to the next hook function in the queue and stores the // parameter and result values of this invocation. -func (m *MockUsersStore) List(v0 context.Context, v1 int, v2 int) ([]*db.User, error) { +func (m *MockUsersStore) List(v0 context.Context, v1 int, v2 int) ([]*database.User, error) { r0, r1 := m.ListFunc.nextHook()(v0, v1, v2) m.ListFunc.appendCall(UsersStoreListFuncCall{v0, v1, v2, r0, r1}) return r0, r1 @@ -5612,7 +5612,7 @@ func (m *MockUsersStore) List(v0 context.Context, v1 int, v2 int) ([]*db.User, e // SetDefaultHook sets function that is called when the List method of the // parent MockUsersStore instance is invoked and the hook queue is empty. -func (f *UsersStoreListFunc) SetDefaultHook(hook func(context.Context, int, int) ([]*db.User, error)) { +func (f *UsersStoreListFunc) SetDefaultHook(hook func(context.Context, int, int) ([]*database.User, error)) { f.defaultHook = hook } @@ -5620,7 +5620,7 @@ func (f *UsersStoreListFunc) SetDefaultHook(hook func(context.Context, int, int) // List method of the parent MockUsersStore instance invokes the hook at the // front of the queue and discards it. After the queue is empty, the default // hook function is invoked for any future action. -func (f *UsersStoreListFunc) PushHook(hook func(context.Context, int, int) ([]*db.User, error)) { +func (f *UsersStoreListFunc) PushHook(hook func(context.Context, int, int) ([]*database.User, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -5628,20 +5628,20 @@ func (f *UsersStoreListFunc) PushHook(hook func(context.Context, int, int) ([]*d // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *UsersStoreListFunc) SetDefaultReturn(r0 []*db.User, r1 error) { - f.SetDefaultHook(func(context.Context, int, int) ([]*db.User, error) { +func (f *UsersStoreListFunc) SetDefaultReturn(r0 []*database.User, r1 error) { + f.SetDefaultHook(func(context.Context, int, int) ([]*database.User, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *UsersStoreListFunc) PushReturn(r0 []*db.User, r1 error) { - f.PushHook(func(context.Context, int, int) ([]*db.User, error) { +func (f *UsersStoreListFunc) PushReturn(r0 []*database.User, r1 error) { + f.PushHook(func(context.Context, int, int) ([]*database.User, error) { return r0, r1 }) } -func (f *UsersStoreListFunc) nextHook() func(context.Context, int, int) ([]*db.User, error) { +func (f *UsersStoreListFunc) nextHook() func(context.Context, int, int) ([]*database.User, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -5685,7 +5685,7 @@ type UsersStoreListFuncCall struct { Arg2 int // Result0 is the value of the 1st result returned from this method // invocation. - Result0 []*db.User + Result0 []*database.User // Result1 is the value of the 2nd result returned from this method // invocation. Result1 error @@ -5706,15 +5706,15 @@ func (c UsersStoreListFuncCall) Results() []interface{} { // UsersStoreListEmailsFunc describes the behavior when the ListEmails // method of the parent MockUsersStore instance is invoked. type UsersStoreListEmailsFunc struct { - defaultHook func(context.Context, int64) ([]*db.EmailAddress, error) - hooks []func(context.Context, int64) ([]*db.EmailAddress, error) + defaultHook func(context.Context, int64) ([]*database.EmailAddress, error) + hooks []func(context.Context, int64) ([]*database.EmailAddress, error) history []UsersStoreListEmailsFuncCall mutex sync.Mutex } // ListEmails delegates to the next hook function in the queue and stores // the parameter and result values of this invocation. -func (m *MockUsersStore) ListEmails(v0 context.Context, v1 int64) ([]*db.EmailAddress, error) { +func (m *MockUsersStore) ListEmails(v0 context.Context, v1 int64) ([]*database.EmailAddress, error) { r0, r1 := m.ListEmailsFunc.nextHook()(v0, v1) m.ListEmailsFunc.appendCall(UsersStoreListEmailsFuncCall{v0, v1, r0, r1}) return r0, r1 @@ -5723,7 +5723,7 @@ func (m *MockUsersStore) ListEmails(v0 context.Context, v1 int64) ([]*db.EmailAd // SetDefaultHook sets function that is called when the ListEmails method of // the parent MockUsersStore instance is invoked and the hook queue is // empty. -func (f *UsersStoreListEmailsFunc) SetDefaultHook(hook func(context.Context, int64) ([]*db.EmailAddress, error)) { +func (f *UsersStoreListEmailsFunc) SetDefaultHook(hook func(context.Context, int64) ([]*database.EmailAddress, error)) { f.defaultHook = hook } @@ -5731,7 +5731,7 @@ func (f *UsersStoreListEmailsFunc) SetDefaultHook(hook func(context.Context, int // ListEmails method of the parent MockUsersStore instance invokes the hook // at the front of the queue and discards it. After the queue is empty, the // default hook function is invoked for any future action. -func (f *UsersStoreListEmailsFunc) PushHook(hook func(context.Context, int64) ([]*db.EmailAddress, error)) { +func (f *UsersStoreListEmailsFunc) PushHook(hook func(context.Context, int64) ([]*database.EmailAddress, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -5739,20 +5739,20 @@ func (f *UsersStoreListEmailsFunc) PushHook(hook func(context.Context, int64) ([ // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *UsersStoreListEmailsFunc) SetDefaultReturn(r0 []*db.EmailAddress, r1 error) { - f.SetDefaultHook(func(context.Context, int64) ([]*db.EmailAddress, error) { +func (f *UsersStoreListEmailsFunc) SetDefaultReturn(r0 []*database.EmailAddress, r1 error) { + f.SetDefaultHook(func(context.Context, int64) ([]*database.EmailAddress, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *UsersStoreListEmailsFunc) PushReturn(r0 []*db.EmailAddress, r1 error) { - f.PushHook(func(context.Context, int64) ([]*db.EmailAddress, error) { +func (f *UsersStoreListEmailsFunc) PushReturn(r0 []*database.EmailAddress, r1 error) { + f.PushHook(func(context.Context, int64) ([]*database.EmailAddress, error) { return r0, r1 }) } -func (f *UsersStoreListEmailsFunc) nextHook() func(context.Context, int64) ([]*db.EmailAddress, error) { +func (f *UsersStoreListEmailsFunc) nextHook() func(context.Context, int64) ([]*database.EmailAddress, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -5793,7 +5793,7 @@ type UsersStoreListEmailsFuncCall struct { Arg1 int64 // Result0 is the value of the 1st result returned from this method // invocation. - Result0 []*db.EmailAddress + Result0 []*database.EmailAddress // Result1 is the value of the 2nd result returned from this method // invocation. Result1 error @@ -5814,15 +5814,15 @@ func (c UsersStoreListEmailsFuncCall) Results() []interface{} { // UsersStoreListFollowersFunc describes the behavior when the ListFollowers // method of the parent MockUsersStore instance is invoked. type UsersStoreListFollowersFunc struct { - defaultHook func(context.Context, int64, int, int) ([]*db.User, error) - hooks []func(context.Context, int64, int, int) ([]*db.User, error) + defaultHook func(context.Context, int64, int, int) ([]*database.User, error) + hooks []func(context.Context, int64, int, int) ([]*database.User, error) history []UsersStoreListFollowersFuncCall mutex sync.Mutex } // ListFollowers delegates to the next hook function in the queue and stores // the parameter and result values of this invocation. -func (m *MockUsersStore) ListFollowers(v0 context.Context, v1 int64, v2 int, v3 int) ([]*db.User, error) { +func (m *MockUsersStore) ListFollowers(v0 context.Context, v1 int64, v2 int, v3 int) ([]*database.User, error) { r0, r1 := m.ListFollowersFunc.nextHook()(v0, v1, v2, v3) m.ListFollowersFunc.appendCall(UsersStoreListFollowersFuncCall{v0, v1, v2, v3, r0, r1}) return r0, r1 @@ -5831,7 +5831,7 @@ func (m *MockUsersStore) ListFollowers(v0 context.Context, v1 int64, v2 int, v3 // SetDefaultHook sets function that is called when the ListFollowers method // of the parent MockUsersStore instance is invoked and the hook queue is // empty. -func (f *UsersStoreListFollowersFunc) SetDefaultHook(hook func(context.Context, int64, int, int) ([]*db.User, error)) { +func (f *UsersStoreListFollowersFunc) SetDefaultHook(hook func(context.Context, int64, int, int) ([]*database.User, error)) { f.defaultHook = hook } @@ -5839,7 +5839,7 @@ func (f *UsersStoreListFollowersFunc) SetDefaultHook(hook func(context.Context, // ListFollowers method of the parent MockUsersStore instance invokes the // hook at the front of the queue and discards it. After the queue is empty, // the default hook function is invoked for any future action. -func (f *UsersStoreListFollowersFunc) PushHook(hook func(context.Context, int64, int, int) ([]*db.User, error)) { +func (f *UsersStoreListFollowersFunc) PushHook(hook func(context.Context, int64, int, int) ([]*database.User, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -5847,20 +5847,20 @@ func (f *UsersStoreListFollowersFunc) PushHook(hook func(context.Context, int64, // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *UsersStoreListFollowersFunc) SetDefaultReturn(r0 []*db.User, r1 error) { - f.SetDefaultHook(func(context.Context, int64, int, int) ([]*db.User, error) { +func (f *UsersStoreListFollowersFunc) SetDefaultReturn(r0 []*database.User, r1 error) { + f.SetDefaultHook(func(context.Context, int64, int, int) ([]*database.User, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *UsersStoreListFollowersFunc) PushReturn(r0 []*db.User, r1 error) { - f.PushHook(func(context.Context, int64, int, int) ([]*db.User, error) { +func (f *UsersStoreListFollowersFunc) PushReturn(r0 []*database.User, r1 error) { + f.PushHook(func(context.Context, int64, int, int) ([]*database.User, error) { return r0, r1 }) } -func (f *UsersStoreListFollowersFunc) nextHook() func(context.Context, int64, int, int) ([]*db.User, error) { +func (f *UsersStoreListFollowersFunc) nextHook() func(context.Context, int64, int, int) ([]*database.User, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -5907,7 +5907,7 @@ type UsersStoreListFollowersFuncCall struct { Arg3 int // Result0 is the value of the 1st result returned from this method // invocation. - Result0 []*db.User + Result0 []*database.User // Result1 is the value of the 2nd result returned from this method // invocation. Result1 error @@ -5928,15 +5928,15 @@ func (c UsersStoreListFollowersFuncCall) Results() []interface{} { // UsersStoreListFollowingsFunc describes the behavior when the // ListFollowings method of the parent MockUsersStore instance is invoked. type UsersStoreListFollowingsFunc struct { - defaultHook func(context.Context, int64, int, int) ([]*db.User, error) - hooks []func(context.Context, int64, int, int) ([]*db.User, error) + defaultHook func(context.Context, int64, int, int) ([]*database.User, error) + hooks []func(context.Context, int64, int, int) ([]*database.User, error) history []UsersStoreListFollowingsFuncCall mutex sync.Mutex } // ListFollowings delegates to the next hook function in the queue and // stores the parameter and result values of this invocation. -func (m *MockUsersStore) ListFollowings(v0 context.Context, v1 int64, v2 int, v3 int) ([]*db.User, error) { +func (m *MockUsersStore) ListFollowings(v0 context.Context, v1 int64, v2 int, v3 int) ([]*database.User, error) { r0, r1 := m.ListFollowingsFunc.nextHook()(v0, v1, v2, v3) m.ListFollowingsFunc.appendCall(UsersStoreListFollowingsFuncCall{v0, v1, v2, v3, r0, r1}) return r0, r1 @@ -5945,7 +5945,7 @@ func (m *MockUsersStore) ListFollowings(v0 context.Context, v1 int64, v2 int, v3 // SetDefaultHook sets function that is called when the ListFollowings // method of the parent MockUsersStore instance is invoked and the hook // queue is empty. -func (f *UsersStoreListFollowingsFunc) SetDefaultHook(hook func(context.Context, int64, int, int) ([]*db.User, error)) { +func (f *UsersStoreListFollowingsFunc) SetDefaultHook(hook func(context.Context, int64, int, int) ([]*database.User, error)) { f.defaultHook = hook } @@ -5953,7 +5953,7 @@ func (f *UsersStoreListFollowingsFunc) SetDefaultHook(hook func(context.Context, // ListFollowings method of the parent MockUsersStore instance invokes the // hook at the front of the queue and discards it. After the queue is empty, // the default hook function is invoked for any future action. -func (f *UsersStoreListFollowingsFunc) PushHook(hook func(context.Context, int64, int, int) ([]*db.User, error)) { +func (f *UsersStoreListFollowingsFunc) PushHook(hook func(context.Context, int64, int, int) ([]*database.User, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -5961,20 +5961,20 @@ func (f *UsersStoreListFollowingsFunc) PushHook(hook func(context.Context, int64 // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *UsersStoreListFollowingsFunc) SetDefaultReturn(r0 []*db.User, r1 error) { - f.SetDefaultHook(func(context.Context, int64, int, int) ([]*db.User, error) { +func (f *UsersStoreListFollowingsFunc) SetDefaultReturn(r0 []*database.User, r1 error) { + f.SetDefaultHook(func(context.Context, int64, int, int) ([]*database.User, error) { return r0, r1 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *UsersStoreListFollowingsFunc) PushReturn(r0 []*db.User, r1 error) { - f.PushHook(func(context.Context, int64, int, int) ([]*db.User, error) { +func (f *UsersStoreListFollowingsFunc) PushReturn(r0 []*database.User, r1 error) { + f.PushHook(func(context.Context, int64, int, int) ([]*database.User, error) { return r0, r1 }) } -func (f *UsersStoreListFollowingsFunc) nextHook() func(context.Context, int64, int, int) ([]*db.User, error) { +func (f *UsersStoreListFollowingsFunc) nextHook() func(context.Context, int64, int, int) ([]*database.User, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -6021,7 +6021,7 @@ type UsersStoreListFollowingsFuncCall struct { Arg3 int // Result0 is the value of the 1st result returned from this method // invocation. - Result0 []*db.User + Result0 []*database.User // Result1 is the value of the 2nd result returned from this method // invocation. Result1 error @@ -6259,15 +6259,15 @@ func (c UsersStoreMarkEmailPrimaryFuncCall) Results() []interface{} { // UsersStoreSearchByNameFunc describes the behavior when the SearchByName // method of the parent MockUsersStore instance is invoked. type UsersStoreSearchByNameFunc struct { - defaultHook func(context.Context, string, int, int, string) ([]*db.User, int64, error) - hooks []func(context.Context, string, int, int, string) ([]*db.User, int64, error) + defaultHook func(context.Context, string, int, int, string) ([]*database.User, int64, error) + hooks []func(context.Context, string, int, int, string) ([]*database.User, int64, error) history []UsersStoreSearchByNameFuncCall mutex sync.Mutex } // SearchByName delegates to the next hook function in the queue and stores // the parameter and result values of this invocation. -func (m *MockUsersStore) SearchByName(v0 context.Context, v1 string, v2 int, v3 int, v4 string) ([]*db.User, int64, error) { +func (m *MockUsersStore) SearchByName(v0 context.Context, v1 string, v2 int, v3 int, v4 string) ([]*database.User, int64, error) { r0, r1, r2 := m.SearchByNameFunc.nextHook()(v0, v1, v2, v3, v4) m.SearchByNameFunc.appendCall(UsersStoreSearchByNameFuncCall{v0, v1, v2, v3, v4, r0, r1, r2}) return r0, r1, r2 @@ -6276,7 +6276,7 @@ func (m *MockUsersStore) SearchByName(v0 context.Context, v1 string, v2 int, v3 // SetDefaultHook sets function that is called when the SearchByName method // of the parent MockUsersStore instance is invoked and the hook queue is // empty. -func (f *UsersStoreSearchByNameFunc) SetDefaultHook(hook func(context.Context, string, int, int, string) ([]*db.User, int64, error)) { +func (f *UsersStoreSearchByNameFunc) SetDefaultHook(hook func(context.Context, string, int, int, string) ([]*database.User, int64, error)) { f.defaultHook = hook } @@ -6284,7 +6284,7 @@ func (f *UsersStoreSearchByNameFunc) SetDefaultHook(hook func(context.Context, s // SearchByName method of the parent MockUsersStore instance invokes the // hook at the front of the queue and discards it. After the queue is empty, // the default hook function is invoked for any future action. -func (f *UsersStoreSearchByNameFunc) PushHook(hook func(context.Context, string, int, int, string) ([]*db.User, int64, error)) { +func (f *UsersStoreSearchByNameFunc) PushHook(hook func(context.Context, string, int, int, string) ([]*database.User, int64, error)) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -6292,20 +6292,20 @@ func (f *UsersStoreSearchByNameFunc) PushHook(hook func(context.Context, string, // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. -func (f *UsersStoreSearchByNameFunc) SetDefaultReturn(r0 []*db.User, r1 int64, r2 error) { - f.SetDefaultHook(func(context.Context, string, int, int, string) ([]*db.User, int64, error) { +func (f *UsersStoreSearchByNameFunc) SetDefaultReturn(r0 []*database.User, r1 int64, r2 error) { + f.SetDefaultHook(func(context.Context, string, int, int, string) ([]*database.User, int64, error) { return r0, r1, r2 }) } // PushReturn calls PushHook with a function that returns the given values. -func (f *UsersStoreSearchByNameFunc) PushReturn(r0 []*db.User, r1 int64, r2 error) { - f.PushHook(func(context.Context, string, int, int, string) ([]*db.User, int64, error) { +func (f *UsersStoreSearchByNameFunc) PushReturn(r0 []*database.User, r1 int64, r2 error) { + f.PushHook(func(context.Context, string, int, int, string) ([]*database.User, int64, error) { return r0, r1, r2 }) } -func (f *UsersStoreSearchByNameFunc) nextHook() func(context.Context, string, int, int, string) ([]*db.User, int64, error) { +func (f *UsersStoreSearchByNameFunc) nextHook() func(context.Context, string, int, int, string) ([]*database.User, int64, error) { f.mutex.Lock() defer f.mutex.Unlock() @@ -6355,7 +6355,7 @@ type UsersStoreSearchByNameFuncCall struct { Arg4 string // Result0 is the value of the 1st result returned from this method // invocation. - Result0 []*db.User + Result0 []*database.User // Result1 is the value of the 2nd result returned from this method // invocation. Result1 int64 @@ -6487,15 +6487,15 @@ func (c UsersStoreUnfollowFuncCall) Results() []interface{} { // UsersStoreUpdateFunc describes the behavior when the Update method of the // parent MockUsersStore instance is invoked. type UsersStoreUpdateFunc struct { - defaultHook func(context.Context, int64, db.UpdateUserOptions) error - hooks []func(context.Context, int64, db.UpdateUserOptions) error + defaultHook func(context.Context, int64, database.UpdateUserOptions) error + hooks []func(context.Context, int64, database.UpdateUserOptions) error history []UsersStoreUpdateFuncCall mutex sync.Mutex } // Update delegates to the next hook function in the queue and stores the // parameter and result values of this invocation. -func (m *MockUsersStore) Update(v0 context.Context, v1 int64, v2 db.UpdateUserOptions) error { +func (m *MockUsersStore) Update(v0 context.Context, v1 int64, v2 database.UpdateUserOptions) error { r0 := m.UpdateFunc.nextHook()(v0, v1, v2) m.UpdateFunc.appendCall(UsersStoreUpdateFuncCall{v0, v1, v2, r0}) return r0 @@ -6503,7 +6503,7 @@ func (m *MockUsersStore) Update(v0 context.Context, v1 int64, v2 db.UpdateUserOp // SetDefaultHook sets function that is called when the Update method of the // parent MockUsersStore instance is invoked and the hook queue is empty. -func (f *UsersStoreUpdateFunc) SetDefaultHook(hook func(context.Context, int64, db.UpdateUserOptions) error) { +func (f *UsersStoreUpdateFunc) SetDefaultHook(hook func(context.Context, int64, database.UpdateUserOptions) error) { f.defaultHook = hook } @@ -6511,7 +6511,7 @@ func (f *UsersStoreUpdateFunc) SetDefaultHook(hook func(context.Context, int64, // Update method of the parent MockUsersStore instance invokes the hook at // the front of the queue and discards it. After the queue is empty, the // default hook function is invoked for any future action. -func (f *UsersStoreUpdateFunc) PushHook(hook func(context.Context, int64, db.UpdateUserOptions) error) { +func (f *UsersStoreUpdateFunc) PushHook(hook func(context.Context, int64, database.UpdateUserOptions) error) { f.mutex.Lock() f.hooks = append(f.hooks, hook) f.mutex.Unlock() @@ -6520,19 +6520,19 @@ func (f *UsersStoreUpdateFunc) PushHook(hook func(context.Context, int64, db.Upd // SetDefaultReturn calls SetDefaultHook with a function that returns the // given values. func (f *UsersStoreUpdateFunc) SetDefaultReturn(r0 error) { - f.SetDefaultHook(func(context.Context, int64, db.UpdateUserOptions) error { + f.SetDefaultHook(func(context.Context, int64, database.UpdateUserOptions) error { return r0 }) } // PushReturn calls PushHook with a function that returns the given values. func (f *UsersStoreUpdateFunc) PushReturn(r0 error) { - f.PushHook(func(context.Context, int64, db.UpdateUserOptions) error { + f.PushHook(func(context.Context, int64, database.UpdateUserOptions) error { return r0 }) } -func (f *UsersStoreUpdateFunc) nextHook() func(context.Context, int64, db.UpdateUserOptions) error { +func (f *UsersStoreUpdateFunc) nextHook() func(context.Context, int64, database.UpdateUserOptions) error { f.mutex.Lock() defer f.mutex.Unlock() @@ -6573,7 +6573,7 @@ type UsersStoreUpdateFuncCall struct { Arg1 int64 // Arg2 is the value of the 3rd argument passed to this method // invocation. - Arg2 db.UpdateUserOptions + Arg2 database.UpdateUserOptions // Result0 is the value of the 1st result returned from this method // invocation. Result0 error diff --git a/internal/route/lfs/route.go b/internal/route/lfs/route.go index 3440c89b0..25a2868d7 100644 --- a/internal/route/lfs/route.go +++ b/internal/route/lfs/route.go @@ -15,7 +15,7 @@ import ( "gogs.io/gogs/internal/authutil" "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/lfsutil" ) @@ -26,7 +26,7 @@ func RegisterRoutes(r *macaron.Router) { verifyContentTypeStream := verifyHeader("Content-Type", "application/octet-stream", http.StatusBadRequest) r.Group("", func() { - r.Post("/objects/batch", authorize(db.AccessModeRead), verifyAccept, verifyContentTypeJSON, serveBatch) + r.Post("/objects/batch", authorize(database.AccessModeRead), verifyAccept, verifyContentTypeJSON, serveBatch) r.Group("/objects/basic", func() { basic := &basicHandler{ defaultStorage: lfsutil.Storage(conf.LFS.Storage), @@ -35,9 +35,9 @@ func RegisterRoutes(r *macaron.Router) { }, } r.Combo("/:oid", verifyOID()). - Get(authorize(db.AccessModeRead), basic.serveDownload). - Put(authorize(db.AccessModeWrite), verifyContentTypeStream, basic.serveUpload) - r.Post("/verify", authorize(db.AccessModeWrite), verifyAccept, verifyContentTypeJSON, basic.serveVerify) + Get(authorize(database.AccessModeRead), basic.serveDownload). + Put(authorize(database.AccessModeWrite), verifyContentTypeStream, basic.serveUpload) + r.Post("/verify", authorize(database.AccessModeWrite), verifyAccept, verifyContentTypeJSON, basic.serveVerify) }) }, authenticate()) } @@ -59,14 +59,14 @@ func authenticate() macaron.Handler { return } - user, err := db.Users.Authenticate(c.Req.Context(), username, password, -1) + user, err := database.Users.Authenticate(c.Req.Context(), username, password, -1) if err != nil && !auth.IsErrBadCredentials(err) { internalServerError(c.Resp) log.Error("Failed to authenticate user [name: %s]: %v", username, err) return } - if err == nil && db.TwoFactors.IsEnabled(c.Req.Context(), user.ID) { + if err == nil && database.TwoFactors.IsEnabled(c.Req.Context(), user.ID) { c.Error(http.StatusBadRequest, "Users with 2FA enabled are not allowed to authenticate via username and password.") return } @@ -75,15 +75,15 @@ func authenticate() macaron.Handler { // or password as the token. if auth.IsErrBadCredentials(err) { user, err = context.AuthenticateByToken(c.Req.Context(), username) - if err != nil && !db.IsErrAccessTokenNotExist(err) { + if err != nil && !database.IsErrAccessTokenNotExist(err) { internalServerError(c.Resp) log.Error("Failed to authenticate by access token via username: %v", err) return - } else if db.IsErrAccessTokenNotExist(err) { + } else if database.IsErrAccessTokenNotExist(err) { // Try again using the password field as the token. user, err = context.AuthenticateByToken(c.Req.Context(), password) if err != nil { - if db.IsErrAccessTokenNotExist(err) { + if database.IsErrAccessTokenNotExist(err) { askCredentials(c.Resp) } else { c.Status(http.StatusInternalServerError) @@ -101,14 +101,14 @@ func authenticate() macaron.Handler { } // authorize tries to authorize the user to the context repository with given access mode. -func authorize(mode db.AccessMode) macaron.Handler { - return func(c *macaron.Context, actor *db.User) { +func authorize(mode database.AccessMode) macaron.Handler { + return func(c *macaron.Context, actor *database.User) { username := c.Params(":username") reponame := strings.TrimSuffix(c.Params(":reponame"), ".git") - owner, err := db.Users.GetByUsername(c.Req.Context(), username) + owner, err := database.Users.GetByUsername(c.Req.Context(), username) if err != nil { - if db.IsErrUserNotExist(err) { + if database.IsErrUserNotExist(err) { c.Status(http.StatusNotFound) } else { internalServerError(c.Resp) @@ -117,9 +117,9 @@ func authorize(mode db.AccessMode) macaron.Handler { return } - repo, err := db.Repos.GetByName(c.Req.Context(), owner.ID, reponame) + repo, err := database.Repos.GetByName(c.Req.Context(), owner.ID, reponame) if err != nil { - if db.IsErrRepoNotExist(err) { + if database.IsErrRepoNotExist(err) { c.Status(http.StatusNotFound) } else { internalServerError(c.Resp) @@ -128,8 +128,8 @@ func authorize(mode db.AccessMode) macaron.Handler { return } - if !db.Perms.Authorize(c.Req.Context(), actor.ID, repo.ID, mode, - db.AccessModeOptions{ + if !database.Perms.Authorize(c.Req.Context(), actor.ID, repo.ID, mode, + database.AccessModeOptions{ OwnerID: repo.OwnerID, Private: repo.IsPrivate, }, diff --git a/internal/route/lfs/route_test.go b/internal/route/lfs/route_test.go index 9ce078465..8ff589531 100644 --- a/internal/route/lfs/route_test.go +++ b/internal/route/lfs/route_test.go @@ -16,23 +16,23 @@ import ( "gopkg.in/macaron.v1" "gogs.io/gogs/internal/auth" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/lfsutil" ) func Test_authenticate(t *testing.T) { m := macaron.New() m.Use(macaron.Renderer()) - m.Get("/", authenticate(), func(w http.ResponseWriter, user *db.User) { + m.Get("/", authenticate(), func(w http.ResponseWriter, user *database.User) { _, _ = fmt.Fprintf(w, "ID: %d, Name: %s", user.ID, user.Name) }) tests := []struct { name string header http.Header - mockUsersStore func() db.UsersStore - mockTwoFactorsStore func() db.TwoFactorsStore - mockAccessTokensStore func() db.AccessTokensStore + mockUsersStore func() database.UsersStore + mockTwoFactorsStore func() database.TwoFactorsStore + mockAccessTokensStore func() database.AccessTokensStore expStatusCode int expHeader http.Header expBody string @@ -51,12 +51,12 @@ func Test_authenticate(t *testing.T) { header: http.Header{ "Authorization": []string{"Basic dXNlcm5hbWU6cGFzc3dvcmQ="}, }, - mockUsersStore: func() db.UsersStore { + mockUsersStore: func() database.UsersStore { mock := NewMockUsersStore() - mock.AuthenticateFunc.SetDefaultReturn(&db.User{}, nil) + mock.AuthenticateFunc.SetDefaultReturn(&database.User{}, nil) return mock }, - mockTwoFactorsStore: func() db.TwoFactorsStore { + mockTwoFactorsStore: func() database.TwoFactorsStore { mock := NewMockTwoFactorsStore() mock.IsEnabledFunc.SetDefaultReturn(true) return mock @@ -70,14 +70,14 @@ func Test_authenticate(t *testing.T) { header: http.Header{ "Authorization": []string{"Basic dXNlcm5hbWU="}, }, - mockUsersStore: func() db.UsersStore { + mockUsersStore: func() database.UsersStore { mock := NewMockUsersStore() mock.AuthenticateFunc.SetDefaultReturn(nil, auth.ErrBadCredentials{}) return mock }, - mockAccessTokensStore: func() db.AccessTokensStore { + mockAccessTokensStore: func() database.AccessTokensStore { mock := NewMockAccessTokensStore() - mock.GetBySHA1Func.SetDefaultReturn(nil, db.ErrAccessTokenNotExist{}) + mock.GetBySHA1Func.SetDefaultReturn(nil, database.ErrAccessTokenNotExist{}) return mock }, expStatusCode: http.StatusUnauthorized, @@ -93,12 +93,12 @@ func Test_authenticate(t *testing.T) { header: http.Header{ "Authorization": []string{"Basic dXNlcm5hbWU6cGFzc3dvcmQ="}, }, - mockUsersStore: func() db.UsersStore { + mockUsersStore: func() database.UsersStore { mock := NewMockUsersStore() - mock.AuthenticateFunc.SetDefaultReturn(&db.User{ID: 1, Name: "unknwon"}, nil) + mock.AuthenticateFunc.SetDefaultReturn(&database.User{ID: 1, Name: "unknwon"}, nil) return mock }, - mockTwoFactorsStore: func() db.TwoFactorsStore { + mockTwoFactorsStore: func() database.TwoFactorsStore { mock := NewMockTwoFactorsStore() mock.IsEnabledFunc.SetDefaultReturn(false) return mock @@ -112,15 +112,15 @@ func Test_authenticate(t *testing.T) { header: http.Header{ "Authorization": []string{"Basic dXNlcm5hbWU="}, }, - mockUsersStore: func() db.UsersStore { + mockUsersStore: func() database.UsersStore { mock := NewMockUsersStore() mock.AuthenticateFunc.SetDefaultReturn(nil, auth.ErrBadCredentials{}) - mock.GetByIDFunc.SetDefaultReturn(&db.User{ID: 1, Name: "unknwon"}, nil) + mock.GetByIDFunc.SetDefaultReturn(&database.User{ID: 1, Name: "unknwon"}, nil) return mock }, - mockAccessTokensStore: func() db.AccessTokensStore { + mockAccessTokensStore: func() database.AccessTokensStore { mock := NewMockAccessTokensStore() - mock.GetBySHA1Func.SetDefaultReturn(&db.AccessToken{}, nil) + mock.GetBySHA1Func.SetDefaultReturn(&database.AccessToken{}, nil) return mock }, expStatusCode: http.StatusOK, @@ -132,19 +132,19 @@ func Test_authenticate(t *testing.T) { header: http.Header{ "Authorization": []string{"Basic dXNlcm5hbWU6cGFzc3dvcmQ="}, }, - mockUsersStore: func() db.UsersStore { + mockUsersStore: func() database.UsersStore { mock := NewMockUsersStore() mock.AuthenticateFunc.SetDefaultReturn(nil, auth.ErrBadCredentials{}) - mock.GetByIDFunc.SetDefaultReturn(&db.User{ID: 1, Name: "unknwon"}, nil) + mock.GetByIDFunc.SetDefaultReturn(&database.User{ID: 1, Name: "unknwon"}, nil) return mock }, - mockAccessTokensStore: func() db.AccessTokensStore { + mockAccessTokensStore: func() database.AccessTokensStore { mock := NewMockAccessTokensStore() - mock.GetBySHA1Func.SetDefaultHook(func(ctx context.Context, sha1 string) (*db.AccessToken, error) { + mock.GetBySHA1Func.SetDefaultHook(func(ctx context.Context, sha1 string) (*database.AccessToken, error) { if sha1 == "password" { - return &db.AccessToken{}, nil + return &database.AccessToken{}, nil } - return nil, db.ErrAccessTokenNotExist{} + return nil, database.ErrAccessTokenNotExist{} }) return mock }, @@ -156,13 +156,13 @@ func Test_authenticate(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { if test.mockUsersStore != nil { - db.SetMockUsersStore(t, test.mockUsersStore()) + database.SetMockUsersStore(t, test.mockUsersStore()) } if test.mockTwoFactorsStore != nil { - db.SetMockTwoFactorsStore(t, test.mockTwoFactorsStore()) + database.SetMockTwoFactorsStore(t, test.mockTwoFactorsStore()) } if test.mockAccessTokensStore != nil { - db.SetMockAccessTokensStore(t, test.mockAccessTokensStore()) + database.SetMockAccessTokensStore(t, test.mockAccessTokensStore()) } r, err := http.NewRequest("GET", "/", nil) @@ -191,60 +191,60 @@ func Test_authorize(t *testing.T) { tests := []struct { name string authroize macaron.Handler - mockUsersStore func() db.UsersStore - mockReposStore func() db.ReposStore - mockPermsStore func() db.PermsStore + mockUsersStore func() database.UsersStore + mockReposStore func() database.ReposStore + mockPermsStore func() database.PermsStore expStatusCode int expBody string }{ { name: "user does not exist", - authroize: authorize(db.AccessModeNone), - mockUsersStore: func() db.UsersStore { + authroize: authorize(database.AccessModeNone), + mockUsersStore: func() database.UsersStore { mock := NewMockUsersStore() - mock.GetByUsernameFunc.SetDefaultReturn(nil, db.ErrUserNotExist{}) + mock.GetByUsernameFunc.SetDefaultReturn(nil, database.ErrUserNotExist{}) return mock }, expStatusCode: http.StatusNotFound, }, { name: "repository does not exist", - authroize: authorize(db.AccessModeNone), - mockUsersStore: func() db.UsersStore { + authroize: authorize(database.AccessModeNone), + mockUsersStore: func() database.UsersStore { mock := NewMockUsersStore() - mock.GetByUsernameFunc.SetDefaultHook(func(ctx context.Context, username string) (*db.User, error) { - return &db.User{Name: username}, nil + mock.GetByUsernameFunc.SetDefaultHook(func(ctx context.Context, username string) (*database.User, error) { + return &database.User{Name: username}, nil }) return mock }, - mockReposStore: func() db.ReposStore { + mockReposStore: func() database.ReposStore { mock := NewMockReposStore() - mock.GetByNameFunc.SetDefaultReturn(nil, db.ErrRepoNotExist{}) + mock.GetByNameFunc.SetDefaultReturn(nil, database.ErrRepoNotExist{}) return mock }, expStatusCode: http.StatusNotFound, }, { name: "actor is not authorized", - authroize: authorize(db.AccessModeWrite), - mockUsersStore: func() db.UsersStore { + authroize: authorize(database.AccessModeWrite), + mockUsersStore: func() database.UsersStore { mock := NewMockUsersStore() - mock.GetByUsernameFunc.SetDefaultHook(func(ctx context.Context, username string) (*db.User, error) { - return &db.User{Name: username}, nil + mock.GetByUsernameFunc.SetDefaultHook(func(ctx context.Context, username string) (*database.User, error) { + return &database.User{Name: username}, nil }) return mock }, - mockReposStore: func() db.ReposStore { + mockReposStore: func() database.ReposStore { mock := NewMockReposStore() - mock.GetByNameFunc.SetDefaultHook(func(ctx context.Context, ownerID int64, name string) (*db.Repository, error) { - return &db.Repository{Name: name}, nil + mock.GetByNameFunc.SetDefaultHook(func(ctx context.Context, ownerID int64, name string) (*database.Repository, error) { + return &database.Repository{Name: name}, nil }) return mock }, - mockPermsStore: func() db.PermsStore { + mockPermsStore: func() database.PermsStore { mock := NewMockPermsStore() - mock.AuthorizeFunc.SetDefaultHook(func(ctx context.Context, userID int64, repoID int64, desired db.AccessMode, opts db.AccessModeOptions) bool { - return desired <= db.AccessModeRead + mock.AuthorizeFunc.SetDefaultHook(func(ctx context.Context, userID int64, repoID int64, desired database.AccessMode, opts database.AccessModeOptions) bool { + return desired <= database.AccessModeRead }) return mock }, @@ -253,25 +253,25 @@ func Test_authorize(t *testing.T) { { name: "actor is authorized", - authroize: authorize(db.AccessModeRead), - mockUsersStore: func() db.UsersStore { + authroize: authorize(database.AccessModeRead), + mockUsersStore: func() database.UsersStore { mock := NewMockUsersStore() - mock.GetByUsernameFunc.SetDefaultHook(func(ctx context.Context, username string) (*db.User, error) { - return &db.User{Name: username}, nil + mock.GetByUsernameFunc.SetDefaultHook(func(ctx context.Context, username string) (*database.User, error) { + return &database.User{Name: username}, nil }) return mock }, - mockReposStore: func() db.ReposStore { + mockReposStore: func() database.ReposStore { mock := NewMockReposStore() - mock.GetByNameFunc.SetDefaultHook(func(ctx context.Context, ownerID int64, name string) (*db.Repository, error) { - return &db.Repository{Name: name}, nil + mock.GetByNameFunc.SetDefaultHook(func(ctx context.Context, ownerID int64, name string) (*database.Repository, error) { + return &database.Repository{Name: name}, nil }) return mock }, - mockPermsStore: func() db.PermsStore { + mockPermsStore: func() database.PermsStore { mock := NewMockPermsStore() - mock.AuthorizeFunc.SetDefaultHook(func(ctx context.Context, userID int64, repoID int64, desired db.AccessMode, opts db.AccessModeOptions) bool { - return desired <= db.AccessModeRead + mock.AuthorizeFunc.SetDefaultHook(func(ctx context.Context, userID int64, repoID int64, desired database.AccessMode, opts database.AccessModeOptions) bool { + return desired <= database.AccessModeRead }) return mock }, @@ -282,21 +282,21 @@ func Test_authorize(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { if test.mockUsersStore != nil { - db.SetMockUsersStore(t, test.mockUsersStore()) + database.SetMockUsersStore(t, test.mockUsersStore()) } if test.mockReposStore != nil { - db.SetMockReposStore(t, test.mockReposStore()) + database.SetMockReposStore(t, test.mockReposStore()) } if test.mockPermsStore != nil { - db.SetMockPermsStore(t, test.mockPermsStore()) + database.SetMockPermsStore(t, test.mockPermsStore()) } m := macaron.New() m.Use(macaron.Renderer()) m.Use(func(c *macaron.Context) { - c.Map(&db.User{}) + c.Map(&database.User{}) }) - m.Get("/:username/:reponame", test.authroize, func(w http.ResponseWriter, owner *db.User, repo *db.Repository) { + m.Get("/:username/:reponame", test.authroize, func(w http.ResponseWriter, owner *database.User, repo *database.Repository) { fmt.Fprintf(w, "owner.Name: %s, repo.Name: %s", owner.Name, repo.Name) }) diff --git a/internal/route/org/members.go b/internal/route/org/members.go index b53034e43..ef473de9c 100644 --- a/internal/route/org/members.go +++ b/internal/route/org/members.go @@ -10,7 +10,7 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) const ( @@ -47,27 +47,27 @@ func MembersAction(c *context.Context) { c.NotFound() return } - err = db.ChangeOrgUserStatus(org.ID, uid, false) + err = database.ChangeOrgUserStatus(org.ID, uid, false) case "public": if c.User.ID != uid && !c.Org.IsOwner { c.NotFound() return } - err = db.ChangeOrgUserStatus(org.ID, uid, true) + err = database.ChangeOrgUserStatus(org.ID, uid, true) case "remove": if !c.Org.IsOwner { c.NotFound() return } err = org.RemoveMember(uid) - if db.IsErrLastOrgOwner(err) { + if database.IsErrLastOrgOwner(err) { c.Flash.Error(c.Tr("form.last_org_owner")) c.Redirect(c.Org.OrgLink + "/members") return } case "leave": err = org.RemoveMember(c.User.ID) - if db.IsErrLastOrgOwner(err) { + if database.IsErrLastOrgOwner(err) { c.Flash.Error(c.Tr("form.last_org_owner")) c.Redirect(c.Org.OrgLink + "/members") return @@ -97,9 +97,9 @@ func Invitation(c *context.Context) { if c.Req.Method == "POST" { uname := c.Query("uname") - u, err := db.Users.GetByUsername(c.Req.Context(), uname) + u, err := database.Users.GetByUsername(c.Req.Context(), uname) if err != nil { - if db.IsErrUserNotExist(err) { + if database.IsErrUserNotExist(err) { c.Flash.Error(c.Tr("form.user_not_exist")) c.Redirect(c.Org.OrgLink + "/invitations/new") } else { diff --git a/internal/route/org/org.go b/internal/route/org/org.go index badd0d81d..1692682fb 100644 --- a/internal/route/org/org.go +++ b/internal/route/org/org.go @@ -8,7 +8,7 @@ import ( log "unknwon.dev/clog/v2" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/form" ) @@ -29,19 +29,19 @@ func CreatePost(c *context.Context, f form.CreateOrg) { return } - org := &db.User{ + org := &database.User{ Name: f.OrgName, IsActive: true, - Type: db.UserTypeOrganization, + Type: database.UserTypeOrganization, } - if err := db.CreateOrganization(org, c.User); err != nil { + if err := database.CreateOrganization(org, c.User); err != nil { c.Data["Err_OrgName"] = true switch { - case db.IsErrUserAlreadyExist(err): + case database.IsErrUserAlreadyExist(err): c.RenderWithErr(c.Tr("form.org_name_been_taken"), CREATE, &f) - case db.IsErrNameNotAllowed(err): - c.RenderWithErr(c.Tr("org.form.name_not_allowed", err.(db.ErrNameNotAllowed).Value()), CREATE, &f) + case database.IsErrNameNotAllowed(err): + c.RenderWithErr(c.Tr("org.form.name_not_allowed", err.(database.ErrNameNotAllowed).Value()), CREATE, &f) default: c.Error(err, "create organization") } diff --git a/internal/route/org/setting.go b/internal/route/org/setting.go index e632e8a7a..d8f89c5cb 100644 --- a/internal/route/org/setting.go +++ b/internal/route/org/setting.go @@ -10,7 +10,7 @@ import ( "gogs.io/gogs/internal/auth" "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/form" "gogs.io/gogs/internal/route/user" ) @@ -39,15 +39,15 @@ func SettingsPost(c *context.Context, f form.UpdateOrgSetting) { // Check if the organization username (including cases) had been changed if org.Name != f.Name { - err := db.Users.ChangeUsername(c.Req.Context(), c.Org.Organization.ID, f.Name) + err := database.Users.ChangeUsername(c.Req.Context(), c.Org.Organization.ID, f.Name) if err != nil { c.Data["OrgName"] = true var msg string switch { - case db.IsErrUserAlreadyExist(err): + case database.IsErrUserAlreadyExist(err): msg = c.Tr("form.username_been_taken") - case db.IsErrNameNotAllowed(err): - msg = c.Tr("user.form.name_not_allowed", err.(db.ErrNameNotAllowed).Value()) + case database.IsErrNameNotAllowed(err): + msg = c.Tr("user.form.name_not_allowed", err.(database.ErrNameNotAllowed).Value()) default: c.Error(err, "change organization name") return @@ -62,7 +62,7 @@ func SettingsPost(c *context.Context, f form.UpdateOrgSetting) { log.Trace("Organization name changed: %s -> %s", org.Name, f.Name) } - opts := db.UpdateUserOptions{ + opts := database.UpdateUserOptions{ FullName: &f.FullName, Website: &f.Website, Location: &f.Location, @@ -71,7 +71,7 @@ func SettingsPost(c *context.Context, f form.UpdateOrgSetting) { if c.User.IsAdmin { opts.MaxRepoCreation = &f.MaxRepoCreation } - err := db.Users.Update(c.Req.Context(), c.Org.Organization.ID, opts) + err := database.Users.Update(c.Req.Context(), c.Org.Organization.ID, opts) if err != nil { c.Error(err, "update organization") return @@ -93,7 +93,7 @@ func SettingsAvatar(c *context.Context, f form.Avatar) { } func SettingsDeleteAvatar(c *context.Context) { - if err := db.Users.DeleteCustomAvatar(c.Req.Context(), c.Org.Organization.ID); err != nil { + if err := database.Users.DeleteCustomAvatar(c.Req.Context(), c.Org.Organization.ID); err != nil { c.Flash.Error(err.Error()) } @@ -106,7 +106,7 @@ func SettingsDelete(c *context.Context) { org := c.Org.Organization if c.Req.Method == "POST" { - if _, err := db.Users.Authenticate(c.Req.Context(), c.User.Name, c.Query("password"), c.User.LoginSource); err != nil { + if _, err := database.Users.Authenticate(c.Req.Context(), c.User.Name, c.Query("password"), c.User.LoginSource); err != nil { if auth.IsErrBadCredentials(err) { c.RenderWithErr(c.Tr("form.enterred_invalid_password"), SETTINGS_DELETE, nil) } else { @@ -115,8 +115,8 @@ func SettingsDelete(c *context.Context) { return } - if err := db.DeleteOrganization(org); err != nil { - if db.IsErrUserOwnRepos(err) { + if err := database.DeleteOrganization(org); err != nil { + if database.IsErrUserOwnRepos(err) { c.Flash.Error(c.Tr("form.org_still_own_repo")) c.Redirect(c.Org.OrgLink + "/settings/delete") } else { diff --git a/internal/route/org/teams.go b/internal/route/org/teams.go index b99b0a1b8..919c0d4f1 100644 --- a/internal/route/org/teams.go +++ b/internal/route/org/teams.go @@ -12,7 +12,7 @@ import ( log "unknwon.dev/clog/v2" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/form" ) @@ -70,10 +70,10 @@ func TeamsAction(c *context.Context) { return } uname := c.Query("uname") - var u *db.User - u, err = db.Users.GetByUsername(c.Req.Context(), uname) + var u *database.User + u, err = database.Users.GetByUsername(c.Req.Context(), uname) if err != nil { - if db.IsErrUserNotExist(err) { + if database.IsErrUserNotExist(err) { c.Flash.Error(c.Tr("form.user_not_exist")) c.Redirect(c.Org.OrgLink + "/teams/" + c.Org.Team.LowerName) } else { @@ -87,7 +87,7 @@ func TeamsAction(c *context.Context) { } if err != nil { - if db.IsErrLastOrgOwner(err) { + if database.IsErrLastOrgOwner(err) { c.Flash.Error(c.Tr("form.last_org_owner")) } else { log.Error("Action(%s): %v", c.Params(":action"), err) @@ -117,10 +117,10 @@ func TeamsRepoAction(c *context.Context) { switch c.Params(":action") { case "add": repoName := path.Base(c.Query("repo_name")) - var repo *db.Repository - repo, err = db.GetRepositoryByName(c.Org.Organization.ID, repoName) + var repo *database.Repository + repo, err = database.GetRepositoryByName(c.Org.Organization.ID, repoName) if err != nil { - if db.IsErrRepoNotExist(err) { + if database.IsErrRepoNotExist(err) { c.Flash.Error(c.Tr("org.teams.add_nonexistent_repo")) c.Redirect(c.Org.OrgLink + "/teams/" + c.Org.Team.LowerName + "/repositories") return @@ -145,7 +145,7 @@ func NewTeam(c *context.Context) { c.Data["Title"] = c.Org.Organization.FullName c.Data["PageIsOrgTeams"] = true c.Data["PageIsOrgTeamsNew"] = true - c.Data["Team"] = &db.Team{} + c.Data["Team"] = &database.Team{} c.Success(TEAM_NEW) } @@ -154,11 +154,11 @@ func NewTeamPost(c *context.Context, f form.CreateTeam) { c.Data["PageIsOrgTeams"] = true c.Data["PageIsOrgTeamsNew"] = true - t := &db.Team{ + t := &database.Team{ OrgID: c.Org.Organization.ID, Name: f.TeamName, Description: f.Description, - Authorize: db.ParseAccessMode(f.Permission), + Authorize: database.ParseAccessMode(f.Permission), } c.Data["Team"] = t @@ -167,13 +167,13 @@ func NewTeamPost(c *context.Context, f form.CreateTeam) { return } - if err := db.NewTeam(t); err != nil { + if err := database.NewTeam(t); err != nil { c.Data["Err_TeamName"] = true switch { - case db.IsErrTeamAlreadyExist(err): + case database.IsErrTeamAlreadyExist(err): c.RenderWithErr(c.Tr("form.team_name_been_taken"), TEAM_NEW, &f) - case db.IsErrNameNotAllowed(err): - c.RenderWithErr(c.Tr("org.form.team_name_not_allowed", err.(db.ErrNameNotAllowed).Value()), TEAM_NEW, &f) + case database.IsErrNameNotAllowed(err): + c.RenderWithErr(c.Tr("org.form.team_name_not_allowed", err.(database.ErrNameNotAllowed).Value()), TEAM_NEW, &f) default: c.Error(err, "new team") } @@ -225,14 +225,14 @@ func EditTeamPost(c *context.Context, f form.CreateTeam) { isAuthChanged := false if !t.IsOwnerTeam() { // Validate permission level. - var auth db.AccessMode + var auth database.AccessMode switch f.Permission { case "read": - auth = db.AccessModeRead + auth = database.AccessModeRead case "write": - auth = db.AccessModeWrite + auth = database.AccessModeWrite case "admin": - auth = db.AccessModeAdmin + auth = database.AccessModeAdmin default: c.Status(http.StatusUnauthorized) return @@ -245,10 +245,10 @@ func EditTeamPost(c *context.Context, f form.CreateTeam) { } } t.Description = f.Description - if err := db.UpdateTeam(t, isAuthChanged); err != nil { + if err := database.UpdateTeam(t, isAuthChanged); err != nil { c.Data["Err_TeamName"] = true switch { - case db.IsErrTeamAlreadyExist(err): + case database.IsErrTeamAlreadyExist(err): c.RenderWithErr(c.Tr("form.team_name_been_taken"), TEAM_NEW, &f) default: c.Error(err, "update team") @@ -259,7 +259,7 @@ func EditTeamPost(c *context.Context, f form.CreateTeam) { } func DeleteTeam(c *context.Context) { - if err := db.DeleteTeam(c.Org.Team); err != nil { + if err := database.DeleteTeam(c.Org.Team); err != nil { c.Flash.Error("DeleteTeam: " + err.Error()) } else { c.Flash.Success(c.Tr("org.teams.delete_team_success")) diff --git a/internal/route/repo/branch.go b/internal/route/repo/branch.go index 9da017e03..bca7fe5f9 100644 --- a/internal/route/repo/branch.go +++ b/internal/route/repo/branch.go @@ -13,7 +13,7 @@ import ( api "github.com/gogs/go-gogs-client" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/tool" ) @@ -35,7 +35,7 @@ func loadBranches(c *context.Context) []*Branch { return nil } - protectBranches, err := db.GetProtectBranchesByRepoID(c.Repo.Repository.ID) + protectBranches, err := database.GetProtectBranchesByRepoID(c.Repo.Repository.ID) if err != nil { c.Error(err, "get protect branches by repository ID") return nil @@ -142,14 +142,14 @@ func DeleteBranchPost(c *context.Context) { return } - if err := db.PrepareWebhooks(c.Repo.Repository, db.HOOK_EVENT_DELETE, &api.DeletePayload{ + if err := database.PrepareWebhooks(c.Repo.Repository, database.HOOK_EVENT_DELETE, &api.DeletePayload{ Ref: branchName, RefType: "branch", PusherType: api.PUSHER_TYPE_USER, Repo: c.Repo.Repository.APIFormatLegacy(nil), Sender: c.User.APIFormat(), }); err != nil { - log.Error("Failed to prepare webhooks for %q: %v", db.HOOK_EVENT_DELETE, err) + log.Error("Failed to prepare webhooks for %q: %v", database.HOOK_EVENT_DELETE, err) return } } diff --git a/internal/route/repo/commit.go b/internal/route/repo/commit.go index b2be6d5bf..55dac6aec 100644 --- a/internal/route/repo/commit.go +++ b/internal/route/repo/commit.go @@ -13,7 +13,7 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/gitutil" "gogs.io/gogs/internal/tool" ) @@ -113,8 +113,8 @@ func FileHistory(c *context.Context) { // tryGetUserByEmail returns a non-nil value if the email is corresponding to an // existing user. -func tryGetUserByEmail(ctx gocontext.Context, email string) *db.User { - user, _ := db.Users.GetByEmail(ctx, email) +func tryGetUserByEmail(ctx gocontext.Context, email string) *database.User { + user, _ := database.Users.GetByEmail(ctx, email) return user } @@ -189,18 +189,18 @@ func RawDiff(c *context.Context) { } type userCommit struct { - User *db.User + User *database.User *git.Commit } // matchUsersWithCommitEmails matches existing users using commit author emails. func matchUsersWithCommitEmails(ctx gocontext.Context, oldCommits []*git.Commit) []*userCommit { - emailToUsers := make(map[string]*db.User) + emailToUsers := make(map[string]*database.User) newCommits := make([]*userCommit, len(oldCommits)) for i := range oldCommits { - var u *db.User + var u *database.User if v, ok := emailToUsers[oldCommits[i].Author.Email]; !ok { - u, _ = db.Users.GetByEmail(ctx, oldCommits[i].Author.Email) + u, _ = database.Users.GetByEmail(ctx, oldCommits[i].Author.Email) emailToUsers[oldCommits[i].Author.Email] = u } else { u = v diff --git a/internal/route/repo/editor.go b/internal/route/repo/editor.go index bc9e30de7..c5dbecbea 100644 --- a/internal/route/repo/editor.go +++ b/internal/route/repo/editor.go @@ -14,8 +14,8 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" - "gogs.io/gogs/internal/db/errors" + "gogs.io/gogs/internal/database" + "gogs.io/gogs/internal/database/errors" "gogs.io/gogs/internal/form" "gogs.io/gogs/internal/gitutil" "gogs.io/gogs/internal/pathutil" @@ -261,7 +261,7 @@ func editFilePost(c *context.Context, f form.EditRepoFile, isNewFile bool) { message += "\n\n" + f.CommitMessage } - if err := c.Repo.Repository.UpdateRepoFile(c.User, db.UpdateRepoFileOptions{ + if err := c.Repo.Repository.UpdateRepoFile(c.User, database.UpdateRepoFileOptions{ OldBranch: oldBranchName, NewBranch: branchName, OldTreeName: oldTreePath, @@ -370,7 +370,7 @@ func DeleteFilePost(c *context.Context, f form.DeleteRepoFile) { message += "\n\n" + f.CommitMessage } - if err := c.Repo.Repository.DeleteRepoFile(c.User, db.DeleteRepoFileOptions{ + if err := c.Repo.Repository.DeleteRepoFile(c.User, database.DeleteRepoFileOptions{ LastCommitID: c.Repo.CommitID, OldBranch: oldBranchName, NewBranch: branchName, @@ -489,7 +489,7 @@ func UploadFilePost(c *context.Context, f form.UploadRepoFile) { message += "\n\n" + f.CommitMessage } - if err := c.Repo.Repository.UploadRepoFiles(c.User, db.UploadRepoFileOptions{ + if err := c.Repo.Repository.UploadRepoFiles(c.User, database.UploadRepoFileOptions{ LastCommitID: c.Repo.CommitID, OldBranch: oldBranchName, NewBranch: branchName, @@ -541,7 +541,7 @@ func UploadFileToServer(c *context.Context) { } } - upload, err := db.NewUpload(header.Filename, buf, file) + upload, err := database.NewUpload(header.Filename, buf, file) if err != nil { c.Error(err, "new upload") return @@ -559,7 +559,7 @@ func RemoveUploadFileFromServer(c *context.Context, f form.RemoveUploadFile) { return } - if err := db.DeleteUploadByUUID(f.File); err != nil { + if err := database.DeleteUploadByUUID(f.File); err != nil { c.Error(err, "delete upload by UUID") return } diff --git a/internal/route/repo/http.go b/internal/route/repo/http.go index 96ac22e07..3232fb3ff 100644 --- a/internal/route/repo/http.go +++ b/internal/route/repo/http.go @@ -23,7 +23,7 @@ import ( "gogs.io/gogs/internal/auth" "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/lazyregexp" "gogs.io/gogs/internal/pathutil" "gogs.io/gogs/internal/tool" @@ -35,7 +35,7 @@ type HTTPContext struct { OwnerSalt string RepoID int64 RepoName string - AuthUser *db.User + AuthUser *database.User } // askCredentials responses HTTP header and status which informs client to provide credentials. @@ -66,9 +66,9 @@ func HTTPContexter() macaron.Handler { strings.HasSuffix(c.Req.URL.Path, "git-upload-pack") || c.Req.Method == "GET" - owner, err := db.Users.GetByUsername(c.Req.Context(), ownerName) + owner, err := database.Users.GetByUsername(c.Req.Context(), ownerName) if err != nil { - if db.IsErrUserNotExist(err) { + if database.IsErrUserNotExist(err) { c.Status(http.StatusNotFound) } else { c.Status(http.StatusInternalServerError) @@ -77,9 +77,9 @@ func HTTPContexter() macaron.Handler { return } - repo, err := db.Repos.GetByName(c.Req.Context(), owner.ID, repoName) + repo, err := database.Repos.GetByName(c.Req.Context(), owner.ID, repoName) if err != nil { - if db.IsErrRepoNotExist(err) { + if database.IsErrRepoNotExist(err) { c.Status(http.StatusNotFound) } else { c.Status(http.StatusInternalServerError) @@ -124,7 +124,7 @@ func HTTPContexter() macaron.Handler { return } - authUser, err := db.Users.Authenticate(c.Req.Context(), authUsername, authPassword, -1) + authUser, err := database.Users.Authenticate(c.Req.Context(), authUsername, authPassword, -1) if err != nil && !auth.IsErrBadCredentials(err) { c.Status(http.StatusInternalServerError) log.Error("Failed to authenticate user [name: %s]: %v", authUsername, err) @@ -135,15 +135,15 @@ func HTTPContexter() macaron.Handler { // or password as the token. if authUser == nil { authUser, err = context.AuthenticateByToken(c.Req.Context(), authUsername) - if err != nil && !db.IsErrAccessTokenNotExist(err) { + if err != nil && !database.IsErrAccessTokenNotExist(err) { c.Status(http.StatusInternalServerError) log.Error("Failed to authenticate by access token via username: %v", err) return - } else if db.IsErrAccessTokenNotExist(err) { + } else if database.IsErrAccessTokenNotExist(err) { // Try again using the password field as the token. authUser, err = context.AuthenticateByToken(c.Req.Context(), authPassword) if err != nil { - if db.IsErrAccessTokenNotExist(err) { + if database.IsErrAccessTokenNotExist(err) { askCredentials(c, http.StatusUnauthorized, "") } else { c.Status(http.StatusInternalServerError) @@ -152,7 +152,7 @@ func HTTPContexter() macaron.Handler { return } } - } else if db.TwoFactors.IsEnabled(c.Req.Context(), authUser.ID) { + } else if database.TwoFactors.IsEnabled(c.Req.Context(), authUser.ID) { askCredentials(c, http.StatusUnauthorized, `User with two-factor authentication enabled cannot perform HTTP/HTTPS operations via plain username and password Please create and use personal access token on user settings page`) return @@ -160,12 +160,12 @@ Please create and use personal access token on user settings page`) log.Trace("[Git] Authenticated user: %s", authUser.Name) - mode := db.AccessModeWrite + mode := database.AccessModeWrite if isPull { - mode = db.AccessModeRead + mode = database.AccessModeRead } - if !db.Perms.Authorize(c.Req.Context(), authUser.ID, repo.ID, mode, - db.AccessModeOptions{ + if !database.Perms.Authorize(c.Req.Context(), authUser.ID, repo.ID, mode, + database.AccessModeOptions{ OwnerID: repo.OwnerID, Private: repo.IsPrivate, }, @@ -196,7 +196,7 @@ type serviceHandler struct { dir string file string - authUser *db.User + authUser *database.User ownerName string ownerSalt string repoID int64 @@ -258,7 +258,7 @@ func serviceRPC(h serviceHandler, service string) { var stderr bytes.Buffer cmd := exec.Command("git", service, "--stateless-rpc", h.dir) if service == "receive-pack" { - cmd.Env = append(os.Environ(), db.ComposeHookEnvs(db.ComposeHookEnvsOptions{ + cmd.Env = append(os.Environ(), database.ComposeHookEnvs(database.ComposeHookEnvsOptions{ AuthUser: h.authUser, OwnerName: h.ownerName, OwnerSalt: h.ownerSalt, diff --git a/internal/route/repo/issue.go b/internal/route/repo/issue.go index 7f8390455..213b661e9 100644 --- a/internal/route/repo/issue.go +++ b/internal/route/repo/issue.go @@ -17,8 +17,8 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" - "gogs.io/gogs/internal/db/errors" + "gogs.io/gogs/internal/database" + "gogs.io/gogs/internal/database/errors" "gogs.io/gogs/internal/form" "gogs.io/gogs/internal/markup" "gogs.io/gogs/internal/tool" @@ -68,14 +68,14 @@ func MustAllowPulls(c *context.Context) { } // User can send pull request if owns a forked repository. - if c.IsLogged && db.Repos.HasForkedBy(c.Req.Context(), c.Repo.Repository.ID, c.User.ID) { + if c.IsLogged && database.Repos.HasForkedBy(c.Req.Context(), c.Repo.Repository.ID, c.User.ID) { c.Repo.PullRequest.Allowed = true c.Repo.PullRequest.HeadInfo = c.User.Name + ":" + c.Repo.BranchName } } func RetrieveLabels(c *context.Context) { - labels, err := db.GetLabelsByRepoID(c.Repo.Repository.ID) + labels, err := database.GetLabelsByRepoID(c.Repo.Repository.ID) if err != nil { c.Error(err, "get labels by repository ID") return @@ -123,16 +123,16 @@ func issues(c *context.Context, isPullList bool) { assigneeID = c.QueryInt64("assignee") posterID int64 ) - filterMode := db.FILTER_MODE_YOUR_REPOS + filterMode := database.FILTER_MODE_YOUR_REPOS switch viewType { case "assigned": - filterMode = db.FILTER_MODE_ASSIGN + filterMode = database.FILTER_MODE_ASSIGN assigneeID = c.User.ID case "created_by": - filterMode = db.FILTER_MODE_CREATE + filterMode = database.FILTER_MODE_CREATE posterID = c.User.ID case "mentioned": - filterMode = db.FILTER_MODE_MENTION + filterMode = database.FILTER_MODE_MENTION } var uid int64 = -1 @@ -144,7 +144,7 @@ func issues(c *context.Context, isPullList bool) { selectLabels := c.Query("labels") milestoneID := c.QueryInt64("milestone") isShowClosed := c.Query("state") == "closed" - issueStats := db.GetIssueStats(&db.IssueStatsOptions{ + issueStats := database.GetIssueStats(&database.IssueStatsOptions{ RepoID: repo.ID, UserID: uid, Labels: selectLabels, @@ -168,7 +168,7 @@ func issues(c *context.Context, isPullList bool) { pager := paginater.New(total, conf.UI.IssuePagingNum, page, 5) c.Data["Page"] = pager - issues, err := db.Issues(&db.IssuesOptions{ + issues, err := database.Issues(&database.IssuesOptions{ UserID: uid, AssigneeID: assigneeID, RepoID: repo.ID, @@ -176,7 +176,7 @@ func issues(c *context.Context, isPullList bool) { MilestoneID: milestoneID, Page: pager.Current(), IsClosed: isShowClosed, - IsMention: filterMode == db.FILTER_MODE_MENTION, + IsMention: filterMode == database.FILTER_MODE_MENTION, IsPull: isPullList, Labels: selectLabels, SortType: sortType, @@ -187,7 +187,7 @@ func issues(c *context.Context, isPullList bool) { } // Get issue-user relations. - pairs, err := db.GetIssueUsers(repo.ID, posterID, isShowClosed) + pairs, err := database.GetIssueUsers(repo.ID, posterID, isShowClosed) if err != nil { c.Error(err, "get issue-user relations") return @@ -201,7 +201,7 @@ func issues(c *context.Context, isPullList bool) { } // Check read status. - idx := db.PairsContains(pairs, issues[i].ID, c.User.ID) + idx := database.PairsContains(pairs, issues[i].ID, c.User.ID) if idx > -1 { issues[i].IsRead = pairs[idx].IsRead } else { @@ -211,7 +211,7 @@ func issues(c *context.Context, isPullList bool) { c.Data["Issues"] = issues // Get milestones. - c.Data["Milestones"], err = db.GetMilestonesByRepoID(repo.ID) + c.Data["Milestones"], err = database.GetMilestonesByRepoID(repo.ID) if err != nil { c.Error(err, "get milestone by repository ID") return @@ -260,14 +260,14 @@ func renderAttachmentSettings(c *context.Context) { c.Data["AttachmentMaxFiles"] = conf.Attachment.MaxFiles } -func RetrieveRepoMilestonesAndAssignees(c *context.Context, repo *db.Repository) { +func RetrieveRepoMilestonesAndAssignees(c *context.Context, repo *database.Repository) { var err error - c.Data["OpenMilestones"], err = db.GetMilestones(repo.ID, -1, false) + c.Data["OpenMilestones"], err = database.GetMilestones(repo.ID, -1, false) if err != nil { c.Error(err, "get open milestones") return } - c.Data["ClosedMilestones"], err = db.GetMilestones(repo.ID, -1, true) + c.Data["ClosedMilestones"], err = database.GetMilestones(repo.ID, -1, true) if err != nil { c.Error(err, "get closed milestones") return @@ -280,12 +280,12 @@ func RetrieveRepoMilestonesAndAssignees(c *context.Context, repo *db.Repository) } } -func RetrieveRepoMetas(c *context.Context, repo *db.Repository) []*db.Label { +func RetrieveRepoMetas(c *context.Context, repo *database.Repository) []*database.Label { if !c.Repo.IsWriter() { return nil } - labels, err := db.GetLabelsByRepoID(repo.ID) + labels, err := database.GetLabelsByRepoID(repo.ID) if err != nil { c.Error(err, "get labels by repository ID") return nil @@ -424,7 +424,7 @@ func NewIssuePost(c *context.Context, f form.NewIssue) { attachments = f.Files } - issue := &db.Issue{ + issue := &database.Issue{ RepoID: c.Repo.Repository.ID, Title: f.Title, PosterID: c.User.ID, @@ -433,7 +433,7 @@ func NewIssuePost(c *context.Context, f form.NewIssue) { AssigneeID: assigneeID, Content: f.Content, } - if err := db.NewIssue(c.Repo.Repository, issue, labelIDs, attachments); err != nil { + if err := database.NewIssue(c.Repo.Repository, issue, labelIDs, attachments); err != nil { c.Error(err, "new issue") return } @@ -471,7 +471,7 @@ func uploadAttachment(c *context.Context, allowedTypes []string) { return } - attach, err := db.NewAttachment(header.Filename, buf, file) + attach, err := database.NewAttachment(header.Filename, buf, file) if err != nil { c.Error(err, "new attachment") return @@ -503,7 +503,7 @@ func viewIssue(c *context.Context, isPullList bool) { return } - issue, err := db.GetIssueByIndex(c.Repo.Repository.ID, index) + issue, err := database.GetIssueByIndex(c.Repo.Repository.ID, index) if err != nil { c.NotFoundOrError(err, "get issue by index") return @@ -557,7 +557,7 @@ func viewIssue(c *context.Context, isPullList bool) { for i := range issue.Labels { labelIDMark[issue.Labels[i].ID] = true } - labels, err := db.GetLabelsByRepoID(repo.ID) + labels, err := database.GetLabelsByRepoID(repo.ID) if err != nil { c.Error(err, "get labels by repository ID") return @@ -589,17 +589,17 @@ func viewIssue(c *context.Context, isPullList bool) { } var ( - tag db.CommentTag + tag database.CommentTag ok bool - marked = make(map[int64]db.CommentTag) - comment *db.Comment - participants = make([]*db.User, 1, 10) + marked = make(map[int64]database.CommentTag) + comment *database.Comment + participants = make([]*database.User, 1, 10) ) // Render comments and and fetch participants. participants[0] = issue.Poster for _, comment = range issue.Comments { - if comment.Type == db.COMMENT_TYPE_COMMENT { + if comment.Type == database.COMMENT_TYPE_COMMENT { comment.RenderedContent = string(markup.Markdown(comment.Content, c.Repo.RepoLink, c.Repo.Repository.ComposeMetas())) // Check tag. @@ -611,20 +611,20 @@ func viewIssue(c *context.Context, isPullList bool) { if repo.IsOwnedBy(comment.PosterID) || (repo.Owner.IsOrganization() && repo.Owner.IsOwnedBy(comment.PosterID)) { - comment.ShowTag = db.COMMENT_TAG_OWNER - } else if db.Perms.Authorize( + comment.ShowTag = database.COMMENT_TAG_OWNER + } else if database.Perms.Authorize( c.Req.Context(), comment.PosterID, repo.ID, - db.AccessModeWrite, - db.AccessModeOptions{ + database.AccessModeWrite, + database.AccessModeOptions{ OwnerID: repo.OwnerID, Private: repo.IsPrivate, }, ) { - comment.ShowTag = db.COMMENT_TAG_WRITER + comment.ShowTag = database.COMMENT_TAG_WRITER } else if comment.PosterID == issue.PosterID { - comment.ShowTag = db.COMMENT_TAG_POSTER + comment.ShowTag = database.COMMENT_TAG_POSTER } marked[comment.PosterID] = comment.ShowTag @@ -645,9 +645,9 @@ func viewIssue(c *context.Context, isPullList bool) { if issue.IsPull && issue.PullRequest.HasMerged { pull := issue.PullRequest branchProtected := false - protectBranch, err := db.GetProtectBranchOfRepoByName(pull.BaseRepoID, pull.HeadBranch) + protectBranch, err := database.GetProtectBranchOfRepoByName(pull.BaseRepoID, pull.HeadBranch) if err != nil { - if !db.IsErrBranchNotExist(err) { + if !database.IsErrBranchNotExist(err) { c.Error(err, "get protect branch of repository by name") return } @@ -681,8 +681,8 @@ func ViewPull(c *context.Context) { viewIssue(c, true) } -func getActionIssue(c *context.Context) *db.Issue { - issue, err := db.GetIssueByIndex(c.Repo.Repository.ID, c.ParamsInt64(":index")) +func getActionIssue(c *context.Context) *database.Issue { + issue, err := database.GetIssueByIndex(c.Repo.Repository.ID, c.ParamsInt64(":index")) if err != nil { c.NotFoundOrError(err, "get issue by index") return nil @@ -759,7 +759,7 @@ func UpdateIssueLabel(c *context.Context) { } } else { isAttach := c.Query("action") == "attach" - label, err := db.GetLabelOfRepoByID(c.Repo.Repository.ID, c.QueryInt64("id")) + label, err := database.GetLabelOfRepoByID(c.Repo.Repository.ID, c.QueryInt64("id")) if err != nil { c.NotFoundOrError(err, "get label by ID") return @@ -800,7 +800,7 @@ func UpdateIssueMilestone(c *context.Context) { // Not check for invalid milestone id and give responsibility to owners. issue.MilestoneID = milestoneID - if err := db.ChangeMilestoneAssign(c.User, issue, oldMilestoneID); err != nil { + if err := database.ChangeMilestoneAssign(c.User, issue, oldMilestoneID); err != nil { c.Error(err, "change milestone assign") return } @@ -852,7 +852,7 @@ func NewComment(c *context.Context, f form.CreateComment) { } var err error - var comment *db.Comment + var comment *database.Comment defer func() { // Check if issue admin/poster changes the status of issue. if (c.Repo.IsWriter() || (c.IsLogged && issue.IsPoster(c.User.ID))) && @@ -860,13 +860,13 @@ func NewComment(c *context.Context, f form.CreateComment) { !(issue.IsPull && issue.PullRequest.HasMerged) { // Duplication and conflict check should apply to reopen pull request. - var pr *db.PullRequest + var pr *database.PullRequest if f.Status == "reopen" && issue.IsPull { pull := issue.PullRequest - pr, err = db.GetUnmergedPullRequest(pull.HeadRepoID, pull.BaseRepoID, pull.HeadBranch, pull.BaseBranch) + pr, err = database.GetUnmergedPullRequest(pull.HeadRepoID, pull.BaseRepoID, pull.HeadBranch, pull.BaseBranch) if err != nil { - if !db.IsErrPullRequestNotExist(err) { + if !database.IsErrPullRequestNotExist(err) { c.Error(err, "get unmerged pull request") return } @@ -916,7 +916,7 @@ func NewComment(c *context.Context, f form.CreateComment) { return } - comment, err = db.CreateIssueComment(c.User, c.Repo.Repository, issue, f.Content, attachments) + comment, err = database.CreateIssueComment(c.User, c.Repo.Repository, issue, f.Content, attachments) if err != nil { c.Error(err, "create issue comment") return @@ -926,7 +926,7 @@ func NewComment(c *context.Context, f form.CreateComment) { } func UpdateCommentContent(c *context.Context) { - comment, err := db.GetCommentByID(c.ParamsInt64(":id")) + comment, err := database.GetCommentByID(c.ParamsInt64(":id")) if err != nil { c.NotFoundOrError(err, "get comment by ID") return @@ -935,7 +935,7 @@ func UpdateCommentContent(c *context.Context) { if c.UserID() != comment.PosterID && !c.Repo.IsAdmin() { c.NotFound() return - } else if comment.Type != db.COMMENT_TYPE_COMMENT { + } else if comment.Type != database.COMMENT_TYPE_COMMENT { c.Status(http.StatusNoContent) return } @@ -948,7 +948,7 @@ func UpdateCommentContent(c *context.Context) { }) return } - if err = db.UpdateComment(c.User, comment, oldContent); err != nil { + if err = database.UpdateComment(c.User, comment, oldContent); err != nil { c.Error(err, "update comment") return } @@ -959,7 +959,7 @@ func UpdateCommentContent(c *context.Context) { } func DeleteComment(c *context.Context) { - comment, err := db.GetCommentByID(c.ParamsInt64(":id")) + comment, err := database.GetCommentByID(c.ParamsInt64(":id")) if err != nil { c.NotFoundOrError(err, "get comment by ID") return @@ -968,12 +968,12 @@ func DeleteComment(c *context.Context) { if c.UserID() != comment.PosterID && !c.Repo.IsAdmin() { c.NotFound() return - } else if comment.Type != db.COMMENT_TYPE_COMMENT { + } else if comment.Type != database.COMMENT_TYPE_COMMENT { c.Status(http.StatusNoContent) return } - if err = db.DeleteCommentByID(c.User, comment.ID); err != nil { + if err = database.DeleteCommentByID(c.User, comment.ID); err != nil { c.Error(err, "delete comment by ID") return } @@ -986,7 +986,7 @@ func Labels(c *context.Context) { c.Data["PageIsIssueList"] = true c.Data["PageIsLabels"] = true c.Data["RequireMinicolors"] = true - c.Data["LabelTemplates"] = db.LabelTemplates + c.Data["LabelTemplates"] = database.LabelTemplates c.Success(LABELS) } @@ -995,22 +995,22 @@ func InitializeLabels(c *context.Context, f form.InitializeLabels) { c.RawRedirect(c.Repo.MakeURL("labels")) return } - list, err := db.GetLabelTemplateFile(f.TemplateName) + list, err := database.GetLabelTemplateFile(f.TemplateName) if err != nil { c.Flash.Error(c.Tr("repo.issues.label_templates.fail_to_load_file", f.TemplateName, err)) c.RawRedirect(c.Repo.MakeURL("labels")) return } - labels := make([]*db.Label, len(list)) + labels := make([]*database.Label, len(list)) for i := 0; i < len(list); i++ { - labels[i] = &db.Label{ + labels[i] = &database.Label{ RepoID: c.Repo.Repository.ID, Name: list[i][0], Color: list[i][1], } } - if err := db.NewLabels(labels...); err != nil { + if err := database.NewLabels(labels...); err != nil { c.Error(err, "new labels") return } @@ -1027,12 +1027,12 @@ func NewLabel(c *context.Context, f form.CreateLabel) { return } - l := &db.Label{ + l := &database.Label{ RepoID: c.Repo.Repository.ID, Name: f.Title, Color: f.Color, } - if err := db.NewLabels(l); err != nil { + if err := database.NewLabels(l); err != nil { c.Error(err, "new labels") return } @@ -1040,7 +1040,7 @@ func NewLabel(c *context.Context, f form.CreateLabel) { } func UpdateLabel(c *context.Context, f form.CreateLabel) { - l, err := db.GetLabelByID(f.ID) + l, err := database.GetLabelByID(f.ID) if err != nil { c.NotFoundOrError(err, "get label by ID") return @@ -1048,7 +1048,7 @@ func UpdateLabel(c *context.Context, f form.CreateLabel) { l.Name = f.Title l.Color = f.Color - if err := db.UpdateLabel(l); err != nil { + if err := database.UpdateLabel(l); err != nil { c.Error(err, "update label") return } @@ -1056,7 +1056,7 @@ func UpdateLabel(c *context.Context, f form.CreateLabel) { } func DeleteLabel(c *context.Context) { - if err := db.DeleteLabel(c.Repo.Repository.ID, c.QueryInt64("id")); err != nil { + if err := database.DeleteLabel(c.Repo.Repository.ID, c.QueryInt64("id")); err != nil { c.Flash.Error("DeleteLabel: " + err.Error()) } else { c.Flash.Success(c.Tr("repo.issues.label_deletion_success")) @@ -1073,7 +1073,7 @@ func Milestones(c *context.Context) { c.Data["PageIsMilestones"] = true isShowClosed := c.Query("state") == "closed" - openCount, closedCount := db.MilestoneStats(c.Repo.Repository.ID) + openCount, closedCount := database.MilestoneStats(c.Repo.Repository.ID) c.Data["OpenCount"] = openCount c.Data["ClosedCount"] = closedCount @@ -1090,7 +1090,7 @@ func Milestones(c *context.Context) { } c.Data["Page"] = paginater.New(total, conf.UI.IssuePagingNum, page, 5) - miles, err := db.GetMilestones(c.Repo.Repository.ID, page, isShowClosed) + miles, err := database.GetMilestones(c.Repo.Repository.ID, page, isShowClosed) if err != nil { c.Error(err, "get milestones") return @@ -1146,7 +1146,7 @@ func NewMilestonePost(c *context.Context, f form.CreateMilestone) { return } - if err = db.NewMilestone(&db.Milestone{ + if err = database.NewMilestone(&database.Milestone{ RepoID: c.Repo.Repository.ID, Name: f.Title, Content: f.Content, @@ -1167,7 +1167,7 @@ func EditMilestone(c *context.Context) { c.Data["RequireDatetimepicker"] = true c.Data["DateLang"] = conf.I18n.DateLang(c.Locale.Language()) - m, err := db.GetMilestoneByRepoID(c.Repo.Repository.ID, c.ParamsInt64(":id")) + m, err := database.GetMilestoneByRepoID(c.Repo.Repository.ID, c.ParamsInt64(":id")) if err != nil { c.NotFoundOrError(err, "get milestone by repository ID") return @@ -1202,7 +1202,7 @@ func EditMilestonePost(c *context.Context, f form.CreateMilestone) { return } - m, err := db.GetMilestoneByRepoID(c.Repo.Repository.ID, c.ParamsInt64(":id")) + m, err := database.GetMilestoneByRepoID(c.Repo.Repository.ID, c.ParamsInt64(":id")) if err != nil { c.NotFoundOrError(err, "get milestone by repository ID") return @@ -1210,7 +1210,7 @@ func EditMilestonePost(c *context.Context, f form.CreateMilestone) { m.Name = f.Title m.Content = f.Content m.Deadline = deadline - if err = db.UpdateMilestone(m); err != nil { + if err = database.UpdateMilestone(m); err != nil { c.Error(err, "update milestone") return } @@ -1220,7 +1220,7 @@ func EditMilestonePost(c *context.Context, f form.CreateMilestone) { } func ChangeMilestonStatus(c *context.Context) { - m, err := db.GetMilestoneByRepoID(c.Repo.Repository.ID, c.ParamsInt64(":id")) + m, err := database.GetMilestoneByRepoID(c.Repo.Repository.ID, c.ParamsInt64(":id")) if err != nil { c.NotFoundOrError(err, "get milestone by repository ID") return @@ -1233,7 +1233,7 @@ func ChangeMilestonStatus(c *context.Context) { switch c.Params(":action") { case "open": if m.IsClosed { - if err = db.ChangeMilestoneStatus(m, false); err != nil { + if err = database.ChangeMilestoneStatus(m, false); err != nil { c.Error(err, "change milestone status to open") return } @@ -1242,7 +1242,7 @@ func ChangeMilestonStatus(c *context.Context) { case "close": if !m.IsClosed { m.ClosedDate = time.Now() - if err = db.ChangeMilestoneStatus(m, true); err != nil { + if err = database.ChangeMilestoneStatus(m, true); err != nil { c.Error(err, "change milestone status to closed") return } @@ -1254,7 +1254,7 @@ func ChangeMilestonStatus(c *context.Context) { } func DeleteMilestone(c *context.Context) { - if err := db.DeleteMilestoneOfRepoByID(c.Repo.Repository.ID, c.QueryInt64("id")); err != nil { + if err := database.DeleteMilestoneOfRepoByID(c.Repo.Repository.ID, c.QueryInt64("id")); err != nil { c.Flash.Error("DeleteMilestoneByRepoID: " + err.Error()) } else { c.Flash.Success(c.Tr("repo.milestones.deletion_success")) diff --git a/internal/route/repo/pull.go b/internal/route/repo/pull.go index 7eedcb3a9..336b2b437 100644 --- a/internal/route/repo/pull.go +++ b/internal/route/repo/pull.go @@ -17,7 +17,7 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/form" "gogs.io/gogs/internal/gitutil" ) @@ -46,8 +46,8 @@ var ( } ) -func parseBaseRepository(c *context.Context) *db.Repository { - baseRepo, err := db.GetRepositoryByID(c.ParamsInt64(":repoid")) +func parseBaseRepository(c *context.Context) *database.Repository { + baseRepo, err := database.GetRepositoryByID(c.ParamsInt64(":repoid")) if err != nil { c.NotFoundOrError(err, "get repository by ID") return nil @@ -69,9 +69,9 @@ func parseBaseRepository(c *context.Context) *db.Repository { } c.Data["ForkFrom"] = baseRepo.Owner.Name + "/" + baseRepo.Name - orgs, err := db.Orgs.List( + orgs, err := database.Orgs.List( c.Req.Context(), - db.ListOrgsOptions{ + database.ListOrgsOptions{ MemberID: c.User.ID, IncludePrivateMembers: true, }, @@ -116,7 +116,7 @@ func ForkPost(c *context.Context, f form.CreateRepo) { return } - repo, has, err := db.HasForkedRepo(ctxUser.ID, baseRepo.ID) + repo, has, err := database.HasForkedRepo(ctxUser.ID, baseRepo.ID) if err != nil { c.Error(err, "check forked repository") return @@ -137,16 +137,16 @@ func ForkPost(c *context.Context, f form.CreateRepo) { return } - repo, err = db.ForkRepository(c.User, ctxUser, baseRepo, f.RepoName, f.Description) + repo, err = database.ForkRepository(c.User, ctxUser, baseRepo, f.RepoName, f.Description) if err != nil { c.Data["Err_RepoName"] = true switch { - case db.IsErrReachLimitOfRepo(err): - c.RenderWithErr(c.Tr("repo.form.reach_limit_of_creation", err.(db.ErrReachLimitOfRepo).Limit), FORK, &f) - case db.IsErrRepoAlreadyExist(err): + case database.IsErrReachLimitOfRepo(err): + c.RenderWithErr(c.Tr("repo.form.reach_limit_of_creation", err.(database.ErrReachLimitOfRepo).Limit), FORK, &f) + case database.IsErrRepoAlreadyExist(err): c.RenderWithErr(c.Tr("repo.settings.new_owner_has_same_repo"), FORK, &f) - case db.IsErrNameNotAllowed(err): - c.RenderWithErr(c.Tr("repo.form.name_not_allowed", err.(db.ErrNameNotAllowed).Value()), FORK, &f) + case database.IsErrNameNotAllowed(err): + c.RenderWithErr(c.Tr("repo.form.name_not_allowed", err.(database.ErrNameNotAllowed).Value()), FORK, &f) default: c.Error(err, "fork repository") } @@ -157,8 +157,8 @@ func ForkPost(c *context.Context, f form.CreateRepo) { c.Redirect(repo.Link()) } -func checkPullInfo(c *context.Context) *db.Issue { - issue, err := db.GetIssueByIndex(c.Repo.Repository.ID, c.ParamsInt64(":index")) +func checkPullInfo(c *context.Context) *database.Issue { + issue, err := database.GetIssueByIndex(c.Repo.Repository.ID, c.ParamsInt64(":index")) if err != nil { c.NotFoundOrError(err, "get issue by index") return nil @@ -182,7 +182,7 @@ func checkPullInfo(c *context.Context) *db.Issue { return issue } -func PrepareMergedViewPullInfo(c *context.Context, issue *db.Issue) { +func PrepareMergedViewPullInfo(c *context.Context, issue *database.Issue) { pull := issue.PullRequest c.Data["HasMerged"] = true c.Data["HeadTarget"] = issue.PullRequest.HeadUserName + "/" + pull.HeadBranch @@ -203,7 +203,7 @@ func PrepareMergedViewPullInfo(c *context.Context, issue *db.Issue) { } } -func PrepareViewPullInfo(c *context.Context, issue *db.Issue) *gitutil.PullRequestMeta { +func PrepareViewPullInfo(c *context.Context, issue *database.Issue) *gitutil.PullRequestMeta { repo := c.Repo.Repository pull := issue.PullRequest @@ -231,7 +231,7 @@ func PrepareViewPullInfo(c *context.Context, issue *db.Issue) *gitutil.PullReque return nil } - baseRepoPath := db.RepoPath(repo.Owner.Name, repo.Name) + baseRepoPath := database.RepoPath(repo.Owner.Name, repo.Name) prMeta, err := gitutil.Module.PullRequestMeta(headGitRepo.Path(), baseRepoPath, pull.HeadBranch, pull.BaseBranch) if err != nil { if strings.Contains(err.Error(), "fatal: Not a valid object name") { @@ -340,7 +340,7 @@ func ViewPullFiles(c *context.Context) { return } - headRepoPath := db.RepoPath(pull.HeadUserName, pull.HeadRepo.Name) + headRepoPath := database.RepoPath(pull.HeadUserName, pull.HeadRepo.Name) headGitRepo, err := git.Open(headRepoPath) if err != nil { @@ -412,7 +412,7 @@ func MergePullRequest(c *context.Context) { return } - pr, err := db.GetPullRequestByIssueID(issue.ID) + pr, err := database.GetPullRequestByIssueID(issue.ID) if err != nil { c.NotFoundOrError(err, "get pull request by issue ID") return @@ -425,7 +425,7 @@ func MergePullRequest(c *context.Context) { pr.Issue = issue pr.Issue.Repo = c.Repo.Repository - if err = pr.Merge(c.User, c.Repo.GitRepo, db.MergeStyle(c.Query("merge_style")), c.Query("commit_description")); err != nil { + if err = pr.Merge(c.User, c.Repo.GitRepo, database.MergeStyle(c.Query("merge_style")), c.Query("commit_description")); err != nil { c.Error(err, "merge") return } @@ -434,7 +434,7 @@ func MergePullRequest(c *context.Context) { c.Redirect(c.Repo.RepoLink + "/pulls/" + com.ToStr(pr.Index)) } -func ParseCompareInfo(c *context.Context) (*db.User, *db.Repository, *git.Repository, *gitutil.PullRequestMeta, string, string) { +func ParseCompareInfo(c *context.Context) (*database.User, *database.Repository, *git.Repository, *gitutil.PullRequestMeta, string, string) { baseRepo := c.Repo.Repository // Get compared branches information @@ -452,7 +452,7 @@ func ParseCompareInfo(c *context.Context) (*db.User, *db.Repository, *git.Reposi c.Data["BaseBranch"] = baseBranch var ( - headUser *db.User + headUser *database.User headBranch string isSameRepo bool err error @@ -466,7 +466,7 @@ func ParseCompareInfo(c *context.Context) (*db.User, *db.Repository, *git.Reposi headBranch = headInfos[0] } else if len(headInfos) == 2 { - headUser, err = db.Users.GetByUsername(c.Req.Context(), headInfos[0]) + headUser, err = database.Users.GetByUsername(c.Req.Context(), headInfos[0]) if err != nil { c.NotFoundOrError(err, "get user by name") return nil, nil, nil, nil, "", "" @@ -489,7 +489,7 @@ func ParseCompareInfo(c *context.Context) (*db.User, *db.Repository, *git.Reposi } var ( - headRepo *db.Repository + headRepo *database.Repository headGitRepo *git.Repository ) @@ -497,7 +497,7 @@ func ParseCompareInfo(c *context.Context) (*db.User, *db.Repository, *git.Reposi // no need to check the fork relation. if !isSameRepo { var has bool - headRepo, has, err = db.HasForkedRepo(headUser.ID, baseRepo.ID) + headRepo, has, err = database.HasForkedRepo(headUser.ID, baseRepo.ID) if err != nil { c.Error(err, "get forked repository") return nil, nil, nil, nil, "", "" @@ -507,7 +507,7 @@ func ParseCompareInfo(c *context.Context) (*db.User, *db.Repository, *git.Reposi return nil, nil, nil, nil, "", "" } - headGitRepo, err = git.Open(db.RepoPath(headUser.Name, headRepo.Name)) + headGitRepo, err = git.Open(database.RepoPath(headUser.Name, headRepo.Name)) if err != nil { c.Error(err, "open repository") return nil, nil, nil, nil, "", "" @@ -517,12 +517,12 @@ func ParseCompareInfo(c *context.Context) (*db.User, *db.Repository, *git.Reposi headGitRepo = c.Repo.GitRepo } - if !db.Perms.Authorize( + if !database.Perms.Authorize( c.Req.Context(), c.User.ID, headRepo.ID, - db.AccessModeWrite, - db.AccessModeOptions{ + database.AccessModeWrite, + database.AccessModeOptions{ OwnerID: headRepo.OwnerID, Private: headRepo.IsPrivate, }, @@ -545,7 +545,7 @@ func ParseCompareInfo(c *context.Context) (*db.User, *db.Repository, *git.Reposi } c.Data["HeadBranches"] = headBranches - baseRepoPath := db.RepoPath(baseRepo.Owner.Name, baseRepo.Name) + baseRepoPath := database.RepoPath(baseRepo.Owner.Name, baseRepo.Name) meta, err := gitutil.Module.PullRequestMeta(headGitRepo.Path(), baseRepoPath, headBranch, baseBranch) if err != nil { if gitutil.IsErrNoMergeBase(err) { @@ -563,8 +563,8 @@ func ParseCompareInfo(c *context.Context) (*db.User, *db.Repository, *git.Reposi func PrepareCompareDiff( c *context.Context, - headUser *db.User, - headRepo *db.Repository, + headUser *database.User, + headRepo *database.Repository, headGitRepo *git.Repository, meta *gitutil.PullRequestMeta, headBranch string, @@ -634,9 +634,9 @@ func CompareAndPullRequest(c *context.Context) { return } - pr, err := db.GetUnmergedPullRequest(headRepo.ID, c.Repo.Repository.ID, headBranch, baseBranch) + pr, err := database.GetUnmergedPullRequest(headRepo.ID, c.Repo.Repository.ID, headBranch, baseBranch) if err != nil { - if !db.IsErrPullRequestNotExist(err) { + if !database.IsErrPullRequestNotExist(err) { c.Error(err, "get unmerged pull request") return } @@ -723,7 +723,7 @@ func CompareAndPullRequestPost(c *context.Context, f form.NewIssue) { return } - pullIssue := &db.Issue{ + pullIssue := &database.Issue{ RepoID: repo.ID, Index: repo.NextIssueIndex(), Title: f.Title, @@ -734,7 +734,7 @@ func CompareAndPullRequestPost(c *context.Context, f form.NewIssue) { IsPull: true, Content: f.Content, } - pullRequest := &db.PullRequest{ + pullRequest := &database.PullRequest{ HeadRepoID: headRepo.ID, BaseRepoID: repo.ID, HeadUserName: headUser.Name, @@ -743,11 +743,11 @@ func CompareAndPullRequestPost(c *context.Context, f form.NewIssue) { HeadRepo: headRepo, BaseRepo: repo, MergeBase: meta.MergeBase, - Type: db.PULL_REQUEST_GOGS, + Type: database.PULL_REQUEST_GOGS, } // FIXME: check error in the case two people send pull request at almost same time, give nice error prompt // instead of 500. - if err := db.NewPullRequest(repo, pullIssue, labelIDs, attachments, pullRequest, patch); err != nil { + if err := database.NewPullRequest(repo, pullIssue, labelIDs, attachments, pullRequest, patch); err != nil { c.Error(err, "new pull request") return } else if err := pullRequest.PushToBaseRepo(); err != nil { diff --git a/internal/route/repo/release.go b/internal/route/repo/release.go index 3aabcf02e..cd8d36d3b 100644 --- a/internal/route/repo/release.go +++ b/internal/route/repo/release.go @@ -13,7 +13,7 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/form" "gogs.io/gogs/internal/gitutil" "gogs.io/gogs/internal/markup" @@ -25,7 +25,7 @@ const ( ) // calReleaseNumCommitsBehind calculates given release has how many commits behind release target. -func calReleaseNumCommitsBehind(repoCtx *context.Repository, release *db.Release, countCache map[string]int64) error { +func calReleaseNumCommitsBehind(repoCtx *context.Repository, release *database.Release, countCache map[string]int64) error { // Get count if not exists if _, ok := countCache[release.Target]; !ok { if repoCtx.GitRepo.HasBranch(release.Target) { @@ -57,7 +57,7 @@ func Releases(c *context.Context) { return } - releases, err := db.GetPublishedReleasesByRepoID(c.Repo.Repository.ID, tagsPage.Tags...) + releases, err := database.GetPublishedReleasesByRepoID(c.Repo.Repository.ID, tagsPage.Tags...) if err != nil { c.Error(err, "get published releases by repository ID") return @@ -66,7 +66,7 @@ func Releases(c *context.Context) { // Temporary cache commits count of used branches to speed up. countCache := make(map[string]int64) - results := make([]*db.Release, len(tagsPage.Tags)) + results := make([]*database.Release, len(tagsPage.Tags)) for i, rawTag := range tagsPage.Tags { for j, r := range releases { if r == nil || r.TagName != rawTag { @@ -97,7 +97,7 @@ func Releases(c *context.Context) { return } - results[i] = &db.Release{ + results[i] = &database.Release{ Title: rawTag, TagName: rawTag, Sha1: commit.ID.String(), @@ -111,12 +111,12 @@ func Releases(c *context.Context) { results[i].NumCommitsBehind = c.Repo.CommitsCount - results[i].NumCommits } } - db.SortReleases(results) + database.SortReleases(results) // Only show drafts if user is viewing the latest page - var drafts []*db.Release + var drafts []*database.Release if tagsPage.HasLatest { - drafts, err = db.GetDraftReleasesByRepoID(c.Repo.Repository.ID) + drafts, err = database.GetDraftReleasesByRepoID(c.Repo.Repository.ID) if err != nil { c.Error(err, "get draft releases by repository ID") return @@ -209,7 +209,7 @@ func NewReleasePost(c *context.Context, f form.NewRelease) { attachments = f.Files } - rel := &db.Release{ + rel := &database.Release{ RepoID: c.Repo.Repository.ID, PublisherID: c.User.ID, Title: f.Title, @@ -222,12 +222,12 @@ func NewReleasePost(c *context.Context, f form.NewRelease) { IsPrerelease: f.Prerelease, CreatedUnix: tagCreatedUnix, } - if err = db.NewRelease(c.Repo.GitRepo, rel, attachments); err != nil { + if err = database.NewRelease(c.Repo.GitRepo, rel, attachments); err != nil { c.Data["Err_TagName"] = true switch { - case db.IsErrReleaseAlreadyExist(err): + case database.IsErrReleaseAlreadyExist(err): c.RenderWithErr(c.Tr("repo.release.tag_name_already_exist"), RELEASE_NEW, &f) - case db.IsErrInvalidTagName(err): + case database.IsErrInvalidTagName(err): c.RenderWithErr(c.Tr("repo.release.tag_name_invalid"), RELEASE_NEW, &f) default: c.Error(err, "new release") @@ -246,7 +246,7 @@ func EditRelease(c *context.Context) { renderReleaseAttachmentSettings(c) tagName := c.Params("*") - rel, err := db.GetRelease(c.Repo.Repository.ID, tagName) + rel, err := database.GetRelease(c.Repo.Repository.ID, tagName) if err != nil { c.NotFoundOrError(err, "get release") return @@ -270,7 +270,7 @@ func EditReleasePost(c *context.Context, f form.EditRelease) { renderReleaseAttachmentSettings(c) tagName := c.Params("*") - rel, err := db.GetRelease(c.Repo.Repository.ID, tagName) + rel, err := database.GetRelease(c.Repo.Repository.ID, tagName) if err != nil { c.NotFoundOrError(err, "get release") return @@ -298,7 +298,7 @@ func EditReleasePost(c *context.Context, f form.EditRelease) { rel.Note = f.Content rel.IsDraft = len(f.Draft) > 0 rel.IsPrerelease = f.Prerelease - if err = db.UpdateRelease(c.User, c.Repo.GitRepo, rel, isPublish, attachments); err != nil { + if err = database.UpdateRelease(c.User, c.Repo.GitRepo, rel, isPublish, attachments); err != nil { c.Error(err, "update release") return } @@ -314,7 +314,7 @@ func UploadReleaseAttachment(c *context.Context) { } func DeleteRelease(c *context.Context) { - if err := db.DeleteReleaseOfRepoByID(c.Repo.Repository.ID, c.QueryInt64("id")); err != nil { + if err := database.DeleteReleaseOfRepoByID(c.Repo.Repository.ID, c.QueryInt64("id")); err != nil { c.Flash.Error("DeleteReleaseByID: " + err.Error()) } else { c.Flash.Success(c.Tr("repo.release.deletion_success")) diff --git a/internal/route/repo/repo.go b/internal/route/repo/repo.go index f19bd3dfb..9266a506b 100644 --- a/internal/route/repo/repo.go +++ b/internal/route/repo/repo.go @@ -18,7 +18,7 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/form" "gogs.io/gogs/internal/tool" ) @@ -34,8 +34,8 @@ func MustBeNotBare(c *context.Context) { } } -func checkContextUser(c *context.Context, uid int64) *db.User { - orgs, err := db.GetOwnedOrgsByUserIDDesc(c.User.ID, "updated_unix") +func checkContextUser(c *context.Context, uid int64) *database.User { + orgs, err := database.GetOwnedOrgsByUserIDDesc(c.User.ID, "updated_unix") if err != nil { c.Error(err, "get owned organization by user ID") return nil @@ -47,8 +47,8 @@ func checkContextUser(c *context.Context, uid int64) *db.User { return c.User } - org, err := db.Users.GetByID(c.Req.Context(), uid) - if db.IsErrUserNotExist(err) { + org, err := database.Users.GetByID(c.Req.Context(), uid) + if database.IsErrUserNotExist(err) { return c.User } @@ -70,9 +70,9 @@ func Create(c *context.Context) { c.RequireAutosize() // Give default value for template to render. - c.Data["Gitignores"] = db.Gitignores - c.Data["Licenses"] = db.Licenses - c.Data["Readmes"] = db.Readmes + c.Data["Gitignores"] = database.Gitignores + c.Data["Licenses"] = database.Licenses + c.Data["Readmes"] = database.Readmes c.Data["readme"] = "Default" c.Data["private"] = c.User.LastRepoVisibility c.Data["IsForcedPrivate"] = conf.Repository.ForcePrivate @@ -88,14 +88,14 @@ func Create(c *context.Context) { func handleCreateError(c *context.Context, err error, name, tpl string, form any) { switch { - case db.IsErrReachLimitOfRepo(err): - c.RenderWithErr(c.Tr("repo.form.reach_limit_of_creation", err.(db.ErrReachLimitOfRepo).Limit), tpl, form) - case db.IsErrRepoAlreadyExist(err): + case database.IsErrReachLimitOfRepo(err): + c.RenderWithErr(c.Tr("repo.form.reach_limit_of_creation", err.(database.ErrReachLimitOfRepo).Limit), tpl, form) + case database.IsErrRepoAlreadyExist(err): c.Data["Err_RepoName"] = true c.RenderWithErr(c.Tr("form.repo_name_been_taken"), tpl, form) - case db.IsErrNameNotAllowed(err): + case database.IsErrNameNotAllowed(err): c.Data["Err_RepoName"] = true - c.RenderWithErr(c.Tr("repo.form.name_not_allowed", err.(db.ErrNameNotAllowed).Value()), tpl, form) + c.RenderWithErr(c.Tr("repo.form.name_not_allowed", err.(database.ErrNameNotAllowed).Value()), tpl, form) default: c.Error(err, name) } @@ -104,9 +104,9 @@ func handleCreateError(c *context.Context, err error, name, tpl string, form any func CreatePost(c *context.Context, f form.CreateRepo) { c.Data["Title"] = c.Tr("new_repo") - c.Data["Gitignores"] = db.Gitignores - c.Data["Licenses"] = db.Licenses - c.Data["Readmes"] = db.Readmes + c.Data["Gitignores"] = database.Gitignores + c.Data["Licenses"] = database.Licenses + c.Data["Readmes"] = database.Readmes ctxUser := checkContextUser(c, f.UserID) if c.Written() { @@ -119,7 +119,7 @@ func CreatePost(c *context.Context, f form.CreateRepo) { return } - repo, err := db.CreateRepository(c.User, ctxUser, db.CreateRepoOptionsLegacy{ + repo, err := database.CreateRepository(c.User, ctxUser, database.CreateRepoOptionsLegacy{ Name: f.RepoName, Description: f.Description, Gitignores: f.Gitignores, @@ -136,7 +136,7 @@ func CreatePost(c *context.Context, f form.CreateRepo) { } if repo != nil { - if errDelete := db.DeleteRepository(ctxUser.ID, repo.ID); errDelete != nil { + if errDelete := database.DeleteRepository(ctxUser.ID, repo.ID); errDelete != nil { log.Error("DeleteRepository: %v", errDelete) } } @@ -175,9 +175,9 @@ func MigratePost(c *context.Context, f form.MigrateRepo) { remoteAddr, err := f.ParseRemoteAddr(c.User) if err != nil { - if db.IsErrInvalidCloneAddr(err) { + if database.IsErrInvalidCloneAddr(err) { c.Data["Err_CloneAddr"] = true - addrErr := err.(db.ErrInvalidCloneAddr) + addrErr := err.(database.ErrInvalidCloneAddr) switch { case addrErr.IsURLError: c.RenderWithErr(c.Tr("repo.migrate.clone_address")+c.Tr("form.url_error"), MIGRATE, &f) @@ -196,7 +196,7 @@ func MigratePost(c *context.Context, f form.MigrateRepo) { return } - repo, err := db.MigrateRepository(c.User, ctxUser, db.MigrateRepoOptions{ + repo, err := database.MigrateRepository(c.User, ctxUser, database.MigrateRepoOptions{ Name: f.RepoName, Description: f.Description, IsPrivate: f.Private || conf.Repository.ForcePrivate, @@ -211,7 +211,7 @@ func MigratePost(c *context.Context, f form.MigrateRepo) { } if repo != nil { - if errDelete := db.DeleteRepository(ctxUser.ID, repo.ID); errDelete != nil { + if errDelete := database.DeleteRepository(ctxUser.ID, repo.ID); errDelete != nil { log.Error("DeleteRepository: %v", errDelete) } } @@ -219,11 +219,11 @@ func MigratePost(c *context.Context, f form.MigrateRepo) { if strings.Contains(err.Error(), "Authentication failed") || strings.Contains(err.Error(), "could not read Username") { c.Data["Err_Auth"] = true - c.RenderWithErr(c.Tr("form.auth_failed", db.HandleMirrorCredentials(err.Error(), true)), MIGRATE, &f) + c.RenderWithErr(c.Tr("form.auth_failed", database.HandleMirrorCredentials(err.Error(), true)), MIGRATE, &f) return } else if strings.Contains(err.Error(), "fatal:") { c.Data["Err_CloneAddr"] = true - c.RenderWithErr(c.Tr("repo.migrate.failed", db.HandleMirrorCredentials(err.Error(), true)), MIGRATE, &f) + c.RenderWithErr(c.Tr("repo.migrate.failed", database.HandleMirrorCredentials(err.Error(), true)), MIGRATE, &f) return } @@ -234,19 +234,19 @@ func Action(c *context.Context) { var err error switch c.Params(":action") { case "watch": - err = db.WatchRepo(c.User.ID, c.Repo.Repository.ID, true) + err = database.WatchRepo(c.User.ID, c.Repo.Repository.ID, true) case "unwatch": if userID := c.QueryInt64("user_id"); userID != 0 { if c.User.IsAdmin { - err = db.WatchRepo(userID, c.Repo.Repository.ID, false) + err = database.WatchRepo(userID, c.Repo.Repository.ID, false) } } else { - err = db.WatchRepo(c.User.ID, c.Repo.Repository.ID, false) + err = database.WatchRepo(c.User.ID, c.Repo.Repository.ID, false) } case "star": - err = db.StarRepo(c.User.ID, c.Repo.Repository.ID, true) + err = database.StarRepo(c.User.ID, c.Repo.Repository.ID, true) case "unstar": - err = db.StarRepo(c.User.ID, c.Repo.Repository.ID, false) + err = database.StarRepo(c.User.ID, c.Repo.Repository.ID, false) case "desc": // FIXME: this is not used if !c.Repo.IsOwner() { c.NotFound() @@ -255,7 +255,7 @@ func Action(c *context.Context) { c.Repo.Repository.Description = c.Query("desc") c.Repo.Repository.Website = c.Query("site") - err = db.UpdateRepository(c.Repo.Repository, false) + err = database.UpdateRepository(c.Repo.Repository, false) } if err != nil { diff --git a/internal/route/repo/setting.go b/internal/route/repo/setting.go index b1d4de6a8..2f9e9239f 100644 --- a/internal/route/repo/setting.go +++ b/internal/route/repo/setting.go @@ -16,8 +16,8 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" - "gogs.io/gogs/internal/db/errors" + "gogs.io/gogs/internal/database" + "gogs.io/gogs/internal/database/errors" "gogs.io/gogs/internal/email" "gogs.io/gogs/internal/form" "gogs.io/gogs/internal/osutil" @@ -63,13 +63,13 @@ func SettingsPost(c *context.Context, f form.RepoSetting) { // Check if repository name has been changed. if repo.LowerName != strings.ToLower(newRepoName) { isNameChanged = true - if err := db.ChangeRepositoryName(c.Repo.Owner, repo.Name, newRepoName); err != nil { + if err := database.ChangeRepositoryName(c.Repo.Owner, repo.Name, newRepoName); err != nil { c.FormErr("RepoName") switch { - case db.IsErrRepoAlreadyExist(err): + case database.IsErrRepoAlreadyExist(err): c.RenderWithErr(c.Tr("form.repo_name_been_taken"), SETTINGS_OPTIONS, &f) - case db.IsErrNameNotAllowed(err): - c.RenderWithErr(c.Tr("repo.form.name_not_allowed", err.(db.ErrNameNotAllowed).Value()), SETTINGS_OPTIONS, &f) + case database.IsErrNameNotAllowed(err): + c.RenderWithErr(c.Tr("repo.form.name_not_allowed", err.(database.ErrNameNotAllowed).Value()), SETTINGS_OPTIONS, &f) default: c.Error(err, "change repository name") } @@ -94,14 +94,14 @@ func SettingsPost(c *context.Context, f form.RepoSetting) { visibilityChanged := repo.IsPrivate != f.Private || repo.IsUnlisted != f.Unlisted repo.IsPrivate = f.Private repo.IsUnlisted = f.Unlisted - if err := db.UpdateRepository(repo, visibilityChanged); err != nil { + if err := database.UpdateRepository(repo, visibilityChanged); err != nil { c.Error(err, "update repository") return } log.Trace("Repository basic settings updated: %s/%s", c.Repo.Owner.Name, repo.Name) if isNameChanged { - if err := db.Actions.RenameRepo(c.Req.Context(), c.User, repo.MustOwner(), oldRepoName, repo); err != nil { + if err := database.Actions.RenameRepo(c.Req.Context(), c.User, repo.MustOwner(), oldRepoName, repo); err != nil { log.Error("create rename repository action: %v", err) } } @@ -119,7 +119,7 @@ func SettingsPost(c *context.Context, f form.RepoSetting) { c.Repo.Mirror.EnablePrune = f.EnablePrune c.Repo.Mirror.Interval = f.Interval c.Repo.Mirror.NextSync = time.Now().Add(time.Duration(f.Interval) * time.Hour) - if err := db.UpdateMirror(c.Repo.Mirror); err != nil { + if err := database.UpdateMirror(c.Repo.Mirror); err != nil { c.Error(err, "update mirror") return } @@ -138,7 +138,7 @@ func SettingsPost(c *context.Context, f form.RepoSetting) { return } - go db.MirrorQueue.Add(repo.ID) + go database.MirrorQueue.Add(repo.ID) c.Flash.Info(c.Tr("repo.settings.mirror_sync_in_progress")) c.Redirect(repo.Link() + "/settings") @@ -164,7 +164,7 @@ func SettingsPost(c *context.Context, f form.RepoSetting) { repo.AllowPublicIssues = false } - if err := db.UpdateRepository(repo, false); err != nil { + if err := database.UpdateRepository(repo, false); err != nil { c.Error(err, "update repository") return } @@ -196,10 +196,10 @@ func SettingsPost(c *context.Context, f form.RepoSetting) { } repo.IsMirror = false - if _, err := db.CleanUpMigrateInfo(repo); err != nil { + if _, err := database.CleanUpMigrateInfo(repo); err != nil { c.Error(err, "clean up migrate info") return - } else if err = db.DeleteMirrorByRepoID(c.Repo.Repository.ID); err != nil { + } else if err = database.DeleteMirrorByRepoID(c.Repo.Repository.ID); err != nil { c.Error(err, "delete mirror by repository ID") return } @@ -225,13 +225,13 @@ func SettingsPost(c *context.Context, f form.RepoSetting) { } newOwner := c.Query("new_owner_name") - if !db.Users.IsUsernameUsed(c.Req.Context(), newOwner, c.Repo.Owner.ID) { + if !database.Users.IsUsernameUsed(c.Req.Context(), newOwner, c.Repo.Owner.ID) { c.RenderWithErr(c.Tr("form.enterred_invalid_owner_name"), SETTINGS_OPTIONS, nil) return } - if err := db.TransferOwnership(c.User, newOwner, repo); err != nil { - if db.IsErrRepoAlreadyExist(err) { + if err := database.TransferOwnership(c.User, newOwner, repo); err != nil { + if database.IsErrRepoAlreadyExist(err) { c.RenderWithErr(c.Tr("repo.settings.new_owner_has_same_repo"), SETTINGS_OPTIONS, nil) } else { c.Error(err, "transfer ownership") @@ -259,7 +259,7 @@ func SettingsPost(c *context.Context, f form.RepoSetting) { } } - if err := db.DeleteRepository(c.Repo.Owner.ID, repo.ID); err != nil { + if err := database.DeleteRepository(c.Repo.Owner.ID, repo.ID); err != nil { c.Error(err, "delete repository") return } @@ -289,7 +289,7 @@ func SettingsPost(c *context.Context, f form.RepoSetting) { log.Trace("Repository wiki deleted: %s/%s", c.Repo.Owner.Name, repo.Name) repo.EnableWiki = false - if err := db.UpdateRepository(repo, false); err != nil { + if err := database.UpdateRepository(repo, false); err != nil { c.Error(err, "update repository") return } @@ -326,7 +326,7 @@ func SettingsDeleteAvatar(c *context.Context) { } // FIXME: limit upload size -func UpdateAvatarSetting(c *context.Context, f form.Avatar, ctxRepo *db.Repository) error { +func UpdateAvatarSetting(c *context.Context, f form.Avatar, ctxRepo *database.Repository) error { ctxRepo.UseCustomAvatar = true if f.Avatar != nil { r, err := f.Avatar.Open() @@ -352,7 +352,7 @@ func UpdateAvatarSetting(c *context.Context, f form.Avatar, ctxRepo *db.Reposito } } - if err := db.UpdateRepository(ctxRepo, false); err != nil { + if err := database.UpdateRepository(ctxRepo, false); err != nil { return fmt.Errorf("update repository: %v", err) } @@ -380,9 +380,9 @@ func SettingsCollaborationPost(c *context.Context) { return } - u, err := db.Users.GetByUsername(c.Req.Context(), name) + u, err := database.Users.GetByUsername(c.Req.Context(), name) if err != nil { - if db.IsErrUserNotExist(err) { + if database.IsErrUserNotExist(err) { c.Flash.Error(c.Tr("form.user_not_exist")) c.Redirect(conf.Server.Subpath + c.Req.URL.Path) } else { @@ -404,7 +404,7 @@ func SettingsCollaborationPost(c *context.Context) { } if conf.User.EnableEmailNotification { - email.SendCollaboratorMail(db.NewMailerUser(u), db.NewMailerUser(c.User), db.NewMailerRepo(c.Repo.Repository)) + email.SendCollaboratorMail(database.NewMailerUser(u), database.NewMailerUser(c.User), database.NewMailerRepo(c.Repo.Repository)) } c.Flash.Success(c.Tr("repo.settings.add_collaborator_success")) @@ -414,7 +414,7 @@ func SettingsCollaborationPost(c *context.Context) { func ChangeCollaborationAccessMode(c *context.Context) { if err := c.Repo.Repository.ChangeCollaborationAccessMode( c.QueryInt64("uid"), - db.AccessMode(c.QueryInt("mode"))); err != nil { + database.AccessMode(c.QueryInt("mode"))); err != nil { log.Error("ChangeCollaborationAccessMode: %v", err) return } @@ -444,7 +444,7 @@ func SettingsBranches(c *context.Context) { return } - protectBranches, err := db.GetProtectBranchesByRepoID(c.Repo.Repository.ID) + protectBranches, err := database.GetProtectBranchesByRepoID(c.Repo.Repository.ID) if err != nil { c.Error(err, "get protect branch by repository ID") return @@ -476,7 +476,7 @@ func UpdateDefaultBranch(c *context.Context) { } } - if err := db.UpdateRepository(c.Repo.Repository, false); err != nil { + if err := database.UpdateRepository(c.Repo.Repository, false); err != nil { c.Error(err, "update repository") return } @@ -495,15 +495,15 @@ func SettingsProtectedBranch(c *context.Context) { c.Data["Title"] = c.Tr("repo.settings.protected_branches") + " - " + branch c.Data["PageIsSettingsBranches"] = true - protectBranch, err := db.GetProtectBranchOfRepoByName(c.Repo.Repository.ID, branch) + protectBranch, err := database.GetProtectBranchOfRepoByName(c.Repo.Repository.ID, branch) if err != nil { - if !db.IsErrBranchNotExist(err) { + if !database.IsErrBranchNotExist(err) { c.Error(err, "get protect branch of repository by name") return } // No options found, create defaults. - protectBranch = &db.ProtectBranch{ + protectBranch = &database.ProtectBranch{ Name: branch, } } @@ -517,7 +517,7 @@ func SettingsProtectedBranch(c *context.Context) { c.Data["Users"] = users c.Data["whitelist_users"] = protectBranch.WhitelistUserIDs - teams, err := c.Repo.Owner.TeamsHaveAccessToRepo(c.Repo.Repository.ID, db.AccessModeWrite) + teams, err := c.Repo.Owner.TeamsHaveAccessToRepo(c.Repo.Repository.ID, database.AccessModeWrite) if err != nil { c.Error(err, "get teams have access to the repository") return @@ -537,15 +537,15 @@ func SettingsProtectedBranchPost(c *context.Context, f form.ProtectBranch) { return } - protectBranch, err := db.GetProtectBranchOfRepoByName(c.Repo.Repository.ID, branch) + protectBranch, err := database.GetProtectBranchOfRepoByName(c.Repo.Repository.ID, branch) if err != nil { - if !db.IsErrBranchNotExist(err) { + if !database.IsErrBranchNotExist(err) { c.Error(err, "get protect branch of repository by name") return } // No options found, create defaults. - protectBranch = &db.ProtectBranch{ + protectBranch = &database.ProtectBranch{ RepoID: c.Repo.Repository.ID, Name: branch, } @@ -555,9 +555,9 @@ func SettingsProtectedBranchPost(c *context.Context, f form.ProtectBranch) { protectBranch.RequirePullRequest = f.RequirePullRequest protectBranch.EnableWhitelist = f.EnableWhitelist if c.Repo.Owner.IsOrganization() { - err = db.UpdateOrgProtectBranch(c.Repo.Repository, protectBranch, f.WhitelistUsers, f.WhitelistTeams) + err = database.UpdateOrgProtectBranch(c.Repo.Repository, protectBranch, f.WhitelistUsers, f.WhitelistTeams) } else { - err = db.UpdateProtectBranch(protectBranch) + err = database.UpdateProtectBranch(protectBranch) } if err != nil { c.Error(err, "update protect branch") @@ -615,7 +615,7 @@ func SettingsDeployKeys(c *context.Context) { c.Data["Title"] = c.Tr("repo.settings.deploy_keys") c.Data["PageIsSettingsKeys"] = true - keys, err := db.ListDeployKeys(c.Repo.Repository.ID) + keys, err := database.ListDeployKeys(c.Repo.Repository.ID) if err != nil { c.Error(err, "list deploy keys") return @@ -629,7 +629,7 @@ func SettingsDeployKeysPost(c *context.Context, f form.AddSSHKey) { c.Data["Title"] = c.Tr("repo.settings.deploy_keys") c.Data["PageIsSettingsKeys"] = true - keys, err := db.ListDeployKeys(c.Repo.Repository.ID) + keys, err := database.ListDeployKeys(c.Repo.Repository.ID) if err != nil { c.Error(err, "list deploy keys") return @@ -641,9 +641,9 @@ func SettingsDeployKeysPost(c *context.Context, f form.AddSSHKey) { return } - content, err := db.CheckPublicKeyString(f.Content) + content, err := database.CheckPublicKeyString(f.Content) if err != nil { - if db.IsErrKeyUnableVerify(err) { + if database.IsErrKeyUnableVerify(err) { c.Flash.Info(c.Tr("form.unable_verify_ssh_key")) } else { c.Data["HasError"] = true @@ -654,14 +654,14 @@ func SettingsDeployKeysPost(c *context.Context, f form.AddSSHKey) { } } - key, err := db.AddDeployKey(c.Repo.Repository.ID, f.Title, content) + key, err := database.AddDeployKey(c.Repo.Repository.ID, f.Title, content) if err != nil { c.Data["HasError"] = true switch { - case db.IsErrKeyAlreadyExist(err): + case database.IsErrKeyAlreadyExist(err): c.Data["Err_Content"] = true c.RenderWithErr(c.Tr("repo.settings.key_been_used"), SETTINGS_DEPLOY_KEYS, &f) - case db.IsErrKeyNameAlreadyUsed(err): + case database.IsErrKeyNameAlreadyUsed(err): c.Data["Err_Title"] = true c.RenderWithErr(c.Tr("repo.settings.key_name_used"), SETTINGS_DEPLOY_KEYS, &f) default: @@ -676,7 +676,7 @@ func SettingsDeployKeysPost(c *context.Context, f form.AddSSHKey) { } func DeleteDeployKey(c *context.Context) { - if err := db.DeleteDeployKey(c.User, c.QueryInt64("id")); err != nil { + if err := database.DeleteDeployKey(c.User, c.QueryInt64("id")); err != nil { c.Flash.Error("DeleteDeployKey: " + err.Error()) } else { c.Flash.Success(c.Tr("repo.settings.deploy_key_deletion_success")) diff --git a/internal/route/repo/tasks.go b/internal/route/repo/tasks.go index d92158856..e4a066145 100644 --- a/internal/route/repo/tasks.go +++ b/internal/route/repo/tasks.go @@ -11,7 +11,7 @@ import ( log "unknwon.dev/clog/v2" "gogs.io/gogs/internal/cryptoutil" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) func TriggerTask(c *macaron.Context) { @@ -26,9 +26,9 @@ func TriggerTask(c *macaron.Context) { username := c.Params(":username") reponame := c.Params(":reponame") - owner, err := db.Users.GetByUsername(c.Req.Context(), username) + owner, err := database.Users.GetByUsername(c.Req.Context(), username) if err != nil { - if db.IsErrUserNotExist(err) { + if database.IsErrUserNotExist(err) { c.Error(http.StatusBadRequest, "Owner does not exist") } else { c.Status(http.StatusInternalServerError) @@ -44,9 +44,9 @@ func TriggerTask(c *macaron.Context) { return } - repo, err := db.Repos.GetByName(c.Req.Context(), owner.ID, reponame) + repo, err := database.Repos.GetByName(c.Req.Context(), owner.ID, reponame) if err != nil { - if db.IsErrRepoNotExist(err) { + if database.IsErrRepoNotExist(err) { c.Error(http.StatusBadRequest, "Repository does not exist") } else { c.Status(http.StatusInternalServerError) @@ -55,9 +55,9 @@ func TriggerTask(c *macaron.Context) { return } - pusher, err := db.Users.GetByID(c.Req.Context(), pusherID) + pusher, err := database.Users.GetByID(c.Req.Context(), pusherID) if err != nil { - if db.IsErrUserNotExist(err) { + if database.IsErrUserNotExist(err) { c.Error(http.StatusBadRequest, "Pusher does not exist") } else { c.Status(http.StatusInternalServerError) @@ -68,7 +68,7 @@ func TriggerTask(c *macaron.Context) { log.Trace("TriggerTask: %s/%s@%s by %q", owner.Name, repo.Name, branch, pusher.Name) - go db.HookQueue.Add(repo.ID) - go db.AddTestPullRequestTask(pusher, repo.ID, branch, true) + go database.HookQueue.Add(repo.ID) + go database.AddTestPullRequestTask(pusher, repo.ID, branch, true) c.Status(http.StatusAccepted) } diff --git a/internal/route/repo/view.go b/internal/route/repo/view.go index ac5ed3335..8e0e71cb4 100644 --- a/internal/route/repo/view.go +++ b/internal/route/repo/view.go @@ -18,7 +18,7 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/gitutil" "gogs.io/gogs/internal/markup" "gogs.io/gogs/internal/template" @@ -308,12 +308,12 @@ func Home(c *context.Context) { c.Success(HOME) } -func RenderUserCards(c *context.Context, total int, getter func(page int) ([]*db.User, error), tpl string) { +func RenderUserCards(c *context.Context, total int, getter func(page int) ([]*database.User, error), tpl string) { page := c.QueryInt("page") if page <= 0 { page = 1 } - pager := paginater.New(total, db.ItemsPerPage, page, 5) + pager := paginater.New(total, database.ItemsPerPage, page, 5) c.Data["Page"] = pager items, err := getter(pager.Current()) diff --git a/internal/route/repo/webhook.go b/internal/route/repo/webhook.go index 7b90a651a..18e2d8d99 100644 --- a/internal/route/repo/webhook.go +++ b/internal/route/repo/webhook.go @@ -18,8 +18,8 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" - "gogs.io/gogs/internal/db/errors" + "gogs.io/gogs/internal/database" + "gogs.io/gogs/internal/database/errors" "gogs.io/gogs/internal/form" "gogs.io/gogs/internal/netutil" ) @@ -81,13 +81,13 @@ func Webhooks(c *context.Context, orCtx *orgRepoContext) { c.Data["Types"] = conf.Webhook.Types var err error - var ws []*db.Webhook + var ws []*database.Webhook if orCtx.RepoID > 0 { c.Data["Description"] = c.Tr("repo.settings.hooks_desc", "https://gogs.io/docs/features/webhook.html") - ws, err = db.GetWebhooksByRepoID(orCtx.RepoID) + ws, err = database.GetWebhooksByRepoID(orCtx.RepoID) } else { c.Data["Description"] = c.Tr("org.settings.hooks_desc") - ws, err = db.GetWebhooksByOrgID(orCtx.OrgID) + ws, err = database.GetWebhooksByOrgID(orCtx.OrgID) } if err != nil { c.Error(err, "get webhooks") @@ -120,7 +120,7 @@ func WebhooksNew(c *context.Context, orCtx *orgRepoContext) { c.Success(orCtx.TmplNew) } -func validateWebhook(l macaron.Locale, w *db.Webhook) (field, msg string, ok bool) { +func validateWebhook(l macaron.Locale, w *database.Webhook) (field, msg string, ok bool) { // 🚨 SECURITY: Local addresses must not be allowed by non-admins to prevent SSRF, // see https://github.com/gogs/gogs/issues/5366 for details. payloadURL, err := url.Parse(w.URL) @@ -134,7 +134,7 @@ func validateWebhook(l macaron.Locale, w *db.Webhook) (field, msg string, ok boo return "", "", true } -func validateAndCreateWebhook(c *context.Context, orCtx *orgRepoContext, w *db.Webhook) { +func validateAndCreateWebhook(c *context.Context, orCtx *orgRepoContext, w *database.Webhook) { c.Data["Webhook"] = w if c.HasError() { @@ -152,7 +152,7 @@ func validateAndCreateWebhook(c *context.Context, orCtx *orgRepoContext, w *db.W if err := w.UpdateEvent(); err != nil { c.Error(err, "update event") return - } else if err := db.CreateWebhook(w); err != nil { + } else if err := database.CreateWebhook(w); err != nil { c.Error(err, "create webhook") return } @@ -161,12 +161,12 @@ func validateAndCreateWebhook(c *context.Context, orCtx *orgRepoContext, w *db.W c.Redirect(orCtx.Link + "/settings/hooks") } -func toHookEvent(f form.Webhook) *db.HookEvent { - return &db.HookEvent{ +func toHookEvent(f form.Webhook) *database.HookEvent { + return &database.HookEvent{ PushOnly: f.PushOnly(), SendEverything: f.SendEverything(), ChooseEvents: f.ChooseEvents(), - HookEvents: db.HookEvents{ + HookEvents: database.HookEvents{ Create: f.Create, Delete: f.Delete, Fork: f.Fork, @@ -185,12 +185,12 @@ func WebhooksNewPost(c *context.Context, orCtx *orgRepoContext, f form.NewWebhoo c.PageIs("SettingsHooksNew") c.Data["HookType"] = "gogs" - contentType := db.JSON - if db.HookContentType(f.ContentType) == db.FORM { - contentType = db.FORM + contentType := database.JSON + if database.HookContentType(f.ContentType) == database.FORM { + contentType = database.FORM } - w := &db.Webhook{ + w := &database.Webhook{ RepoID: orCtx.RepoID, OrgID: orCtx.OrgID, URL: f.PayloadURL, @@ -198,7 +198,7 @@ func WebhooksNewPost(c *context.Context, orCtx *orgRepoContext, f form.NewWebhoo Secret: f.Secret, HookEvent: toHookEvent(f.Webhook), IsActive: f.Active, - HookTaskType: db.GOGS, + HookTaskType: database.GOGS, } validateAndCreateWebhook(c, orCtx, w) } @@ -209,7 +209,7 @@ func WebhooksSlackNewPost(c *context.Context, orCtx *orgRepoContext, f form.NewS c.PageIs("SettingsHooksNew") c.Data["HookType"] = "slack" - meta := &db.SlackMeta{ + meta := &database.SlackMeta{ Channel: f.Channel, Username: f.Username, IconURL: f.IconURL, @@ -223,13 +223,13 @@ func WebhooksSlackNewPost(c *context.Context, orCtx *orgRepoContext, f form.NewS return } - w := &db.Webhook{ + w := &database.Webhook{ RepoID: orCtx.RepoID, URL: f.PayloadURL, - ContentType: db.JSON, + ContentType: database.JSON, HookEvent: toHookEvent(f.Webhook), IsActive: f.Active, - HookTaskType: db.SLACK, + HookTaskType: database.SLACK, Meta: string(p), OrgID: orCtx.OrgID, } @@ -242,7 +242,7 @@ func WebhooksDiscordNewPost(c *context.Context, orCtx *orgRepoContext, f form.Ne c.PageIs("SettingsHooksNew") c.Data["HookType"] = "discord" - meta := &db.SlackMeta{ + meta := &database.SlackMeta{ Username: f.Username, IconURL: f.IconURL, Color: f.Color, @@ -255,13 +255,13 @@ func WebhooksDiscordNewPost(c *context.Context, orCtx *orgRepoContext, f form.Ne return } - w := &db.Webhook{ + w := &database.Webhook{ RepoID: orCtx.RepoID, URL: f.PayloadURL, - ContentType: db.JSON, + ContentType: database.JSON, HookEvent: toHookEvent(f.Webhook), IsActive: f.Active, - HookTaskType: db.DISCORD, + HookTaskType: database.DISCORD, Meta: string(p), OrgID: orCtx.OrgID, } @@ -274,27 +274,27 @@ func WebhooksDingtalkNewPost(c *context.Context, orCtx *orgRepoContext, f form.N c.PageIs("SettingsHooksNew") c.Data["HookType"] = "dingtalk" - w := &db.Webhook{ + w := &database.Webhook{ RepoID: orCtx.RepoID, URL: f.PayloadURL, - ContentType: db.JSON, + ContentType: database.JSON, HookEvent: toHookEvent(f.Webhook), IsActive: f.Active, - HookTaskType: db.DINGTALK, + HookTaskType: database.DINGTALK, OrgID: orCtx.OrgID, } validateAndCreateWebhook(c, orCtx, w) } -func loadWebhook(c *context.Context, orCtx *orgRepoContext) *db.Webhook { +func loadWebhook(c *context.Context, orCtx *orgRepoContext) *database.Webhook { c.RequireHighlightJS() var err error - var w *db.Webhook + var w *database.Webhook if orCtx.RepoID > 0 { - w, err = db.GetWebhookOfRepoByID(c.Repo.Repository.ID, c.ParamsInt64(":id")) + w, err = database.GetWebhookOfRepoByID(c.Repo.Repository.ID, c.ParamsInt64(":id")) } else { - w, err = db.GetWebhookByOrgID(c.Org.Organization.ID, c.ParamsInt64(":id")) + w, err = database.GetWebhookByOrgID(c.Org.Organization.ID, c.ParamsInt64(":id")) } if err != nil { c.NotFoundOrError(err, "get webhook") @@ -303,13 +303,13 @@ func loadWebhook(c *context.Context, orCtx *orgRepoContext) *db.Webhook { c.Data["Webhook"] = w switch w.HookTaskType { - case db.SLACK: + case database.SLACK: c.Data["SlackMeta"] = w.SlackMeta() c.Data["HookType"] = "slack" - case db.DISCORD: + case database.DISCORD: c.Data["SlackMeta"] = w.SlackMeta() c.Data["HookType"] = "discord" - case db.DINGTALK: + case database.DINGTALK: c.Data["HookType"] = "dingtalk" default: c.Data["HookType"] = "gogs" @@ -338,7 +338,7 @@ func WebhooksEdit(c *context.Context, orCtx *orgRepoContext) { c.Success(orCtx.TmplNew) } -func validateAndUpdateWebhook(c *context.Context, orCtx *orgRepoContext, w *db.Webhook) { +func validateAndUpdateWebhook(c *context.Context, orCtx *orgRepoContext, w *database.Webhook) { c.Data["Webhook"] = w if c.HasError() { @@ -356,7 +356,7 @@ func validateAndUpdateWebhook(c *context.Context, orCtx *orgRepoContext, w *db.W if err := w.UpdateEvent(); err != nil { c.Error(err, "update event") return - } else if err := db.UpdateWebhook(w); err != nil { + } else if err := database.UpdateWebhook(w); err != nil { c.Error(err, "update webhook") return } @@ -375,9 +375,9 @@ func WebhooksEditPost(c *context.Context, orCtx *orgRepoContext, f form.NewWebho return } - contentType := db.JSON - if db.HookContentType(f.ContentType) == db.FORM { - contentType = db.FORM + contentType := database.JSON + if database.HookContentType(f.ContentType) == database.FORM { + contentType = database.FORM } w.URL = f.PayloadURL @@ -398,7 +398,7 @@ func WebhooksSlackEditPost(c *context.Context, orCtx *orgRepoContext, f form.New return } - meta, err := jsoniter.Marshal(&db.SlackMeta{ + meta, err := jsoniter.Marshal(&database.SlackMeta{ Channel: f.Channel, Username: f.Username, IconURL: f.IconURL, @@ -426,7 +426,7 @@ func WebhooksDiscordEditPost(c *context.Context, orCtx *orgRepoContext, f form.N return } - meta, err := jsoniter.Marshal(&db.SlackMeta{ + meta, err := jsoniter.Marshal(&database.SlackMeta{ Username: f.Username, IconURL: f.IconURL, Color: f.Color, @@ -475,7 +475,7 @@ func TestWebhook(c *context.Context) { if c.Repo.Commit == nil { commitID = git.EmptyID commitMessage = "This is a fake commit" - ghost := db.NewGhostUser() + ghost := database.NewGhostUser() author = &git.Signature{ Name: ghost.DisplayName(), Email: ghost.Email, @@ -493,18 +493,18 @@ func TestWebhook(c *context.Context) { committer = c.Repo.Commit.Committer // Try to match email with a real user. - author, err := db.Users.GetByEmail(c.Req.Context(), c.Repo.Commit.Author.Email) + author, err := database.Users.GetByEmail(c.Req.Context(), c.Repo.Commit.Author.Email) if err == nil { authorUsername = author.Name - } else if !db.IsErrUserNotExist(err) { + } else if !database.IsErrUserNotExist(err) { c.Error(err, "get user by email") return } - user, err := db.Users.GetByEmail(c.Req.Context(), c.Repo.Commit.Committer.Email) + user, err := database.Users.GetByEmail(c.Req.Context(), c.Repo.Commit.Committer.Email) if err == nil { committerUsername = user.Name - } else if !db.IsErrUserNotExist(err) { + } else if !database.IsErrUserNotExist(err) { c.Error(err, "get user by email") return } @@ -545,7 +545,7 @@ func TestWebhook(c *context.Context) { Pusher: apiUser, Sender: apiUser, } - if err := db.TestWebhook(c.Repo.Repository, db.HOOK_EVENT_PUSH, p, c.ParamsInt64("id")); err != nil { + if err := database.TestWebhook(c.Repo.Repository, database.HOOK_EVENT_PUSH, p, c.ParamsInt64("id")); err != nil { c.Error(err, "test webhook") return } @@ -555,25 +555,25 @@ func TestWebhook(c *context.Context) { } func RedeliveryWebhook(c *context.Context) { - webhook, err := db.GetWebhookOfRepoByID(c.Repo.Repository.ID, c.ParamsInt64(":id")) + webhook, err := database.GetWebhookOfRepoByID(c.Repo.Repository.ID, c.ParamsInt64(":id")) if err != nil { c.NotFoundOrError(err, "get webhook") return } - hookTask, err := db.GetHookTaskOfWebhookByUUID(webhook.ID, c.Query("uuid")) + hookTask, err := database.GetHookTaskOfWebhookByUUID(webhook.ID, c.Query("uuid")) if err != nil { c.NotFoundOrError(err, "get hook task by UUID") return } hookTask.IsDelivered = false - if err = db.UpdateHookTask(hookTask); err != nil { + if err = database.UpdateHookTask(hookTask); err != nil { c.Error(err, "update hook task") return } - go db.HookQueue.Add(c.Repo.Repository.ID) + go database.HookQueue.Add(c.Repo.Repository.ID) c.Flash.Info(c.Tr("repo.settings.webhook.redelivery_success", hookTask.UUID)) c.Status(http.StatusOK) } @@ -581,9 +581,9 @@ func RedeliveryWebhook(c *context.Context) { func DeleteWebhook(c *context.Context, orCtx *orgRepoContext) { var err error if orCtx.RepoID > 0 { - err = db.DeleteWebhookOfRepoByID(orCtx.RepoID, c.QueryInt64("id")) + err = database.DeleteWebhookOfRepoByID(orCtx.RepoID, c.QueryInt64("id")) } else { - err = db.DeleteWebhookOfOrgByID(orCtx.OrgID, c.QueryInt64("id")) + err = database.DeleteWebhookOfOrgByID(orCtx.OrgID, c.QueryInt64("id")) } if err != nil { c.Error(err, "delete webhook") diff --git a/internal/route/repo/webhook_test.go b/internal/route/repo/webhook_test.go index 3c25ba993..2b9037726 100644 --- a/internal/route/repo/webhook_test.go +++ b/internal/route/repo/webhook_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/mocks" ) @@ -23,21 +23,21 @@ func Test_validateWebhook(t *testing.T) { tests := []struct { name string - actor *db.User - webhook *db.Webhook + actor *database.User + webhook *database.Webhook expField string expMsg string expOK bool }{ { name: "admin bypass local address check", - webhook: &db.Webhook{URL: "https://www.google.com"}, + webhook: &database.Webhook{URL: "https://www.google.com"}, expOK: true, }, { name: "local address not allowed", - webhook: &db.Webhook{URL: "http://localhost:3306"}, + webhook: &database.Webhook{URL: "http://localhost:3306"}, expField: "PayloadURL", expMsg: "repo.settings.webhook.url_resolved_to_blocked_local_address", expOK: false, diff --git a/internal/route/repo/wiki.go b/internal/route/repo/wiki.go index 4ddb92d6c..c64cb673d 100644 --- a/internal/route/repo/wiki.go +++ b/internal/route/repo/wiki.go @@ -11,7 +11,7 @@ import ( "github.com/gogs/git-module" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/form" "gogs.io/gogs/internal/gitutil" "gogs.io/gogs/internal/markup" @@ -67,7 +67,7 @@ func renderWikiPage(c *context.Context, isViewPage bool) (*git.Repository, strin name := strings.TrimSuffix(entries[i].Name(), ".md") pages = append(pages, PageMeta{ Name: name, - URL: db.ToWikiPageURL(name), + URL: database.ToWikiPageURL(name), }) } } @@ -80,7 +80,7 @@ func renderWikiPage(c *context.Context, isViewPage bool) (*git.Repository, strin } c.Data["PageURL"] = pageURL - pageName := db.ToWikiPageName(pageURL) + pageName := database.ToWikiPageName(pageURL) c.Data["old_title"] = pageName c.Data["Title"] = pageName c.Data["title"] = pageName @@ -170,7 +170,7 @@ func WikiPages(c *context.Context) { name := strings.TrimSuffix(entries[i].Name(), ".md") pages = append(pages, PageMeta{ Name: name, - URL: db.ToWikiPageURL(name), + URL: database.ToWikiPageURL(name), Updated: commits[0].Author.When, }) } @@ -203,7 +203,7 @@ func NewWikiPost(c *context.Context, f form.NewWiki) { } if err := c.Repo.Repository.AddWikiPage(c.User, f.Title, f.Content, f.Message); err != nil { - if db.IsErrWikiAlreadyExist(err) { + if database.IsErrWikiAlreadyExist(err) { c.Data["Err_Title"] = true c.RenderWithErr(c.Tr("repo.wiki.page_already_exists"), WIKI_NEW, &f) } else { @@ -212,7 +212,7 @@ func NewWikiPost(c *context.Context, f form.NewWiki) { return } - c.Redirect(c.Repo.RepoLink + "/wiki/" + db.ToWikiPageURL(db.ToWikiPageName(f.Title))) + c.Redirect(c.Repo.RepoLink + "/wiki/" + database.ToWikiPageURL(database.ToWikiPageName(f.Title))) } func EditWiki(c *context.Context) { @@ -248,7 +248,7 @@ func EditWikiPost(c *context.Context, f form.NewWiki) { return } - c.Redirect(c.Repo.RepoLink + "/wiki/" + db.ToWikiPageURL(db.ToWikiPageName(f.Title))) + c.Redirect(c.Repo.RepoLink + "/wiki/" + database.ToWikiPageURL(database.ToWikiPageName(f.Title))) } func DeleteWikiPagePost(c *context.Context) { @@ -257,7 +257,7 @@ func DeleteWikiPagePost(c *context.Context) { pageURL = "Home" } - pageName := db.ToWikiPageName(pageURL) + pageName := database.ToWikiPageName(pageURL) if err := c.Repo.Repository.DeleteWikiPage(c.User, pageName); err != nil { c.Error(err, "delete wiki page") return diff --git a/internal/route/user/auth.go b/internal/route/user/auth.go index 1e6a05896..3263f7b80 100644 --- a/internal/route/user/auth.go +++ b/internal/route/user/auth.go @@ -18,7 +18,7 @@ import ( "gogs.io/gogs/internal/auth" "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/email" "gogs.io/gogs/internal/form" "gogs.io/gogs/internal/tool" @@ -37,7 +37,7 @@ const ( // AutoLogin reads cookie and try to auto-login. func AutoLogin(c *context.Context) (bool, error) { - if !db.HasEngine { + if !database.HasEngine { return false, nil } @@ -56,9 +56,9 @@ func AutoLogin(c *context.Context) (bool, error) { } }() - u, err := db.Users.GetByUsername(c.Req.Context(), uname) + u, err := database.Users.GetByUsername(c.Req.Context(), uname) if err != nil { - if !db.IsErrUserNotExist(err) { + if !database.IsErrUserNotExist(err) { return false, fmt.Errorf("get user by name: %v", err) } return false, nil @@ -106,7 +106,7 @@ func Login(c *context.Context) { } // Display normal login page - loginSources, err := db.LoginSources.List(c.Req.Context(), db.ListLoginSourceOptions{OnlyActivated: true}) + loginSources, err := database.LoginSources.List(c.Req.Context(), database.ListLoginSourceOptions{OnlyActivated: true}) if err != nil { c.Error(err, "list activated login sources") return @@ -122,7 +122,7 @@ func Login(c *context.Context) { c.Success(LOGIN) } -func afterLogin(c *context.Context, u *db.User, remember bool) { +func afterLogin(c *context.Context, u *database.User, remember bool) { if remember { days := 86400 * conf.Security.LoginRememberDays c.SetCookie(conf.Security.CookieUsername, u.Name, days, conf.Server.Subpath, "", conf.Security.CookieSecure, true) @@ -153,7 +153,7 @@ func afterLogin(c *context.Context, u *db.User, remember bool) { func LoginPost(c *context.Context, f form.SignIn) { c.Title("sign_in") - loginSources, err := db.LoginSources.List(c.Req.Context(), db.ListLoginSourceOptions{OnlyActivated: true}) + loginSources, err := database.LoginSources.List(c.Req.Context(), database.ListLoginSourceOptions{OnlyActivated: true}) if err != nil { c.Error(err, "list activated login sources") return @@ -165,13 +165,13 @@ func LoginPost(c *context.Context, f form.SignIn) { return } - u, err := db.Users.Authenticate(c.Req.Context(), f.UserName, f.Password, f.LoginSource) + u, err := database.Users.Authenticate(c.Req.Context(), f.UserName, f.Password, f.LoginSource) if err != nil { switch { case auth.IsErrBadCredentials(err): c.FormErr("UserName", "Password") c.RenderWithErr(c.Tr("form.username_password_incorrect"), LOGIN, &f) - case db.IsErrLoginSourceMismatch(err): + case database.IsErrLoginSourceMismatch(err): c.FormErr("LoginSource") c.RenderWithErr(c.Tr("form.auth_source_mismatch"), LOGIN, &f) @@ -187,7 +187,7 @@ func LoginPost(c *context.Context, f form.SignIn) { return } - if !db.TwoFactors.IsEnabled(c.Req.Context(), u.ID) { + if !database.TwoFactors.IsEnabled(c.Req.Context(), u.ID) { afterLogin(c, u, f.Remember) return } @@ -214,7 +214,7 @@ func LoginTwoFactorPost(c *context.Context) { return } - t, err := db.TwoFactors.GetByUserID(c.Req.Context(), userID) + t, err := database.TwoFactors.GetByUserID(c.Req.Context(), userID) if err != nil { c.Error(err, "get two factor by user ID") return @@ -231,7 +231,7 @@ func LoginTwoFactorPost(c *context.Context) { return } - u, err := db.Users.GetByID(c.Req.Context(), userID) + u, err := database.Users.GetByID(c.Req.Context(), userID) if err != nil { c.Error(err, "get user by ID") return @@ -267,8 +267,8 @@ func LoginTwoFactorRecoveryCodePost(c *context.Context) { return } - if err := db.UseRecoveryCode(userID, c.Query("recovery_code")); err != nil { - if db.IsTwoFactorRecoveryCodeNotFound(err) { + if err := database.UseRecoveryCode(userID, c.Query("recovery_code")); err != nil { + if database.IsTwoFactorRecoveryCodeNotFound(err) { c.Flash.Error(c.Tr("auth.login_two_factor_invalid_recovery_code")) c.RedirectSubpath("/user/login/two_factor_recovery_code") } else { @@ -277,7 +277,7 @@ func LoginTwoFactorRecoveryCodePost(c *context.Context) { return } - u, err := db.Users.GetByID(c.Req.Context(), userID) + u, err := database.Users.GetByID(c.Req.Context(), userID) if err != nil { c.Error(err, "get user by ID") return @@ -335,26 +335,26 @@ func SignUpPost(c *context.Context, cpt *captcha.Captcha, f form.Register) { return } - user, err := db.Users.Create( + user, err := database.Users.Create( c.Req.Context(), f.UserName, f.Email, - db.CreateUserOptions{ + database.CreateUserOptions{ Password: f.Password, Activated: !conf.Auth.RequireEmailConfirmation, }, ) if err != nil { switch { - case db.IsErrUserAlreadyExist(err): + case database.IsErrUserAlreadyExist(err): c.FormErr("UserName") c.RenderWithErr(c.Tr("form.username_been_taken"), SIGNUP, &f) - case db.IsErrEmailAlreadyUsed(err): + case database.IsErrEmailAlreadyUsed(err): c.FormErr("Email") c.RenderWithErr(c.Tr("form.email_been_used"), SIGNUP, &f) - case db.IsErrNameNotAllowed(err): + case database.IsErrNameNotAllowed(err): c.FormErr("UserName") - c.RenderWithErr(c.Tr("user.form.name_not_allowed", err.(db.ErrNameNotAllowed).Value()), SIGNUP, &f) + c.RenderWithErr(c.Tr("user.form.name_not_allowed", err.(database.ErrNameNotAllowed).Value()), SIGNUP, &f) default: c.Error(err, "create user") } @@ -366,12 +366,12 @@ func SignUpPost(c *context.Context, cpt *captcha.Captcha, f form.Register) { // should have a dedicate method to check whether the "user" table is empty. // // Auto-set admin for the only user. - if db.Users.Count(c.Req.Context()) == 1 { + if database.Users.Count(c.Req.Context()) == 1 { v := true - err := db.Users.Update( + err := database.Users.Update( c.Req.Context(), user.ID, - db.UpdateUserOptions{ + database.UpdateUserOptions{ IsActivated: &v, IsAdmin: &v, }, @@ -384,7 +384,7 @@ func SignUpPost(c *context.Context, cpt *captcha.Captcha, f form.Register) { // Send confirmation email. if conf.Auth.RequireEmailConfirmation && user.ID > 1 { - email.SendActivateAccountMail(c.Context, db.NewMailerUser(user)) + email.SendActivateAccountMail(c.Context, database.NewMailerUser(user)) c.Data["IsSendRegisterMail"] = true c.Data["Email"] = user.Email c.Data["Hours"] = conf.Auth.ActivateCodeLives / 60 @@ -401,7 +401,7 @@ func SignUpPost(c *context.Context, cpt *captcha.Captcha, f form.Register) { // parseUserFromCode returns user by username encoded in code. // It returns nil if code or username is invalid. -func parseUserFromCode(code string) (user *db.User) { +func parseUserFromCode(code string) (user *database.User) { if len(code) <= tool.TIME_LIMIT_CODE_LENGTH { return nil } @@ -409,9 +409,9 @@ func parseUserFromCode(code string) (user *db.User) { // Use tail hex username to query user hexStr := code[tool.TIME_LIMIT_CODE_LENGTH:] if b, err := hex.DecodeString(hexStr); err == nil { - if user, err = db.Users.GetByUsername(gocontext.TODO(), string(b)); user != nil { + if user, err = database.Users.GetByUsername(gocontext.TODO(), string(b)); user != nil { return user - } else if !db.IsErrUserNotExist(err) { + } else if !database.IsErrUserNotExist(err) { log.Error("Failed to get user by name %q: %v", string(b), err) } } @@ -420,7 +420,7 @@ func parseUserFromCode(code string) (user *db.User) { } // verify active code when active account -func verifyUserActiveCode(code string) (user *db.User) { +func verifyUserActiveCode(code string) (user *database.User) { minutes := conf.Auth.ActivateCodeLives if user = parseUserFromCode(code); user != nil { @@ -436,7 +436,7 @@ func verifyUserActiveCode(code string) (user *db.User) { } // verify active code when active account -func verifyActiveEmailCode(code, email string) *db.EmailAddress { +func verifyActiveEmailCode(code, email string) *database.EmailAddress { minutes := conf.Auth.ActivateCodeLives if user := parseUserFromCode(code); user != nil { @@ -445,7 +445,7 @@ func verifyActiveEmailCode(code, email string) *db.EmailAddress { data := com.ToStr(user.ID) + email + user.LowerName + user.Password + user.Rands if tool.VerifyTimeLimitCode(data, minutes, prefix) { - emailAddress, err := db.Users.GetEmail(gocontext.TODO(), user.ID, email, false) + emailAddress, err := database.Users.GetEmail(gocontext.TODO(), user.ID, email, false) if err == nil { return emailAddress } @@ -468,7 +468,7 @@ func Activate(c *context.Context) { c.Data["ResendLimited"] = true } else { c.Data["Hours"] = conf.Auth.ActivateCodeLives / 60 - email.SendActivateAccountMail(c.Context, db.NewMailerUser(c.User)) + email.SendActivateAccountMail(c.Context, database.NewMailerUser(c.User)) if err := c.Cache.Put(userutil.MailResendCacheKey(c.User.ID), 1, 180); err != nil { log.Error("Failed to put cache key 'mail resend': %v", err) @@ -484,10 +484,10 @@ func Activate(c *context.Context) { // Verify code. if user := verifyUserActiveCode(code); user != nil { v := true - err := db.Users.Update( + err := database.Users.Update( c.Req.Context(), user.ID, - db.UpdateUserOptions{ + database.UpdateUserOptions{ GenerateNewRands: true, IsActivated: &v, }, @@ -515,7 +515,7 @@ func ActivateEmail(c *context.Context) { // Verify code. if email := verifyActiveEmailCode(code, emailAddr); email != nil { - err := db.Users.MarkEmailActivated(c.Req.Context(), email.UserID, email.Email) + err := database.Users.MarkEmailActivated(c.Req.Context(), email.UserID, email.Email) if err != nil { c.Error(err, "activate email") return @@ -553,9 +553,9 @@ func ForgotPasswdPost(c *context.Context) { emailAddr := c.Query("email") c.Data["Email"] = emailAddr - u, err := db.Users.GetByEmail(c.Req.Context(), emailAddr) + u, err := database.Users.GetByEmail(c.Req.Context(), emailAddr) if err != nil { - if db.IsErrUserNotExist(err) { + if database.IsErrUserNotExist(err) { c.Data["Hours"] = conf.Auth.ActivateCodeLives / 60 c.Data["IsResetSent"] = true c.Success(FORGOT_PASSWORD) @@ -578,7 +578,7 @@ func ForgotPasswdPost(c *context.Context) { return } - email.SendResetPasswordMail(c.Context, db.NewMailerUser(u)) + email.SendResetPasswordMail(c.Context, database.NewMailerUser(u)) if err = c.Cache.Put(userutil.MailResendCacheKey(u.ID), 1, 180); err != nil { log.Error("Failed to put cache key 'mail resend': %v", err) } @@ -621,7 +621,7 @@ func ResetPasswdPost(c *context.Context) { return } - err := db.Users.Update(c.Req.Context(), u.ID, db.UpdateUserOptions{Password: &password}) + err := database.Users.Update(c.Req.Context(), u.ID, database.UpdateUserOptions{Password: &password}) if err != nil { c.Error(err, "update user") return diff --git a/internal/route/user/home.go b/internal/route/user/home.go index 4521f511b..e0fb94049 100644 --- a/internal/route/user/home.go +++ b/internal/route/user/home.go @@ -14,7 +14,7 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" ) const ( @@ -26,12 +26,12 @@ const ( ) // getDashboardContextUser finds out dashboard is viewing as which context user. -func getDashboardContextUser(c *context.Context) *db.User { +func getDashboardContextUser(c *context.Context) *database.User { ctxUser := c.User orgName := c.Params(":org") if len(orgName) > 0 { // Organization. - org, err := db.Users.GetByUsername(c.Req.Context(), orgName) + org, err := database.Users.GetByUsername(c.Req.Context(), orgName) if err != nil { c.NotFoundOrError(err, "get user by name") return nil @@ -40,9 +40,9 @@ func getDashboardContextUser(c *context.Context) *db.User { } c.Data["ContextUser"] = ctxUser - orgs, err := db.Orgs.List( + orgs, err := database.Orgs.List( c.Req.Context(), - db.ListOrgsOptions{ + database.ListOrgsOptions{ MemberID: c.User.ID, IncludePrivateMembers: true, }, @@ -59,15 +59,15 @@ func getDashboardContextUser(c *context.Context) *db.User { // retrieveFeeds loads feeds from database by given context user. // The user could be organization so it is not always the logged in user, // which is why we have to explicitly pass the context user ID. -func retrieveFeeds(c *context.Context, ctxUser *db.User, userID int64, isProfile bool) { +func retrieveFeeds(c *context.Context, ctxUser *database.User, userID int64, isProfile bool) { afterID := c.QueryInt64("after_id") var err error - var actions []*db.Action + var actions []*database.Action if ctxUser.IsOrganization() { - actions, err = db.Actions.ListByOrganization(c.Req.Context(), ctxUser.ID, userID, afterID) + actions, err = database.Actions.ListByOrganization(c.Req.Context(), ctxUser.ID, userID, afterID) } else { - actions, err = db.Actions.ListByUser(c.Req.Context(), ctxUser.ID, userID, afterID, isProfile) + actions, err = database.Actions.ListByUser(c.Req.Context(), ctxUser.ID, userID, afterID, isProfile) } if err != nil { c.Error(err, "list actions") @@ -75,15 +75,15 @@ func retrieveFeeds(c *context.Context, ctxUser *db.User, userID int64, isProfile } // Check access of private repositories. - feeds := make([]*db.Action, 0, len(actions)) + feeds := make([]*database.Action, 0, len(actions)) unameAvatars := make(map[string]string) for _, act := range actions { // Cache results to reduce queries. _, ok := unameAvatars[act.ActUserName] if !ok { - u, err := db.Users.GetByUsername(c.Req.Context(), act.ActUserName) + u, err := database.Users.GetByUsername(c.Req.Context(), act.ActUserName) if err != nil { - if db.IsErrUserNotExist(err) { + if database.IsErrUserNotExist(err) { continue } c.Error(err, "get user by name") @@ -125,11 +125,11 @@ func Dashboard(c *context.Context) { // Only user can have collaborative repositories. if !ctxUser.IsOrganization() { - collaborateRepos, err := db.Repos.GetByCollaboratorID(c.Req.Context(), c.User.ID, conf.UI.User.RepoPagingNum, "updated_unix DESC") + collaborateRepos, err := database.Repos.GetByCollaboratorID(c.Req.Context(), c.User.ID, conf.UI.User.RepoPagingNum, "updated_unix DESC") if err != nil { c.Error(err, "get accessible repositories by collaborator") return - } else if err = db.RepositoryList(collaborateRepos).LoadAttributes(); err != nil { + } else if err = database.RepositoryList(collaborateRepos).LoadAttributes(); err != nil { c.Error(err, "load attributes") return } @@ -137,7 +137,7 @@ func Dashboard(c *context.Context) { } var err error - var repos, mirrors []*db.Repository + var repos, mirrors []*database.Repository var repoCount int64 if ctxUser.IsOrganization() { repos, repoCount, err = ctxUser.GetUserRepositories(c.User.ID, 1, conf.UI.User.RepoPagingNum) @@ -152,8 +152,8 @@ func Dashboard(c *context.Context) { return } } else { - repos, err = db.GetUserRepositories( - &db.UserRepoOptions{ + repos, err = database.GetUserRepositories( + &database.UserRepoOptions{ UserID: ctxUser.ID, Private: true, Page: 1, @@ -166,7 +166,7 @@ func Dashboard(c *context.Context) { } repoCount = int64(ctxUser.NumRepos) - mirrors, err = db.GetUserMirrorRepositories(ctxUser.ID) + mirrors, err = database.GetUserMirrorRepositories(ctxUser.ID) if err != nil { c.Error(err, "get mirror repositories") return @@ -176,7 +176,7 @@ func Dashboard(c *context.Context) { c.Data["RepoCount"] = repoCount c.Data["MaxShowRepoNum"] = conf.UI.User.RepoPagingNum - if err := db.MirrorRepositoryList(mirrors).LoadAttributes(); err != nil { + if err := database.MirrorRepositoryList(mirrors).LoadAttributes(); err != nil { c.Error(err, "load attributes") return } @@ -203,21 +203,21 @@ func Issues(c *context.Context) { var ( sortType = c.Query("sort") - filterMode = db.FILTER_MODE_YOUR_REPOS + filterMode = database.FILTER_MODE_YOUR_REPOS ) // Note: Organization does not have view type and filter mode. if !ctxUser.IsOrganization() { viewType := c.Query("type") types := []string{ - string(db.FILTER_MODE_YOUR_REPOS), - string(db.FILTER_MODE_ASSIGN), - string(db.FILTER_MODE_CREATE), + string(database.FILTER_MODE_YOUR_REPOS), + string(database.FILTER_MODE_ASSIGN), + string(database.FILTER_MODE_CREATE), } if !com.IsSliceContainsStr(types, viewType) { - viewType = string(db.FILTER_MODE_YOUR_REPOS) + viewType = string(database.FILTER_MODE_YOUR_REPOS) } - filterMode = db.FilterMode(viewType) + filterMode = database.FilterMode(viewType) } page := c.QueryInt("page") @@ -231,9 +231,9 @@ func Issues(c *context.Context) { // Get repositories. var ( err error - repos []*db.Repository + repos []*database.Repository userRepoIDs []int64 - showRepos = make([]*db.Repository, 0, 10) + showRepos = make([]*database.Repository, 0, 10) ) if ctxUser.IsOrganization() { repos, _, err = ctxUser.GetUserRepositories(c.User.ID, 1, ctxUser.NumRepos) @@ -242,8 +242,8 @@ func Issues(c *context.Context) { return } } else { - repos, err = db.GetUserRepositories( - &db.UserRepoOptions{ + repos, err = database.GetUserRepositories( + &database.UserRepoOptions{ UserID: ctxUser.ID, Private: true, Page: 1, @@ -260,7 +260,7 @@ func Issues(c *context.Context) { for _, repo := range repos { userRepoIDs = append(userRepoIDs, repo.ID) - if filterMode != db.FILTER_MODE_YOUR_REPOS { + if filterMode != database.FILTER_MODE_YOUR_REPOS { continue } @@ -282,14 +282,14 @@ func Issues(c *context.Context) { // Filter repositories if the page shows issues. if !isPullList { - userRepoIDs, err = db.FilterRepositoryWithIssues(userRepoIDs) + userRepoIDs, err = database.FilterRepositoryWithIssues(userRepoIDs) if err != nil { c.Error(err, "filter repositories with issues") return } } - issueOptions := &db.IssuesOptions{ + issueOptions := &database.IssuesOptions{ RepoID: repoID, Page: page, IsClosed: isShowClosed, @@ -297,7 +297,7 @@ func Issues(c *context.Context) { SortType: sortType, } switch filterMode { - case db.FILTER_MODE_YOUR_REPOS: + case database.FILTER_MODE_YOUR_REPOS: // Get all issues from repositories from this user. if userRepoIDs == nil { issueOptions.RepoIDs = []int64{-1} @@ -305,23 +305,23 @@ func Issues(c *context.Context) { issueOptions.RepoIDs = userRepoIDs } - case db.FILTER_MODE_ASSIGN: + case database.FILTER_MODE_ASSIGN: // Get all issues assigned to this user. issueOptions.AssigneeID = ctxUser.ID - case db.FILTER_MODE_CREATE: + case database.FILTER_MODE_CREATE: // Get all issues created by this user. issueOptions.PosterID = ctxUser.ID } - issues, err := db.Issues(issueOptions) + issues, err := database.Issues(issueOptions) if err != nil { c.Error(err, "list issues") return } if repoID > 0 { - repo, err := db.GetRepositoryByID(repoID) + repo, err := database.GetRepositoryByID(repoID) if err != nil { c.Error(err, "get repository by ID") return @@ -346,7 +346,7 @@ func Issues(c *context.Context) { } } - issueStats := db.GetUserIssueStats(repoID, ctxUser.ID, userRepoIDs, filterMode, isPullList) + issueStats := database.GetUserIssueStats(repoID, ctxUser.ID, userRepoIDs, filterMode, isPullList) var total int if !isShowClosed { @@ -374,7 +374,7 @@ func Issues(c *context.Context) { } func ShowSSHKeys(c *context.Context, uid int64) { - keys, err := db.ListPublicKeys(uid) + keys, err := database.ListPublicKeys(uid) if err != nil { c.Error(err, "list public keys") return @@ -404,7 +404,7 @@ func showOrgProfile(c *context.Context) { } var ( - repos []*db.Repository + repos []*database.Repository count int64 err error ) @@ -417,7 +417,7 @@ func showOrgProfile(c *context.Context) { c.Data["Repos"] = repos } else { showPrivate := c.IsLogged && c.User.IsAdmin - repos, err = db.GetUserRepositories(&db.UserRepoOptions{ + repos, err = database.GetUserRepositories(&database.UserRepoOptions{ UserID: org.ID, Private: showPrivate, Page: page, @@ -428,7 +428,7 @@ func showOrgProfile(c *context.Context) { return } c.Data["Repos"] = repos - count = db.CountUserRepositories(org.ID, showPrivate) + count = database.CountUserRepositories(org.ID, showPrivate) } c.Data["Page"] = paginater.New(int(count), conf.UI.User.RepoPagingNum, page, 5) @@ -444,7 +444,7 @@ func showOrgProfile(c *context.Context) { } func Email2User(c *context.Context) { - u, err := db.Users.GetByEmail(c.Req.Context(), c.Query("email")) + u, err := database.Users.GetByEmail(c.Req.Context(), c.Query("email")) if err != nil { c.NotFoundOrError(err, "get user by email") return diff --git a/internal/route/user/profile.go b/internal/route/user/profile.go index 799868ca2..350abbf5f 100644 --- a/internal/route/user/profile.go +++ b/internal/route/user/profile.go @@ -11,7 +11,7 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/route/repo" "gogs.io/gogs/internal/tool" ) @@ -42,7 +42,7 @@ func Profile(c *context.Context, puser *context.ParamsUser) { c.PageIs("UserProfile") c.Data["Owner"] = puser - orgs, err := db.GetOrgsByUserID(puser.ID, c.IsLogged && (c.User.IsAdmin || c.User.ID == puser.ID)) + orgs, err := database.GetOrgsByUserID(puser.ID, c.IsLogged && (c.User.IsAdmin || c.User.ID == puser.ID)) if err != nil { c.Error(err, "get organizations by user ID") return @@ -65,7 +65,7 @@ func Profile(c *context.Context, puser *context.ParamsUser) { } showPrivate := c.IsLogged && (puser.ID == c.User.ID || c.User.IsAdmin) - c.Data["Repos"], err = db.GetUserRepositories(&db.UserRepoOptions{ + c.Data["Repos"], err = database.GetUserRepositories(&database.UserRepoOptions{ UserID: puser.ID, Private: showPrivate, Page: page, @@ -76,7 +76,7 @@ func Profile(c *context.Context, puser *context.ParamsUser) { return } - count := db.CountUserRepositories(puser.ID, showPrivate) + count := database.CountUserRepositories(puser.ID, showPrivate) c.Data["Page"] = paginater.New(int(count), conf.UI.User.RepoPagingNum, page, 5) } @@ -91,8 +91,8 @@ func Followers(c *context.Context, puser *context.ParamsUser) { repo.RenderUserCards( c, puser.NumFollowers, - func(page int) ([]*db.User, error) { - return db.Users.ListFollowers(c.Req.Context(), puser.ID, page, db.ItemsPerPage) + func(page int) ([]*database.User, error) { + return database.Users.ListFollowers(c.Req.Context(), puser.ID, page, database.ItemsPerPage) }, FOLLOWERS, ) @@ -106,8 +106,8 @@ func Following(c *context.Context, puser *context.ParamsUser) { repo.RenderUserCards( c, puser.NumFollowing, - func(page int) ([]*db.User, error) { - return db.Users.ListFollowings(c.Req.Context(), puser.ID, page, db.ItemsPerPage) + func(page int) ([]*database.User, error) { + return database.Users.ListFollowings(c.Req.Context(), puser.ID, page, database.ItemsPerPage) }, FOLLOWERS, ) @@ -120,9 +120,9 @@ func Action(c *context.Context, puser *context.ParamsUser) { var err error switch c.Params(":action") { case "follow": - err = db.Users.Follow(c.Req.Context(), c.UserID(), puser.ID) + err = database.Users.Follow(c.Req.Context(), c.UserID(), puser.ID) case "unfollow": - err = db.Users.Unfollow(c.Req.Context(), c.UserID(), puser.ID) + err = database.Users.Unfollow(c.Req.Context(), c.UserID(), puser.ID) } if err != nil { diff --git a/internal/route/user/setting.go b/internal/route/user/setting.go index 6ee5fa4d3..bd24f8043 100644 --- a/internal/route/user/setting.go +++ b/internal/route/user/setting.go @@ -21,7 +21,7 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/context" "gogs.io/gogs/internal/cryptoutil" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/email" "gogs.io/gogs/internal/form" "gogs.io/gogs/internal/tool" @@ -70,15 +70,15 @@ func SettingsPost(c *context.Context, f form.UpdateProfile) { if c.User.IsLocal() { // Check if the username (including cases) had been changed if c.User.Name != f.Name { - err := db.Users.ChangeUsername(c.Req.Context(), c.User.ID, f.Name) + err := database.Users.ChangeUsername(c.Req.Context(), c.User.ID, f.Name) if err != nil { c.FormErr("Name") var msg string switch { - case db.IsErrUserAlreadyExist(errors.Cause(err)): + case database.IsErrUserAlreadyExist(errors.Cause(err)): msg = c.Tr("form.username_been_taken") - case db.IsErrNameNotAllowed(errors.Cause(err)): - msg = c.Tr("user.form.name_not_allowed", err.(db.ErrNameNotAllowed).Value()) + case database.IsErrNameNotAllowed(errors.Cause(err)): + msg = c.Tr("user.form.name_not_allowed", err.(database.ErrNameNotAllowed).Value()) default: c.Error(err, "change user name") return @@ -92,10 +92,10 @@ func SettingsPost(c *context.Context, f form.UpdateProfile) { } } - err := db.Users.Update( + err := database.Users.Update( c.Req.Context(), c.User.ID, - db.UpdateUserOptions{ + database.UpdateUserOptions{ FullName: &f.FullName, Website: &f.Website, Location: &f.Location, @@ -111,13 +111,13 @@ func SettingsPost(c *context.Context, f form.UpdateProfile) { } // FIXME: limit upload size -func UpdateAvatarSetting(c *context.Context, f form.Avatar, ctxUser *db.User) error { +func UpdateAvatarSetting(c *context.Context, f form.Avatar, ctxUser *database.User) error { if f.Source == form.AvatarLookup && f.Gravatar != "" { avatar := cryptoutil.MD5(f.Gravatar) - err := db.Users.Update( + err := database.Users.Update( c.Req.Context(), ctxUser.ID, - db.UpdateUserOptions{ + database.UpdateUserOptions{ Avatar: &avatar, AvatarEmail: &f.Gravatar, }, @@ -126,7 +126,7 @@ func UpdateAvatarSetting(c *context.Context, f form.Avatar, ctxUser *db.User) er return errors.Wrap(err, "update user") } - err = db.Users.DeleteCustomAvatar(c.Req.Context(), c.User.ID) + err = database.Users.DeleteCustomAvatar(c.Req.Context(), c.User.ID) if err != nil { return errors.Wrap(err, "delete custom avatar") } @@ -148,7 +148,7 @@ func UpdateAvatarSetting(c *context.Context, f form.Avatar, ctxUser *db.User) er return errors.New(c.Tr("settings.uploaded_avatar_not_a_image")) } - err = db.Users.UseCustomAvatar(c.Req.Context(), ctxUser.ID, data) + err = database.Users.UseCustomAvatar(c.Req.Context(), ctxUser.ID, data) if err != nil { return errors.Wrap(err, "save avatar") } @@ -174,7 +174,7 @@ func SettingsAvatarPost(c *context.Context, f form.Avatar) { } func SettingsDeleteAvatar(c *context.Context) { - err := db.Users.DeleteCustomAvatar(c.Req.Context(), c.User.ID) + err := database.Users.DeleteCustomAvatar(c.Req.Context(), c.User.ID) if err != nil { c.Flash.Error(fmt.Sprintf("Failed to delete avatar: %v", err)) } @@ -202,10 +202,10 @@ func SettingsPasswordPost(c *context.Context, f form.ChangePassword) { } else if f.Password != f.Retype { c.Flash.Error(c.Tr("form.password_not_match")) } else { - err := db.Users.Update( + err := database.Users.Update( c.Req.Context(), c.User.ID, - db.UpdateUserOptions{ + database.UpdateUserOptions{ Password: &f.Password, }, ) @@ -223,7 +223,7 @@ func SettingsEmails(c *context.Context) { c.Title("settings.emails") c.PageIs("SettingsEmails") - emails, err := db.Users.ListEmails(c.Req.Context(), c.User.ID) + emails, err := database.Users.ListEmails(c.Req.Context(), c.User.ID) if err != nil { c.Errorf(err, "get email addresses") return @@ -238,7 +238,7 @@ func SettingsEmailPost(c *context.Context, f form.AddEmail) { c.PageIs("SettingsEmails") if c.Query("_method") == "PRIMARY" { - err := db.Users.MarkEmailPrimary(c.Req.Context(), c.User.ID, c.Query("email")) + err := database.Users.MarkEmailPrimary(c.Req.Context(), c.User.ID, c.Query("email")) if err != nil { c.Errorf(err, "make email primary") return @@ -249,7 +249,7 @@ func SettingsEmailPost(c *context.Context, f form.AddEmail) { } // Add Email address. - emails, err := db.Users.ListEmails(c.Req.Context(), c.User.ID) + emails, err := database.Users.ListEmails(c.Req.Context(), c.User.ID) if err != nil { c.Errorf(err, "get email addresses") return @@ -261,9 +261,9 @@ func SettingsEmailPost(c *context.Context, f form.AddEmail) { return } - err = db.Users.AddEmail(c.Req.Context(), c.User.ID, f.Email, !conf.Auth.RequireEmailConfirmation) + err = database.Users.AddEmail(c.Req.Context(), c.User.ID, f.Email, !conf.Auth.RequireEmailConfirmation) if err != nil { - if db.IsErrEmailAlreadyUsed(err) { + if database.IsErrEmailAlreadyUsed(err) { c.RenderWithErr(c.Tr("form.email_been_used"), SETTINGS_EMAILS, &f) } else { c.Errorf(err, "add email address") @@ -273,7 +273,7 @@ func SettingsEmailPost(c *context.Context, f form.AddEmail) { // Send confirmation email if conf.Auth.RequireEmailConfirmation { - email.SendActivateEmailMail(c.Context, db.NewMailerUser(c.User), f.Email) + email.SendActivateEmailMail(c.Context, database.NewMailerUser(c.User), f.Email) if err := c.Cache.Put("MailResendLimit_"+c.User.LowerName, c.User.LowerName, 180); err != nil { log.Error("Set cache 'MailResendLimit' failed: %v", err) @@ -296,7 +296,7 @@ func DeleteEmail(c *context.Context) { return } - err := db.Users.DeleteEmail(c.Req.Context(), c.User.ID, email) + err := database.Users.DeleteEmail(c.Req.Context(), c.User.ID, email) if err != nil { c.Error(err, "delete email address") return @@ -312,7 +312,7 @@ func SettingsSSHKeys(c *context.Context) { c.Title("settings.ssh_keys") c.PageIs("SettingsSSHKeys") - keys, err := db.ListPublicKeys(c.User.ID) + keys, err := database.ListPublicKeys(c.User.ID) if err != nil { c.Errorf(err, "list public keys") return @@ -326,7 +326,7 @@ func SettingsSSHKeysPost(c *context.Context, f form.AddSSHKey) { c.Title("settings.ssh_keys") c.PageIs("SettingsSSHKeys") - keys, err := db.ListPublicKeys(c.User.ID) + keys, err := database.ListPublicKeys(c.User.ID) if err != nil { c.Errorf(err, "list public keys") return @@ -338,9 +338,9 @@ func SettingsSSHKeysPost(c *context.Context, f form.AddSSHKey) { return } - content, err := db.CheckPublicKeyString(f.Content) + content, err := database.CheckPublicKeyString(f.Content) if err != nil { - if db.IsErrKeyUnableVerify(err) { + if database.IsErrKeyUnableVerify(err) { c.Flash.Info(c.Tr("form.unable_verify_ssh_key")) } else { c.Flash.Error(c.Tr("form.invalid_ssh_key", err.Error())) @@ -349,13 +349,13 @@ func SettingsSSHKeysPost(c *context.Context, f form.AddSSHKey) { } } - if _, err = db.AddPublicKey(c.User.ID, f.Title, content); err != nil { + if _, err = database.AddPublicKey(c.User.ID, f.Title, content); err != nil { c.Data["HasError"] = true switch { - case db.IsErrKeyAlreadyExist(err): + case database.IsErrKeyAlreadyExist(err): c.FormErr("Content") c.RenderWithErr(c.Tr("settings.ssh_key_been_used"), SETTINGS_SSH_KEYS, &f) - case db.IsErrKeyNameAlreadyUsed(err): + case database.IsErrKeyNameAlreadyUsed(err): c.FormErr("Title") c.RenderWithErr(c.Tr("settings.ssh_key_name_used"), SETTINGS_SSH_KEYS, &f) default: @@ -369,7 +369,7 @@ func SettingsSSHKeysPost(c *context.Context, f form.AddSSHKey) { } func DeleteSSHKey(c *context.Context) { - if err := db.DeletePublicKey(c.User, c.QueryInt64("id")); err != nil { + if err := database.DeletePublicKey(c.User, c.QueryInt64("id")); err != nil { c.Flash.Error("DeletePublicKey: " + err.Error()) } else { c.Flash.Success(c.Tr("settings.ssh_key_deletion_success")) @@ -384,8 +384,8 @@ func SettingsSecurity(c *context.Context) { c.Title("settings.security") c.PageIs("SettingsSecurity") - t, err := db.TwoFactors.GetByUserID(c.Req.Context(), c.UserID()) - if err != nil && !db.IsErrTwoFactorNotFound(err) { + t, err := database.TwoFactors.GetByUserID(c.Req.Context(), c.UserID()) + if err != nil && !database.IsErrTwoFactorNotFound(err) { c.Errorf(err, "get two factor by user ID") return } @@ -395,7 +395,7 @@ func SettingsSecurity(c *context.Context) { } func SettingsTwoFactorEnable(c *context.Context) { - if db.TwoFactors.IsEnabled(c.Req.Context(), c.User.ID) { + if database.TwoFactors.IsEnabled(c.Req.Context(), c.User.ID) { c.NotFound() return } @@ -452,7 +452,7 @@ func SettingsTwoFactorEnablePost(c *context.Context) { return } - if err := db.TwoFactors.Create(c.Req.Context(), c.UserID(), conf.Security.SecretKey, secret); err != nil { + if err := database.TwoFactors.Create(c.Req.Context(), c.UserID(), conf.Security.SecretKey, secret); err != nil { c.Flash.Error(c.Tr("settings.two_factor_enable_error", err)) c.RedirectSubpath("/user/settings/security/two_factor_enable") return @@ -465,7 +465,7 @@ func SettingsTwoFactorEnablePost(c *context.Context) { } func SettingsTwoFactorRecoveryCodes(c *context.Context) { - if !db.TwoFactors.IsEnabled(c.Req.Context(), c.User.ID) { + if !database.TwoFactors.IsEnabled(c.Req.Context(), c.User.ID) { c.NotFound() return } @@ -473,7 +473,7 @@ func SettingsTwoFactorRecoveryCodes(c *context.Context) { c.Title("settings.two_factor_recovery_codes_title") c.PageIs("SettingsSecurity") - recoveryCodes, err := db.GetRecoveryCodesByUserID(c.UserID()) + recoveryCodes, err := database.GetRecoveryCodesByUserID(c.UserID()) if err != nil { c.Errorf(err, "get recovery codes by user ID") return @@ -484,12 +484,12 @@ func SettingsTwoFactorRecoveryCodes(c *context.Context) { } func SettingsTwoFactorRecoveryCodesPost(c *context.Context) { - if !db.TwoFactors.IsEnabled(c.Req.Context(), c.User.ID) { + if !database.TwoFactors.IsEnabled(c.Req.Context(), c.User.ID) { c.NotFound() return } - if err := db.RegenerateRecoveryCodes(c.UserID()); err != nil { + if err := database.RegenerateRecoveryCodes(c.UserID()); err != nil { c.Flash.Error(c.Tr("settings.two_factor_regenerate_recovery_codes_error", err)) } else { c.Flash.Success(c.Tr("settings.two_factor_regenerate_recovery_codes_success")) @@ -499,12 +499,12 @@ func SettingsTwoFactorRecoveryCodesPost(c *context.Context) { } func SettingsTwoFactorDisable(c *context.Context) { - if !db.TwoFactors.IsEnabled(c.Req.Context(), c.User.ID) { + if !database.TwoFactors.IsEnabled(c.Req.Context(), c.User.ID) { c.NotFound() return } - if err := db.DeleteTwoFactor(c.UserID()); err != nil { + if err := database.DeleteTwoFactor(c.UserID()); err != nil { c.Errorf(err, "delete two factor") return } @@ -519,12 +519,12 @@ func SettingsRepos(c *context.Context) { c.Title("settings.repos") c.PageIs("SettingsRepositories") - repos, err := db.GetUserAndCollaborativeRepositories(c.User.ID) + repos, err := database.GetUserAndCollaborativeRepositories(c.User.ID) if err != nil { c.Errorf(err, "get user and collaborative repositories") return } - if err = db.RepositoryList(repos).LoadAttributes(); err != nil { + if err = database.RepositoryList(repos).LoadAttributes(); err != nil { c.Errorf(err, "load attributes") return } @@ -534,7 +534,7 @@ func SettingsRepos(c *context.Context) { } func SettingsLeaveRepo(c *context.Context) { - repo, err := db.GetRepositoryByID(c.QueryInt64("id")) + repo, err := database.GetRepositoryByID(c.QueryInt64("id")) if err != nil { c.NotFoundOrError(err, "get repository by ID") return @@ -555,7 +555,7 @@ func SettingsOrganizations(c *context.Context) { c.Title("settings.orgs") c.PageIs("SettingsOrganizations") - orgs, err := db.GetOrgsByUserID(c.User.ID, true) + orgs, err := database.GetOrgsByUserID(c.User.ID, true) if err != nil { c.Errorf(err, "get organizations by user ID") return @@ -566,8 +566,8 @@ func SettingsOrganizations(c *context.Context) { } func SettingsLeaveOrganization(c *context.Context) { - if err := db.RemoveOrgUser(c.QueryInt64("id"), c.User.ID); err != nil { - if db.IsErrLastOrgOwner(err) { + if err := database.RemoveOrgUser(c.QueryInt64("id"), c.User.ID); err != nil { + if database.IsErrLastOrgOwner(err) { c.Flash.Error(c.Tr("form.last_org_owner")) } else { c.Errorf(err, "remove organization user") @@ -584,7 +584,7 @@ func SettingsApplications(c *context.Context) { c.Title("settings.applications") c.PageIs("SettingsApplications") - tokens, err := db.AccessTokens.List(c.Req.Context(), c.User.ID) + tokens, err := database.AccessTokens.List(c.Req.Context(), c.User.ID) if err != nil { c.Errorf(err, "list access tokens") return @@ -599,7 +599,7 @@ func SettingsApplicationsPost(c *context.Context, f form.NewAccessToken) { c.PageIs("SettingsApplications") if c.HasError() { - tokens, err := db.AccessTokens.List(c.Req.Context(), c.User.ID) + tokens, err := database.AccessTokens.List(c.Req.Context(), c.User.ID) if err != nil { c.Errorf(err, "list access tokens") return @@ -610,9 +610,9 @@ func SettingsApplicationsPost(c *context.Context, f form.NewAccessToken) { return } - t, err := db.AccessTokens.Create(c.Req.Context(), c.User.ID, f.Name) + t, err := database.AccessTokens.Create(c.Req.Context(), c.User.ID, f.Name) if err != nil { - if db.IsErrAccessTokenAlreadyExist(err) { + if database.IsErrAccessTokenAlreadyExist(err) { c.Flash.Error(c.Tr("settings.token_name_exists")) c.RedirectSubpath("/user/settings/applications") } else { @@ -627,7 +627,7 @@ func SettingsApplicationsPost(c *context.Context, f form.NewAccessToken) { } func SettingsDeleteApplication(c *context.Context) { - if err := db.AccessTokens.DeleteByID(c.Req.Context(), c.User.ID, c.QueryInt64("id")); err != nil { + if err := database.AccessTokens.DeleteByID(c.Req.Context(), c.User.ID, c.QueryInt64("id")); err != nil { c.Flash.Error("DeleteAccessTokenByID: " + err.Error()) } else { c.Flash.Success(c.Tr("settings.delete_token_success")) @@ -643,7 +643,7 @@ func SettingsDelete(c *context.Context) { c.PageIs("SettingsDelete") if c.Req.Method == "POST" { - if _, err := db.Users.Authenticate(c.Req.Context(), c.User.Name, c.Query("password"), c.User.LoginSource); err != nil { + if _, err := database.Users.Authenticate(c.Req.Context(), c.User.Name, c.Query("password"), c.User.LoginSource); err != nil { if auth.IsErrBadCredentials(err) { c.RenderWithErr(c.Tr("form.enterred_invalid_password"), SETTINGS_DELETE, nil) } else { @@ -652,12 +652,12 @@ func SettingsDelete(c *context.Context) { return } - if err := db.Users.DeleteByID(c.Req.Context(), c.User.ID, false); err != nil { + if err := database.Users.DeleteByID(c.Req.Context(), c.User.ID, false); err != nil { switch { - case db.IsErrUserOwnRepos(err): + case database.IsErrUserOwnRepos(err): c.Flash.Error(c.Tr("form.still_own_repo")) c.Redirect(conf.Server.Subpath + "/user/settings/delete") - case db.IsErrUserHasOrgs(err): + case database.IsErrUserHasOrgs(err): c.Flash.Error(c.Tr("form.still_has_org")) c.Redirect(conf.Server.Subpath + "/user/settings/delete") default: diff --git a/internal/ssh/ssh.go b/internal/ssh/ssh.go index 9fbd4a693..756099a8f 100644 --- a/internal/ssh/ssh.go +++ b/internal/ssh/ssh.go @@ -22,7 +22,7 @@ import ( log "unknwon.dev/clog/v2" "gogs.io/gogs/internal/conf" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/osutil" ) @@ -173,7 +173,7 @@ func Listen(opts conf.SSHOpts, appDataPath string) { MACs: opts.ServerMACs, }, PublicKeyCallback: func(conn ssh.ConnMetadata, key ssh.PublicKey) (*ssh.Permissions, error) { - pkey, err := db.SearchPublicKeyByContent(strings.TrimSpace(string(ssh.MarshalAuthorizedKey(key)))) + pkey, err := database.SearchPublicKeyByContent(strings.TrimSpace(string(ssh.MarshalAuthorizedKey(key)))) if err != nil { log.Error("SearchPublicKeyByContent: %v", err) return nil, err diff --git a/internal/template/template.go b/internal/template/template.go index 9c6ce5b10..d8bd48dcc 100644 --- a/internal/template/template.go +++ b/internal/template/template.go @@ -24,7 +24,7 @@ import ( "gogs.io/gogs/internal/conf" "gogs.io/gogs/internal/cryptoutil" - "gogs.io/gogs/internal/db" + "gogs.io/gogs/internal/database" "gogs.io/gogs/internal/gitutil" "gogs.io/gogs/internal/markup" "gogs.io/gogs/internal/strutil" @@ -250,8 +250,8 @@ func ActionIcon(opType int) string { } } -func ActionContent2Commits(act Actioner) *db.PushCommits { - push := db.NewPushCommits() +func ActionContent2Commits(act Actioner) *database.PushCommits { + push := database.NewPushCommits() if err := jsoniter.Unmarshal([]byte(act.GetContent()), push); err != nil { log.Error("Unmarshal:\n%s\nERROR: %v", act.GetContent(), err) } diff --git a/mockgen.yaml b/mockgen.yaml index 6a9a04ed9..68b5c9c13 100644 --- a/mockgen.yaml +++ b/mockgen.yaml @@ -21,9 +21,9 @@ mocks: # shared interface. # # By convention, the filename containing generated mocks should be `mocks_test.go`. - - filename: internal/db/mocks_test.go + - filename: internal/database/mocks_test.go sources: - - path: gogs.io/gogs/internal/db + - path: gogs.io/gogs/internal/database interfaces: - LoginSourcesStore - LoginSourceFilesStore @@ -34,7 +34,7 @@ mocks: - Provider - filename: internal/route/lfs/mocks_test.go sources: - - path: gogs.io/gogs/internal/db + - path: gogs.io/gogs/internal/database interfaces: - LFSStore - UsersStore