Merge branch 'master' into enh/noid/commit-message-link-check-commit-hashes
This commit is contained in:
Lunny Xiao
GitHub
commit
74ed0feef8
|
|
@ -100,7 +100,7 @@ const (
|
|||
// Comment represents a comment in commit and issue page.
|
||||
type Comment struct {
|
||||
ID int64 `xorm:"pk autoincr"`
|
||||
Type CommentType
|
||||
Type CommentType `xorm:"index"`
|
||||
PosterID int64 `xorm:"INDEX"`
|
||||
Poster *User `xorm:"-"`
|
||||
OriginalAuthor string
|
||||
|
|
@ -143,7 +143,7 @@ type Comment struct {
|
|||
ShowTag CommentTag `xorm:"-"`
|
||||
|
||||
Review *Review `xorm:"-"`
|
||||
ReviewID int64
|
||||
ReviewID int64 `xorm:"index"`
|
||||
Invalidated bool
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -236,6 +236,8 @@ var migrations = []Migration{
|
|||
NewMigration("add original author/url migration info to issues, comments, and repo ", addOriginalMigrationInfo),
|
||||
// v90 -> v91
|
||||
NewMigration("change length of some repository columns", changeSomeColumnsLengthOfRepo),
|
||||
// v91 -> v92
|
||||
NewMigration("add index on owner_id of repository and type, review_id of comment", addIndexOnRepositoryAndComment),
|
||||
}
|
||||
|
||||
// Migrate database to current version
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
// Copyright 2019 The Gitea Authors. All rights reserved.
|
||||
// Use of this source code is governed by a MIT-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package migrations
|
||||
|
||||
import "github.com/go-xorm/xorm"
|
||||
|
||||
func addIndexOnRepositoryAndComment(x *xorm.Engine) error {
|
||||
type Repository struct {
|
||||
ID int64 `xorm:"pk autoincr"`
|
||||
OwnerID int64 `xorm:"index"`
|
||||
}
|
||||
|
||||
if err := x.Sync2(new(Repository)); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
type Comment struct {
|
||||
ID int64 `xorm:"pk autoincr"`
|
||||
Type int `xorm:"index"`
|
||||
ReviewID int64 `xorm:"index"`
|
||||
}
|
||||
|
||||
return x.Sync2(new(Comment))
|
||||
}
|
||||
|
|
@ -262,6 +262,7 @@ func NewTestEngine(x *xorm.Engine) (err error) {
|
|||
return fmt.Errorf("Connect to database: %v", err)
|
||||
}
|
||||
|
||||
x.ShowExecTime(true)
|
||||
x.SetMapper(core.GonicMapper{})
|
||||
x.SetLogger(NewXORMLogger(!setting.ProdMode))
|
||||
x.ShowSQL(!setting.ProdMode)
|
||||
|
|
@ -275,6 +276,7 @@ func SetEngine() (err error) {
|
|||
return fmt.Errorf("Failed to connect to database: %v", err)
|
||||
}
|
||||
|
||||
x.ShowExecTime(true)
|
||||
x.SetMapper(core.GonicMapper{})
|
||||
// WARNING: for serv command, MUST remove the output to os.stdout,
|
||||
// so use log file to instead print to stdout.
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ func NewRepoContext() {
|
|||
// Repository represents a git repository.
|
||||
type Repository struct {
|
||||
ID int64 `xorm:"pk autoincr"`
|
||||
OwnerID int64 `xorm:"UNIQUE(s)"`
|
||||
OwnerID int64 `xorm:"UNIQUE(s) index"`
|
||||
OwnerName string `xorm:"-"`
|
||||
Owner *User `xorm:"-"`
|
||||
LowerName string `xorm:"UNIQUE(s) INDEX NOT NULL"`
|
||||
|
|
|
|||
|
|
@ -27,49 +27,93 @@ var (
|
|||
}
|
||||
|
||||
// Extensions that are same as highlight classes.
|
||||
// See hljs.listLanguages() for list of language names.
|
||||
highlightExts = map[string]struct{}{
|
||||
".applescript": {},
|
||||
".arm": {},
|
||||
".as": {},
|
||||
".sh": {},
|
||||
".cs": {},
|
||||
".cpp": {},
|
||||
".c": {},
|
||||
".css": {},
|
||||
".cmake": {},
|
||||
".bash": {},
|
||||
".bat": {},
|
||||
".c": {},
|
||||
".cmake": {},
|
||||
".cpp": {},
|
||||
".cs": {},
|
||||
".css": {},
|
||||
".dart": {},
|
||||
".patch": {},
|
||||
".erl": {},
|
||||
".diff": {},
|
||||
".django": {},
|
||||
".go": {},
|
||||
".gradle": {},
|
||||
".groovy": {},
|
||||
".haml": {},
|
||||
".handlebars": {},
|
||||
".html": {},
|
||||
".xml": {},
|
||||
".hs": {},
|
||||
".ini": {},
|
||||
".json": {},
|
||||
".java": {},
|
||||
".js": {},
|
||||
".json": {},
|
||||
".less": {},
|
||||
".lua": {},
|
||||
".php": {},
|
||||
".py": {},
|
||||
".rb": {},
|
||||
".rs": {},
|
||||
".scala": {},
|
||||
".scss": {},
|
||||
".sql": {},
|
||||
".scala": {},
|
||||
".swift": {},
|
||||
".ts": {},
|
||||
".vb": {},
|
||||
".yml": {},
|
||||
".xml": {},
|
||||
".yaml": {},
|
||||
}
|
||||
|
||||
// Extensions that are not same as highlight classes.
|
||||
highlightMapping = map[string]string{
|
||||
".txt": "nohighlight",
|
||||
".ahk": "autohotkey",
|
||||
".crmsh": "crmsh",
|
||||
".dash": "shell",
|
||||
".erl": "erlang",
|
||||
".escript": "erlang",
|
||||
".ex": "elixir",
|
||||
".exs": "elixir",
|
||||
".f": "fortran",
|
||||
".f77": "fortran",
|
||||
".f90": "fortran",
|
||||
".f95": "fortran",
|
||||
".feature": "gherkin",
|
||||
".fish": "shell",
|
||||
".for": "fortran",
|
||||
".hbs": "handlebars",
|
||||
".hs": "haskell",
|
||||
".hx": "haxe",
|
||||
".js": "javascript",
|
||||
".jsx": "javascript",
|
||||
".ksh": "shell",
|
||||
".kt": "kotlin",
|
||||
".l": "ocaml",
|
||||
".ls": "livescript",
|
||||
".md": "markdown",
|
||||
".mjs": "javascript",
|
||||
".mli": "ocaml",
|
||||
".mll": "ocaml",
|
||||
".mly": "ocaml",
|
||||
".patch": "diff",
|
||||
".pl": "perl",
|
||||
".pm": "perl",
|
||||
".ps1": "powershell",
|
||||
".psd1": "powershell",
|
||||
".psm1": "powershell",
|
||||
".py": "python",
|
||||
".pyw": "python",
|
||||
".rb": "ruby",
|
||||
".rs": "rust",
|
||||
".scpt": "applescript",
|
||||
".scptd": "applescript",
|
||||
".sh": "bash",
|
||||
".tcsh": "shell",
|
||||
".ts": "typescript",
|
||||
".tsx": "typescript",
|
||||
".txt": "plaintext",
|
||||
".vb": "vbnet",
|
||||
".vbs": "vbscript",
|
||||
".yml": "yaml",
|
||||
".zsh": "shell",
|
||||
}
|
||||
)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue