summaryrefslogtreecommitdiffstats
path: root/vendor/github.com/go-xorm/xorm/interface.go
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/go-xorm/xorm/interface.go')
-rw-r--r--vendor/github.com/go-xorm/xorm/interface.go12
1 files changed, 7 insertions, 5 deletions
diff --git a/vendor/github.com/go-xorm/xorm/interface.go b/vendor/github.com/go-xorm/xorm/interface.go
index 33d2078e44..0928f66a9a 100644
--- a/vendor/github.com/go-xorm/xorm/interface.go
+++ b/vendor/github.com/go-xorm/xorm/interface.go
@@ -5,11 +5,12 @@
package xorm
import (
+ "context"
"database/sql"
"reflect"
"time"
- "github.com/go-xorm/core"
+ "xorm.io/core"
)
// Interface defines the interface which Engine, EngineGroup and Session will implementate.
@@ -27,7 +28,7 @@ type Interface interface {
Delete(interface{}) (int64, error)
Distinct(columns ...string) *Session
DropIndexes(bean interface{}) error
- Exec(sqlOrAgrs ...interface{}) (sql.Result, error)
+ Exec(sqlOrArgs ...interface{}) (sql.Result, error)
Exist(bean ...interface{}) (bool, error)
Find(interface{}, ...interface{}) error
FindAndCount(interface{}, ...interface{}) (int64, error)
@@ -49,9 +50,9 @@ type Interface interface {
Omit(columns ...string) *Session
OrderBy(order string) *Session
Ping() error
- Query(sqlOrAgrs ...interface{}) (resultsSlice []map[string][]byte, err error)
- QueryInterface(sqlorArgs ...interface{}) ([]map[string]interface{}, error)
- QueryString(sqlorArgs ...interface{}) ([]map[string]string, error)
+ Query(sqlOrArgs ...interface{}) (resultsSlice []map[string][]byte, err error)
+ QueryInterface(sqlOrArgs ...interface{}) ([]map[string]interface{}, error)
+ QueryString(sqlOrArgs ...interface{}) ([]map[string]string, error)
Rows(bean interface{}) (*Rows, error)
SetExpr(string, string) *Session
SQL(interface{}, ...interface{}) *Session
@@ -73,6 +74,7 @@ type EngineInterface interface {
Before(func(interface{})) *Session
Charset(charset string) *Session
ClearCache(...interface{}) error
+ Context(context.Context) *Session
CreateTables(...interface{}) error
DBMetas() ([]*core.Table, error)
Dialect() core.Dialect