Skip to content
This repository was archived by the owner on Sep 7, 2021. It is now read-only.
This repository is currently being migrated. It's locked while the migration is in progress.

Commit 8a61b3a

Browse files
Masaki.Yamamotolunny
Masaki.Yamamoto
authored and
lunny
committed
Fix spelling inconsistency (#1317)
1 parent 6a1dd59 commit 8a61b3a

File tree

4 files changed

+31
-31
lines changed

4 files changed

+31
-31
lines changed

‎engine.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1354,31 +1354,31 @@ func (engine *Engine) DropIndexes(bean interface{}) error {
13541354
}
13551355

13561356
// Exec raw sql
1357-
func (engine *Engine) Exec(sqlorArgs ...interface{}) (sql.Result, error) {
1357+
func (engine *Engine) Exec(sqlOrArgs ...interface{}) (sql.Result, error) {
13581358
session := engine.NewSession()
13591359
defer session.Close()
1360-
return session.Exec(sqlorArgs...)
1360+
return session.Exec(sqlOrArgs...)
13611361
}
13621362

13631363
// Query a raw sql and return records as []map[string][]byte
1364-
func (engine *Engine) Query(sqlorArgs ...interface{}) (resultsSlice []map[string][]byte, err error) {
1364+
func (engine *Engine) Query(sqlOrArgs ...interface{}) (resultsSlice []map[string][]byte, err error) {
13651365
session := engine.NewSession()
13661366
defer session.Close()
1367-
return session.Query(sqlorArgs...)
1367+
return session.Query(sqlOrArgs...)
13681368
}
13691369

13701370
// QueryString runs a raw sql and return records as []map[string]string
1371-
func (engine *Engine) QueryString(sqlorArgs ...interface{}) ([]map[string]string, error) {
1371+
func (engine *Engine) QueryString(sqlOrArgs ...interface{}) ([]map[string]string, error) {
13721372
session := engine.NewSession()
13731373
defer session.Close()
1374-
return session.QueryString(sqlorArgs...)
1374+
return session.QueryString(sqlOrArgs...)
13751375
}
13761376

13771377
// QueryInterface runs a raw sql and return records as []map[string]interface{}
1378-
func (engine *Engine) QueryInterface(sqlorArgs ...interface{}) ([]map[string]interface{}, error) {
1378+
func (engine *Engine) QueryInterface(sqlOrArgs ...interface{}) ([]map[string]interface{}, error) {
13791379
session := engine.NewSession()
13801380
defer session.Close()
1381-
return session.QueryInterface(sqlorArgs...)
1381+
return session.QueryInterface(sqlOrArgs...)
13821382
}
13831383

13841384
// Insert one or more records

‎interface.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ type Interface interface {
2828
Delete(interface{}) (int64, error)
2929
Distinct(columns ...string) *Session
3030
DropIndexes(bean interface{}) error
31-
Exec(sqlOrAgrs ...interface{}) (sql.Result, error)
31+
Exec(sqlOrArgs ...interface{}) (sql.Result, error)
3232
Exist(bean ...interface{}) (bool, error)
3333
Find(interface{}, ...interface{}) error
3434
FindAndCount(interface{}, ...interface{}) (int64, error)
@@ -50,9 +50,9 @@ type Interface interface {
5050
Omit(columns ...string) *Session
5151
OrderBy(order string) *Session
5252
Ping() error
53-
Query(sqlOrAgrs ...interface{}) (resultsSlice []map[string][]byte, err error)
54-
QueryInterface(sqlorArgs ...interface{}) ([]map[string]interface{}, error)
55-
QueryString(sqlorArgs ...interface{}) ([]map[string]string, error)
53+
Query(sqlOrArgs ...interface{}) (resultsSlice []map[string][]byte, err error)
54+
QueryInterface(sqlOrArgs ...interface{}) ([]map[string]interface{}, error)
55+
QueryString(sqlOrArgs ...interface{}) ([]map[string]string, error)
5656
Rows(bean interface{}) (*Rows, error)
5757
SetExpr(string, string) *Session
5858
SQL(interface{}, ...interface{}) *Session

‎session_query.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import (
1515
"github.com/go-xorm/core"
1616
)
1717

18-
func (session *Session) genQuerySQL(sqlorArgs ...interface{}) (string, []interface{}, error) {
19-
if len(sqlorArgs) > 0 {
20-
return convertSQLOrArgs(sqlorArgs...)
18+
func (session *Session) genQuerySQL(sqlOrArgs ...interface{}) (string, []interface{}, error) {
19+
if len(sqlOrArgs) > 0 {
20+
return convertSQLOrArgs(sqlOrArgs...)
2121
}
2222

2323
if session.statement.RawSQL != "" {
@@ -78,12 +78,12 @@ func (session *Session) genQuerySQL(sqlorArgs ...interface{}) (string, []interfa
7878
}
7979

8080
// Query runs a raw sql and return records as []map[string][]byte
81-
func (session *Session) Query(sqlorArgs ...interface{}) ([]map[string][]byte, error) {
81+
func (session *Session) Query(sqlOrArgs ...interface{}) ([]map[string][]byte, error) {
8282
if session.isAutoClose {
8383
defer session.Close()
8484
}
8585

86-
sqlStr, args, err := session.genQuerySQL(sqlorArgs...)
86+
sqlStr, args, err := session.genQuerySQL(sqlOrArgs...)
8787
if err != nil {
8888
return nil, err
8989
}
@@ -227,12 +227,12 @@ func rows2SliceString(rows *core.Rows) (resultsSlice [][]string, err error) {
227227
}
228228

229229
// QueryString runs a raw sql and return records as []map[string]string
230-
func (session *Session) QueryString(sqlorArgs ...interface{}) ([]map[string]string, error) {
230+
func (session *Session) QueryString(sqlOrArgs ...interface{}) ([]map[string]string, error) {
231231
if session.isAutoClose {
232232
defer session.Close()
233233
}
234234

235-
sqlStr, args, err := session.genQuerySQL(sqlorArgs...)
235+
sqlStr, args, err := session.genQuerySQL(sqlOrArgs...)
236236
if err != nil {
237237
return nil, err
238238
}
@@ -247,12 +247,12 @@ func (session *Session) QueryString(sqlorArgs ...interface{}) ([]map[string]stri
247247
}
248248

249249
// QuerySliceString runs a raw sql and return records as [][]string
250-
func (session *Session) QuerySliceString(sqlorArgs ...interface{}) ([][]string, error) {
250+
func (session *Session) QuerySliceString(sqlOrArgs ...interface{}) ([][]string, error) {
251251
if session.isAutoClose {
252252
defer session.Close()
253253
}
254254

255-
sqlStr, args, err := session.genQuerySQL(sqlorArgs...)
255+
sqlStr, args, err := session.genQuerySQL(sqlOrArgs...)
256256
if err != nil {
257257
return nil, err
258258
}
@@ -300,12 +300,12 @@ func rows2Interfaces(rows *core.Rows) (resultsSlice []map[string]interface{}, er
300300
}
301301

302302
// QueryInterface runs a raw sql and return records as []map[string]interface{}
303-
func (session *Session) QueryInterface(sqlorArgs ...interface{}) ([]map[string]interface{}, error) {
303+
func (session *Session) QueryInterface(sqlOrArgs ...interface{}) ([]map[string]interface{}, error) {
304304
if session.isAutoClose {
305305
defer session.Close()
306306
}
307307

308-
sqlStr, args, err := session.genQuerySQL(sqlorArgs...)
308+
sqlStr, args, err := session.genQuerySQL(sqlOrArgs...)
309309
if err != nil {
310310
return nil, err
311311
}

‎session_raw.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -194,31 +194,31 @@ func (session *Session) exec(sqlStr string, args ...interface{}) (sql.Result, er
194194
return session.DB().ExecContext(session.ctx, sqlStr, args...)
195195
}
196196

197-
func convertSQLOrArgs(sqlorArgs ...interface{}) (string, []interface{}, error) {
198-
switch sqlorArgs[0].(type) {
197+
func convertSQLOrArgs(sqlOrArgs ...interface{}) (string, []interface{}, error) {
198+
switch sqlOrArgs[0].(type) {
199199
case string:
200-
return sqlorArgs[0].(string), sqlorArgs[1:], nil
200+
return sqlOrArgs[0].(string), sqlOrArgs[1:], nil
201201
case *builder.Builder:
202-
return sqlorArgs[0].(*builder.Builder).ToSQL()
202+
return sqlOrArgs[0].(*builder.Builder).ToSQL()
203203
case builder.Builder:
204-
bd := sqlorArgs[0].(builder.Builder)
204+
bd := sqlOrArgs[0].(builder.Builder)
205205
return bd.ToSQL()
206206
}
207207

208208
return "", nil, ErrUnSupportedType
209209
}
210210

211211
// Exec raw sql
212-
func (session *Session) Exec(sqlorArgs ...interface{}) (sql.Result, error) {
212+
func (session *Session) Exec(sqlOrArgs ...interface{}) (sql.Result, error) {
213213
if session.isAutoClose {
214214
defer session.Close()
215215
}
216216

217-
if len(sqlorArgs) == 0 {
217+
if len(sqlOrArgs) == 0 {
218218
return nil, ErrUnSupportedType
219219
}
220220

221-
sqlStr, args, err := convertSQLOrArgs(sqlorArgs...)
221+
sqlStr, args, err := convertSQLOrArgs(sqlOrArgs...)
222222
if err != nil {
223223
return nil, err
224224
}

0 commit comments

Comments
 (0)