Merge branch 'main' into feature/bots

models/db/engine_test.go

@@ -12,6 +12,8 @@ import (
 	"code.gitea.io/gitea/models/unittest"
 	"code.gitea.io/gitea/modules/setting"
 
+	_ "code.gitea.io/gitea/cmd" // for TestPrimaryKeys
+
 	"github.com/stretchr/testify/assert"
 )
 
@@ -51,3 +53,34 @@ func TestDeleteOrphanedObjects(t *testing.T) {
 	assert.NoError(t, err)
 	assert.EqualValues(t, countBefore, countAfter)
 }
+
+func TestPrimaryKeys(t *testing.T) {
+	// Some dbs require that all tables have primary keys, see
+	//   https://github.com/go-gitea/gitea/issues/21086
+	//   https://github.com/go-gitea/gitea/issues/16802
+	// To avoid creating tables without primary key again, this test will check them.
+	// Import "code.gitea.io/gitea/cmd" to make sure each db.RegisterModel in init functions has been called.
+
+	beans, err := db.NamesToBean()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	whitelist := map[string]string{
+		"the_table_name_to_skip_checking": "Write a note here to explain why",
+	}
+
+	for _, bean := range beans {
+		table, err := db.TableInfo(bean)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if why, ok := whitelist[table.Name]; ok {
+			t.Logf("ignore %q because %q", table.Name, why)
+			continue
+		}
+		if len(table.PrimaryKeys) == 0 {
+			t.Errorf("table %q has no primary key", table.Name)
+		}
+	}
+}

models/fixtures/foreign_reference.yml

@@ -1 +0,0 @@
-[] # empty

models/foreignreference/error.go

@@ -1,52 +0,0 @@
-// Copyright 2022 Gitea. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package foreignreference
-
-import (
-	"fmt"
-
-	"code.gitea.io/gitea/modules/util"
-)
-
-// ErrLocalIndexNotExist represents a "LocalIndexNotExist" kind of error.
-type ErrLocalIndexNotExist struct {
-	RepoID       int64
-	ForeignIndex int64
-	Type         string
-}
-
-// ErrLocalIndexNotExist checks if an error is a ErrLocalIndexNotExist.
-func IsErrLocalIndexNotExist(err error) bool {
-	_, ok := err.(ErrLocalIndexNotExist)
-	return ok
-}
-
-func (err ErrLocalIndexNotExist) Error() string {
-	return fmt.Sprintf("repository %d has no LocalIndex for ForeignIndex %d of type %s", err.RepoID, err.ForeignIndex, err.Type)
-}
-
-func (err ErrLocalIndexNotExist) Unwrap() error {
-	return util.ErrNotExist
-}
-
-// ErrForeignIndexNotExist represents a "ForeignIndexNotExist" kind of error.
-type ErrForeignIndexNotExist struct {
-	RepoID     int64
-	LocalIndex int64
-	Type       string
-}
-
-// ErrForeignIndexNotExist checks if an error is a ErrForeignIndexNotExist.
-func IsErrForeignIndexNotExist(err error) bool {
-	_, ok := err.(ErrForeignIndexNotExist)
-	return ok
-}
-
-func (err ErrForeignIndexNotExist) Error() string {
-	return fmt.Sprintf("repository %d has no ForeignIndex for LocalIndex %d of type %s", err.RepoID, err.LocalIndex, err.Type)
-}
-
-func (err ErrForeignIndexNotExist) Unwrap() error {
-	return util.ErrNotExist
-}

models/foreignreference/foreignreference.go

@@ -1,31 +0,0 @@
-// Copyright 2022 Gitea. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package foreignreference
-
-import (
-	"code.gitea.io/gitea/models/db"
-)
-
-// Type* are valid values for the Type field of ForeignReference
-const (
-	TypeIssue         = "issue"
-	TypePullRequest   = "pull_request"
-	TypeComment       = "comment"
-	TypeReview        = "review"
-	TypeReviewComment = "review_comment"
-	TypeRelease       = "release"
-)
-
-// ForeignReference represents external references
-type ForeignReference struct {
-	// RepoID is the first column in all indices. now we only need 2 indices: (repo, local) and (repo, foreign, type)
-	RepoID       int64  `xorm:"UNIQUE(repo_foreign_type) INDEX(repo_local)" `
-	LocalIndex   int64  `xorm:"INDEX(repo_local)"` // the resource key inside Gitea, it can be IssueIndex, or some model ID.
-	ForeignIndex string `xorm:"INDEX UNIQUE(repo_foreign_type)"`
-	Type         string `xorm:"VARCHAR(16) INDEX UNIQUE(repo_foreign_type)"`
-}
-
-func init() {
-	db.RegisterModel(new(ForeignReference))
-}

