HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve code

This commit is contained in:
Lunny Xiao 2020-03-08 19:52:10 +08:00
parent d319b51e38
commit f0d8606d44
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/statements/query.go
View File

@ -16,7 +16,7 @@ import (
func (statement *Statement) GenQuerySQL(sqlOrArgs ...interface{}) (string, []interface{}, error) { func (statement *Statement) GenQuerySQL(sqlOrArgs ...interface{}) (string, []interface{}, error) {
if len(sqlOrArgs) > 0 { if len(sqlOrArgs) > 0 {
return ConvertSQLOrArgs(sqlOrArgs...) return statement.ConvertSQLOrArgs(sqlOrArgs...)
} }
if statement.RawSQL != "" { if statement.RawSQL != "" {

10
internal/statements/statement.go
View File

@ -959,7 +959,15 @@ func (statement *Statement) quoteColumnStr(columnStr string) string {
return statement.dialect.Quoter().Join(columns, ",") return statement.dialect.Quoter().Join(columns, ",")
} }
func ConvertSQLOrArgs(sqlOrArgs ...interface{}) (string, []interface{}, error) { func (statement *Statement) ConvertSQLOrArgs(sqlOrArgs ...interface{}) (string, []interface{}, error) {
sql, args, err := convertSQLOrArgs(sqlOrArgs...)
if err != nil {
return "", nil, err
}
return statement.ReplaceQuote(sql), args, nil
}
func convertSQLOrArgs(sqlOrArgs ...interface{}) (string, []interface{}, error) {
switch sqlOrArgs[0].(type) { switch sqlOrArgs[0].(type) {
case string: case string:
return sqlOrArgs[0].(string), sqlOrArgs[1:], nil return sqlOrArgs[0].(string), sqlOrArgs[1:], nil

3
session_raw.go
View File

@ -9,7 +9,6 @@ import (
"reflect" "reflect"
"xorm.io/xorm/core" "xorm.io/xorm/core"
"xorm.io/xorm/internal/statements"
) )
func (session *Session) queryPreprocess(sqlStr *string, paramStr ...interface{}) { func (session *Session) queryPreprocess(sqlStr *string, paramStr ...interface{}) {
@ -172,7 +171,7 @@ func (session *Session) Exec(sqlOrArgs ...interface{}) (sql.Result, error) {
return nil, ErrUnSupportedType return nil, ErrUnSupportedType
} }
sqlStr, args, err := statements.ConvertSQLOrArgs(sqlOrArgs...) sqlStr, args, err := session.statement.ConvertSQLOrArgs(sqlOrArgs...)
if err != nil { if err != nil {
return nil, err return nil, err
} }