mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 16:40:24 +08:00 
			
		
		
		
	Fix error log when loading issues caused by a xorm bug (#7271)
* fix error log when loading issues caused by a xorm bug * upgrade packages * fix fmt * fix Consistency * fix tests
This commit is contained in:
		
							
								
								
									
										17
									
								
								vendor/github.com/go-xorm/xorm/engine_group.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										17
									
								
								vendor/github.com/go-xorm/xorm/engine_group.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -5,9 +5,10 @@
 | 
			
		||||
package xorm
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"context"
 | 
			
		||||
	"time"
 | 
			
		||||
 | 
			
		||||
	"github.com/go-xorm/core"
 | 
			
		||||
	"xorm.io/core"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
// EngineGroup defines an engine group
 | 
			
		||||
@@ -74,6 +75,20 @@ func (eg *EngineGroup) Close() error {
 | 
			
		||||
	return nil
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Context returned a group session
 | 
			
		||||
func (eg *EngineGroup) Context(ctx context.Context) *Session {
 | 
			
		||||
	sess := eg.NewSession()
 | 
			
		||||
	sess.isAutoClose = true
 | 
			
		||||
	return sess.Context(ctx)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// NewSession returned a group session
 | 
			
		||||
func (eg *EngineGroup) NewSession() *Session {
 | 
			
		||||
	sess := eg.Engine.NewSession()
 | 
			
		||||
	sess.sessionType = groupSession
 | 
			
		||||
	return sess
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Master returns the master engine
 | 
			
		||||
func (eg *EngineGroup) Master() *Engine {
 | 
			
		||||
	return eg.Engine
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user