models/issues/issue.go

@@ -9,11 +9,9 @@ import (
 	"fmt"
 	"regexp"
 	"sort"
-	"strconv"
 	"strings"
 
 	"code.gitea.io/gitea/models/db"
-	"code.gitea.io/gitea/models/foreignreference"
 	"code.gitea.io/gitea/models/organization"
 	"code.gitea.io/gitea/models/perm"
 	access_model "code.gitea.io/gitea/models/perm/access"
@@ -141,7 +139,6 @@ type Issue struct {
 	Reactions        ReactionList             `xorm:"-"`
 	TotalTrackedTime int64                    `xorm:"-"`
 	Assignees        []*user_model.User       `xorm:"-"`
-	ForeignReference *foreignreference.ForeignReference `xorm:"-"`
 
 	// IsLocked limits commenting abilities to users on an issue
 	// with write access
@@ -321,29 +318,6 @@ func (issue *Issue) loadReactions(ctx context.Context) (err error) {
 	return nil
 }
 
-func (issue *Issue) loadForeignReference(ctx context.Context) (err error) {
-	if issue.ForeignReference != nil {
-		return nil
-	}
-	reference := &foreignreference.ForeignReference{
-		RepoID:     issue.RepoID,
-		LocalIndex: issue.Index,
-		Type:       foreignreference.TypeIssue,
-	}
-	has, err := db.GetEngine(ctx).Get(reference)
-	if err != nil {
-		return err
-	} else if !has {
-		return foreignreference.ErrForeignIndexNotExist{
-			RepoID:     issue.RepoID,
-			LocalIndex: issue.Index,
-			Type:       foreignreference.TypeIssue,
-		}
-	}
-	issue.ForeignReference = reference
-	return nil
-}
-
 // LoadMilestone load milestone of this issue.
 func (issue *Issue) LoadMilestone(ctx context.Context) (err error) {
 	if (issue.Milestone == nil || issue.Milestone.ID != issue.MilestoneID) && issue.MilestoneID > 0 {
@@ -406,10 +380,6 @@ func (issue *Issue) LoadAttributes(ctx context.Context) (err error) {
 		}
 	}
 
-	if err = issue.loadForeignReference(ctx); err != nil && !foreignreference.IsErrForeignIndexNotExist(err) {
-		return err
-	}
-
 	return issue.loadReactions(ctx)
 }
 
@@ -1097,26 +1067,6 @@ func GetIssueByIndex(repoID, index int64) (*Issue, error) {
 	return issue, nil
 }
 
-// GetIssueByForeignIndex returns raw issue by foreign ID
-func GetIssueByForeignIndex(ctx context.Context, repoID, foreignIndex int64) (*Issue, error) {
-	reference := &foreignreference.ForeignReference{
-		RepoID:       repoID,
-		ForeignIndex: strconv.FormatInt(foreignIndex, 10),
-		Type:         foreignreference.TypeIssue,
-	}
-	has, err := db.GetEngine(ctx).Get(reference)
-	if err != nil {
-		return nil, err
-	} else if !has {
-		return nil, foreignreference.ErrLocalIndexNotExist{
-			RepoID:       repoID,
-			ForeignIndex: foreignIndex,
-			Type:         foreignreference.TypeIssue,
-		}
-	}
-	return GetIssueByIndex(repoID, reference.LocalIndex)
-}
-
 // GetIssueWithAttrsByIndex returns issue by index in a repository.
 func GetIssueWithAttrsByIndex(repoID, index int64) (*Issue, error) {
 	issue, err := GetIssueByIndex(repoID, index)

models/issues/issue_test.go

@@ -7,13 +7,11 @@ import (
 	"context"
 	"fmt"
 	"sort"
-	"strconv"
 	"sync"
 	"testing"
 	"time"
 
 	"code.gitea.io/gitea/models/db"
-	"code.gitea.io/gitea/models/foreignreference"
 	issues_model "code.gitea.io/gitea/models/issues"
 	"code.gitea.io/gitea/models/organization"
 	repo_model "code.gitea.io/gitea/models/repo"
@@ -501,38 +499,6 @@ func TestCorrectIssueStats(t *testing.T) {
 	assert.EqualValues(t, issueStats.OpenCount, issueAmount)
 }
 
-func TestIssueForeignReference(t *testing.T) {
-	assert.NoError(t, unittest.PrepareTestDatabase())
-	issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 4})
-	assert.NotEqualValues(t, issue.Index, issue.ID) // make sure they are different to avoid false positive
-
-	// it is fine for an issue to not have a foreign reference
-	err := issue.LoadAttributes(db.DefaultContext)
-	assert.NoError(t, err)
-	assert.Nil(t, issue.ForeignReference)
-
-	var foreignIndex int64 = 12345
-	_, err = issues_model.GetIssueByForeignIndex(context.Background(), issue.RepoID, foreignIndex)
-	assert.True(t, foreignreference.IsErrLocalIndexNotExist(err))
-
-	err = db.Insert(db.DefaultContext, &foreignreference.ForeignReference{
-		LocalIndex:   issue.Index,
-		ForeignIndex: strconv.FormatInt(foreignIndex, 10),
-		RepoID:       issue.RepoID,
-		Type:         foreignreference.TypeIssue,
-	})
-	assert.NoError(t, err)
-
-	err = issue.LoadAttributes(db.DefaultContext)
-	assert.NoError(t, err)
-
-	assert.EqualValues(t, issue.ForeignReference.ForeignIndex, strconv.FormatInt(foreignIndex, 10))
-
-	found, err := issues_model.GetIssueByForeignIndex(context.Background(), issue.RepoID, foreignIndex)
-	assert.NoError(t, err)
-	assert.EqualValues(t, found.Index, issue.Index)
-}
-
 func TestMilestoneList_LoadTotalTrackedTimes(t *testing.T) {
 	assert.NoError(t, unittest.PrepareTestDatabase())
 	miles := issues_model.MilestoneList{

models/migrate.go

@@ -83,13 +83,6 @@ func insertIssue(ctx context.Context, issue *issues_model.Issue) error {
 		}
 	}
 
-	if issue.ForeignReference != nil {
-		issue.ForeignReference.LocalIndex = issue.Index
-		if _, err := sess.Insert(issue.ForeignReference); err != nil {
-			return err
-		}
-	}
-
 	return nil
 }
 

models/migrate_test.go

@@ -4,11 +4,9 @@
 package models
 
 import (
-	"strconv"
 	"testing"
 
 	"code.gitea.io/gitea/models/db"
-	"code.gitea.io/gitea/models/foreignreference"
 	issues_model "code.gitea.io/gitea/models/issues"
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/models/unittest"
@@ -48,7 +46,6 @@ func assertCreateIssues(t *testing.T, isPull bool) {
 		UserID: owner.ID,
 	}
 
-	foreignIndex := int64(12345)
 	title := "issuetitle1"
 	is := &issues_model.Issue{
 		RepoID:      repo.ID,
@@ -62,20 +59,11 @@ func assertCreateIssues(t *testing.T, isPull bool) {
 		IsClosed:    true,
 		Labels:      []*issues_model.Label{label},
 		Reactions:   []*issues_model.Reaction{reaction},
-		ForeignReference: &foreignreference.ForeignReference{
-			ForeignIndex: strconv.FormatInt(foreignIndex, 10),
-			RepoID:       repo.ID,
-			Type:         foreignreference.TypeIssue,
-		},
 	}
 	err := InsertIssues(is)
 	assert.NoError(t, err)
 
 	i := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{Title: title})
-	assert.Nil(t, i.ForeignReference)
-	err = i.LoadAttributes(db.DefaultContext)
-	assert.NoError(t, err)
-	assert.EqualValues(t, strconv.FormatInt(foreignIndex, 10), i.ForeignReference.ForeignIndex)
 	unittest.AssertExistsAndLoadBean(t, &issues_model.Reaction{Type: "heart", UserID: owner.ID, IssueID: i.ID})
 }
 

models/migrations/migrations.go

@@ -445,6 +445,8 @@ var migrations = []Migration{
 	// v236 -> v237
 	NewMigration("Create secrets table", v1_19.CreateSecretsTable),
 	// v237 -> v238
+	NewMigration("Drop ForeignReference table", v1_19.DropForeignReferenceTable),
+	// v238 -> v239
 	NewMigration("Add actions tables", v1_19.AddActionsTables),
 }
 

models/migrations/v1_19/v237.go

@@ -4,173 +4,12 @@
 package v1_19 //nolint
 
 import (
-	"code.gitea.io/gitea/models/db"
-	"code.gitea.io/gitea/modules/timeutil"
-
 	"xorm.io/xorm"
 )
 
-func AddActionsTables(x *xorm.Engine) error {
+func DropForeignReferenceTable(x *xorm.Engine) error {
-	type ActionRunner struct {
+	// Drop the table introduced in `v211`, it's considered badly designed and doesn't look like to be used.
-		ID          int64
+	// See: https://github.com/go-gitea/gitea/issues/21086#issuecomment-1318217453
-		UUID        string `xorm:"CHAR(36) UNIQUE"`
+	type ForeignReference struct{}
-		Name        string `xorm:"VARCHAR(32)"`
+	return x.DropTables(new(ForeignReference))
-		OwnerID     int64  `xorm:"index"` // org level runner, 0 means system
-		RepoID      int64  `xorm:"index"` // repo level runner, if orgid also is zero, then it's a global
-		Description string `xorm:"TEXT"`
-		Base        int    // 0 native 1 docker 2 virtual machine
-		RepoRange   string // glob match which repositories could use this runner
-
-		Token     string `xorm:"-"`
-		TokenHash string `xorm:"UNIQUE"` // sha256 of token
-		TokenSalt string
-		// TokenLastEight string `xorm:"token_last_eight"` // it's unnecessary because we don't find runners by token
-
-		LastOnline timeutil.TimeStamp `xorm:"index"`
-		LastActive timeutil.TimeStamp `xorm:"index"`
-
-		// Store OS and Artch.
-		AgentLabels []string
-		// Store custom labes use defined.
-		CustomLabels []string
-
-		Created timeutil.TimeStamp `xorm:"created"`
-		Updated timeutil.TimeStamp `xorm:"updated"`
-		Deleted timeutil.TimeStamp `xorm:"deleted"`
-	}
-
-	type ActionRunnerToken struct {
-		ID       int64
-		Token    string `xorm:"UNIQUE"`
-		OwnerID  int64  `xorm:"index"` // org level runner, 0 means system
-		RepoID   int64  `xorm:"index"` // repo level runner, if orgid also is zero, then it's a global
-		IsActive bool
-
-		Created timeutil.TimeStamp `xorm:"created"`
-		Updated timeutil.TimeStamp `xorm:"updated"`
-		Deleted timeutil.TimeStamp `xorm:"deleted"`
-	}
-
-	type ActionRun struct {
-		ID                int64
-		Title             string
-		RepoID            int64  `xorm:"index unique(repo_index)"`
-		OwnerID           int64  `xorm:"index"`
-		WorkflowID        string `xorm:"index"`                    // the name of workflow file
-		Index             int64  `xorm:"index unique(repo_index)"` // a unique number for each run of a repository
-		TriggerUserID     int64
-		Ref               string
-		CommitSHA         string
-		Event             string
-		IsForkPullRequest bool
-		EventPayload      string `xorm:"LONGTEXT"`
-		Status            int    `xorm:"index"`
-		Started           timeutil.TimeStamp
-		Stopped           timeutil.TimeStamp
-		Created           timeutil.TimeStamp `xorm:"created"`
-		Updated           timeutil.TimeStamp `xorm:"updated"`
-	}
-
-	type ActionRunJob struct {
-		ID                int64
-		RunID             int64  `xorm:"index"`
-		RepoID            int64  `xorm:"index"`
-		OwnerID           int64  `xorm:"index"`
-		CommitSHA         string `xorm:"index"`
-		IsForkPullRequest bool
-		Name              string
-		Attempt           int64
-		WorkflowPayload   []byte
-		JobID             string   // job id in workflow, not job's id
-		Needs             []string `xorm:"JSON TEXT"`
-		RunsOn            []string `xorm:"JSON TEXT"`
-		TaskID            int64    // the latest task of the job
-		Status            int      `xorm:"index"`
-		Started           timeutil.TimeStamp
-		Stopped           timeutil.TimeStamp
-		Created           timeutil.TimeStamp `xorm:"created"`
-		Updated           timeutil.TimeStamp `xorm:"updated index"`
-	}
-
-	type Repository struct {
-		NumRuns       int `xorm:"NOT NULL DEFAULT 0"`
-		NumClosedRuns int `xorm:"NOT NULL DEFAULT 0"`
-	}
-
-	type ActionRunIndex db.ResourceIndex
-
-	type ActionTask struct {
-		ID       int64
-		JobID    int64
-		Attempt  int64
-		RunnerID int64              `xorm:"index"`
-		Status   int                `xorm:"index"`
-		Started  timeutil.TimeStamp `xorm:"index"`
-		Stopped  timeutil.TimeStamp
-
-		RepoID            int64  `xorm:"index"`
-		OwnerID           int64  `xorm:"index"`
-		CommitSHA         string `xorm:"index"`
-		IsForkPullRequest bool
-
-		TokenHash      string `xorm:"UNIQUE"` // sha256 of token
-		TokenSalt      string
-		TokenLastEight string `xorm:"index token_last_eight"`
-
-		LogFilename  string   // file name of log
-		LogInStorage bool     // read log from database or from storage
-		LogLength    int64    // lines count
-		LogSize      int64    // blob size
-		LogIndexes   *[]int64 `xorm:"LONGBLOB"` // line number to offset
-		LogExpired   bool     // files that are too old will be deleted
-
-		Created timeutil.TimeStamp `xorm:"created"`
-		Updated timeutil.TimeStamp `xorm:"updated index"`
-	}
-
-	type ActionTaskStep struct {
-		ID        int64
-		Name      string
-		TaskID    int64 `xorm:"index unique(task_number)"`
-		Number    int64 `xorm:"index unique(task_number)"`
-		RepoID    int64 `xorm:"index"`
-		Status    int   `xorm:"index"`
-		LogIndex  int64
-		LogLength int64
-		Started   timeutil.TimeStamp
-		Stopped   timeutil.TimeStamp
-		Created   timeutil.TimeStamp `xorm:"created"`
-		Updated   timeutil.TimeStamp `xorm:"updated"`
-	}
-
-	type dbfsMeta struct {
-		ID              int64  `xorm:"pk autoincr"`
-		FullPath        string `xorm:"VARCHAR(500) UNIQUE NOT NULL"`
-		BlockSize       int64  `xorm:"BIGINT NOT NULL"`
-		FileSize        int64  `xorm:"BIGINT NOT NULL"`
-		CreateTimestamp int64  `xorm:"BIGINT NOT NULL"`
-		ModifyTimestamp int64  `xorm:"BIGINT NOT NULL"`
-	}
-
-	type dbfsData struct {
-		ID         int64  `xorm:"pk autoincr"`
-		Revision   int64  `xorm:"BIGINT NOT NULL"`
-		MetaID     int64  `xorm:"BIGINT index(meta_offset) NOT NULL"`
-		BlobOffset int64  `xorm:"BIGINT index(meta_offset) NOT NULL"`
-		BlobSize   int64  `xorm:"BIGINT NOT NULL"`
-		BlobData   []byte `xorm:"BLOB NOT NULL"`
-	}
-
-	return x.Sync(
-		new(ActionRunner),
-		new(ActionRunnerToken),
-		new(ActionRun),
-		new(ActionRunJob),
-		new(Repository),
-		new(ActionRunIndex),
-		new(ActionTask),
-		new(ActionTaskStep),
-		new(dbfsMeta),
-		new(dbfsData),
-	)
 }

models/migrations/v1_19/v238.go

@@ -0,0 +1,177 @@
+// Copyright 2022 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package v1_19 //nolint
+
+import (
+	"code.gitea.io/gitea/models/db"
+	"code.gitea.io/gitea/modules/timeutil"
+
+	"xorm.io/xorm"
+)
+
+func AddActionsTables(x *xorm.Engine) error {
+	type ActionRunner struct {
+		ID          int64
+		UUID        string `xorm:"CHAR(36) UNIQUE"`
+		Name        string `xorm:"VARCHAR(32)"`
+		OwnerID     int64  `xorm:"index"` // org level runner, 0 means system
+		RepoID      int64  `xorm:"index"` // repo level runner, if orgid also is zero, then it's a global
+		Description string `xorm:"TEXT"`
+		Base        int    // 0 native 1 docker 2 virtual machine
+		RepoRange   string // glob match which repositories could use this runner
+
+		Token     string `xorm:"-"`
+		TokenHash string `xorm:"UNIQUE"` // sha256 of token
+		TokenSalt string
+		// TokenLastEight string `xorm:"token_last_eight"` // it's unnecessary because we don't find runners by token
+
+		LastOnline timeutil.TimeStamp `xorm:"index"`
+		LastActive timeutil.TimeStamp `xorm:"index"`
+
+		// Store OS and Artch.
+		AgentLabels []string
+		// Store custom labes use defined.
+		CustomLabels []string
+
+		Created timeutil.TimeStamp `xorm:"created"`
+		Updated timeutil.TimeStamp `xorm:"updated"`
+		Deleted timeutil.TimeStamp `xorm:"deleted"`
+	}
+
+	type ActionRunnerToken struct {
+		ID       int64
+		Token    string `xorm:"UNIQUE"`
+		OwnerID  int64  `xorm:"index"` // org level runner, 0 means system
+		RepoID   int64  `xorm:"index"` // repo level runner, if orgid also is zero, then it's a global
+		IsActive bool
+
+		Created timeutil.TimeStamp `xorm:"created"`
+		Updated timeutil.TimeStamp `xorm:"updated"`
+		Deleted timeutil.TimeStamp `xorm:"deleted"`
+	}
+
+	type ActionRun struct {
+		ID                int64
+		Title             string
+		RepoID            int64  `xorm:"index unique(repo_index)"`
+		OwnerID           int64  `xorm:"index"`
+		WorkflowID        string `xorm:"index"`                    // the name of workflow file
+		Index             int64  `xorm:"index unique(repo_index)"` // a unique number for each run of a repository
+		TriggerUserID     int64
+		Ref               string
+		CommitSHA         string
+		Event             string
+		IsForkPullRequest bool
+		EventPayload      string `xorm:"LONGTEXT"`
+		Status            int    `xorm:"index"`
+		Started           timeutil.TimeStamp
+		Stopped           timeutil.TimeStamp
+		Created           timeutil.TimeStamp `xorm:"created"`
+		Updated           timeutil.TimeStamp `xorm:"updated"`
+	}
+
+	type ActionRunJob struct {
+		ID                int64
+		RunID             int64  `xorm:"index"`
+		RepoID            int64  `xorm:"index"`
+		OwnerID           int64  `xorm:"index"`
+		CommitSHA         string `xorm:"index"`
+		IsForkPullRequest bool
+		Name              string
+		Attempt           int64
+		WorkflowPayload   []byte
+		JobID             string   // job id in workflow, not job's id
+		Needs             []string `xorm:"JSON TEXT"`
+		RunsOn            []string `xorm:"JSON TEXT"`
+		TaskID            int64    // the latest task of the job
+		Status            int      `xorm:"index"`
+		Started           timeutil.TimeStamp
+		Stopped           timeutil.TimeStamp
+		Created           timeutil.TimeStamp `xorm:"created"`
+		Updated           timeutil.TimeStamp `xorm:"updated index"`
+	}
+
+	type Repository struct {
+		NumRuns       int `xorm:"NOT NULL DEFAULT 0"`
+		NumClosedRuns int `xorm:"NOT NULL DEFAULT 0"`
+	}
+
+	type ActionRunIndex db.ResourceIndex
+
+	type ActionTask struct {
+		ID       int64
+		JobID    int64
+		Attempt  int64
+		RunnerID int64              `xorm:"index"`
+		Status   int                `xorm:"index"`
+		Started  timeutil.TimeStamp `xorm:"index"`
+		Stopped  timeutil.TimeStamp
+
+		RepoID            int64  `xorm:"index"`
+		OwnerID           int64  `xorm:"index"`
+		CommitSHA         string `xorm:"index"`
+		IsForkPullRequest bool
+
+		TokenHash      string `xorm:"UNIQUE"` // sha256 of token
+		TokenSalt      string
+		TokenLastEight string `xorm:"index token_last_eight"`
+
+		LogFilename  string   // file name of log
+		LogInStorage bool     // read log from database or from storage
+		LogLength    int64    // lines count
+		LogSize      int64    // blob size
+		LogIndexes   *[]int64 `xorm:"LONGBLOB"` // line number to offset
+		LogExpired   bool     // files that are too old will be deleted
+
+		Created timeutil.TimeStamp `xorm:"created"`
+		Updated timeutil.TimeStamp `xorm:"updated index"`
+	}
+
+	type ActionTaskStep struct {
+		ID        int64
+		Name      string
+		TaskID    int64 `xorm:"index unique(task_number)"`
+		Number    int64 `xorm:"index unique(task_number)"`
+		RepoID    int64 `xorm:"index"`
+		Status    int   `xorm:"index"`
+		LogIndex  int64
+		LogLength int64
+		Started   timeutil.TimeStamp
+		Stopped   timeutil.TimeStamp
+		Created   timeutil.TimeStamp `xorm:"created"`
+		Updated   timeutil.TimeStamp `xorm:"updated"`
+	}
+
+	type dbfsMeta struct {
+		ID              int64  `xorm:"pk autoincr"`
+		FullPath        string `xorm:"VARCHAR(500) UNIQUE NOT NULL"`
+		BlockSize       int64  `xorm:"BIGINT NOT NULL"`
+		FileSize        int64  `xorm:"BIGINT NOT NULL"`
+		CreateTimestamp int64  `xorm:"BIGINT NOT NULL"`
+		ModifyTimestamp int64  `xorm:"BIGINT NOT NULL"`
+	}
+
+	type dbfsData struct {
+		ID         int64  `xorm:"pk autoincr"`
+		Revision   int64  `xorm:"BIGINT NOT NULL"`
+		MetaID     int64  `xorm:"BIGINT index(meta_offset) NOT NULL"`
+		BlobOffset int64  `xorm:"BIGINT index(meta_offset) NOT NULL"`
+		BlobSize   int64  `xorm:"BIGINT NOT NULL"`
+		BlobData   []byte `xorm:"BLOB NOT NULL"`
+	}
+
+	return x.Sync(
+		new(ActionRunner),
+		new(ActionRunnerToken),
+		new(ActionRun),
+		new(ActionRunJob),
+		new(Repository),
+		new(ActionRunIndex),
+		new(ActionTask),
+		new(ActionTaskStep),
+		new(dbfsMeta),
+		new(dbfsData),
+	)
+}
+

services/migrations/gitea_uploader.go

@@ -17,7 +17,6 @@ import (
 
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/models/db"
-	"code.gitea.io/gitea/models/foreignreference"
 	issues_model "code.gitea.io/gitea/models/issues"
 	repo_model "code.gitea.io/gitea/models/repo"
 	user_model "code.gitea.io/gitea/models/user"
@@ -403,16 +402,6 @@ func (g *GiteaLocalUploader) CreateIssues(issues ...*base.Issue) error {
 			Labels:      labels,
 			CreatedUnix: timeutil.TimeStamp(issue.Created.Unix()),
 			UpdatedUnix: timeutil.TimeStamp(issue.Updated.Unix()),
-			ForeignReference: &foreignreference.ForeignReference{
-				LocalIndex:   issue.GetLocalIndex(),
-				ForeignIndex: strconv.FormatInt(issue.GetForeignIndex(), 10),
-				RepoID:       g.repo.ID,
-				Type:         foreignreference.TypeIssue,
-			},
-		}
-
-		if is.ForeignReference.ForeignIndex == "0" {
-			is.ForeignReference.ForeignIndex = strconv.FormatInt(is.Index, 10)
 		}
 
 		if err := g.remapUser(issue, &is); err != nil {