peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Small fixes to xorm-stuff

Browse Source
This commit is contained in:
kolaente 2017-12-29 14:44:13 +01:00 committed by Konrad
parent ed4a47dcc8
commit 200f88d2ed
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
models/issue_dependency.go
View File

@ -6,19 +6,17 @@ package models
import ( import (
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"time" "code.gitea.io/gitea/modules/util"
) )
// IssueDependency represents an issue dependency // IssueDependency represents an issue dependency
type IssueDependency struct { type IssueDependency struct {
ID int64 `xorm:"pk autoincr"` ID int64 `xorm:"pk autoincr"`
UserID int64 `xorm:"NOT NULL"` UserID int64 `xorm:"NOT NULL"`
IssueID int64 `xorm:"UNIQUE(issue_dependency) NOT NULL"` IssueID int64 `xorm:"UNIQUE(issue_dependency) NOT NULL"`
DependencyID int64 `xorm:"UNIQUE(issue_dependency) NOT NULL"` DependencyID int64 `xorm:"UNIQUE(issue_dependency) NOT NULL"`
Created time.Time `xorm:"-"` CreatedUnix util.TimeStamp `xorm:"INDEX created"`
CreatedUnix int64 `xorm:"INDEX created"` UpdatedUnix util.TimeStamp `xorm:"updated"`
Updated time.Time `xorm:"-"`
UpdatedUnix int64 `xorm:"updated"`
} }
// DependencyType Defines Dependency Type Constants // DependencyType Defines Dependency Type Constants
@ -33,10 +31,10 @@ const (
// CreateIssueDependency creates a new dependency for an issue // CreateIssueDependency creates a new dependency for an issue
func CreateIssueDependency(user *User, issue, dep *Issue) (exists, circular bool, err error) { func CreateIssueDependency(user *User, issue, dep *Issue) (exists, circular bool, err error) {
sess := x.NewSession() sess := x.NewSession()
defer sess.Close()
if err := sess.Begin(); err != nil { if err := sess.Begin(); err != nil {
return false, false, err return false, false, err
} }
defer sess.Close()
// Check if it aleready exists // Check if it aleready exists
exists, circular, err = issueDepExists(sess, issue.ID, dep.ID) exists, circular, err = issueDepExists(sess, issue.ID, dep.ID)
@ -72,10 +70,10 @@ func CreateIssueDependency(user *User, issue, dep *Issue) (exists, circular bool
// RemoveIssueDependency removes a dependency from an issue // RemoveIssueDependency removes a dependency from an issue
func RemoveIssueDependency(user *User, issue *Issue, dep *Issue, depType DependencyType) (err error) { func RemoveIssueDependency(user *User, issue *Issue, dep *Issue, depType DependencyType) (err error) {
sess := x.NewSession() sess := x.NewSession()
defer sess.Close()
if err := sess.Begin(); err != nil { if err := sess.Begin(); err != nil {
return err return err
} }
defer sess.Close()
// Check if it exists // Check if it exists
var exists bool var exists bool