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

remove unused method

This commit is contained in:
Lunny Xiao 2017-03-01 16:55:53 +08:00
parent 2b462f7180
commit e0276e0f48
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
statement.go
View File

@ -39,7 +39,7 @@ type Statement struct {
Engine *Engine Engine *Engine
Start int Start int
LimitN int LimitN int
IdParam *core.PK idParam *core.PK
OrderStr string OrderStr string
JoinStr string JoinStr string
joinArgs []interface{} joinArgs []interface{}
@ -91,7 +91,7 @@ func (statement *Statement) Init() {
statement.columnMap = make(map[string]bool) statement.columnMap = make(map[string]bool)
statement.AltTableName = "" statement.AltTableName = ""
statement.tableName = "" statement.tableName = ""
statement.IdParam = nil statement.idParam = nil
statement.RawSQL = "" statement.RawSQL = ""
statement.RawParams = make([]interface{}, 0) statement.RawParams = make([]interface{}, 0)
statement.UseCache = true statement.UseCache = true
@ -698,13 +698,6 @@ func (statement *Statement) TableName() string {
return statement.tableName return statement.tableName
} }
// Id generate "where id = ? " statement or for composite key "where key1 = ? and key2 = ?"
//
// Deprecated: use ID instead
func (statement *Statement) Id(id interface{}) *Statement {
return statement.ID(id)
}
// ID generate "where id = ? " statement or for composite key "where key1 = ? and key2 = ?" // ID generate "where id = ? " statement or for composite key "where key1 = ? and key2 = ?"
func (statement *Statement) ID(id interface{}) *Statement { func (statement *Statement) ID(id interface{}) *Statement {
idValue := reflect.ValueOf(id) idValue := reflect.ValueOf(id)
@ -713,23 +706,23 @@ func (statement *Statement) ID(id interface{}) *Statement {
switch idType { switch idType {
case ptrPkType: case ptrPkType:
if pkPtr, ok := (id).(*core.PK); ok { if pkPtr, ok := (id).(*core.PK); ok {
statement.IdParam = pkPtr statement.idParam = pkPtr
return statement return statement
} }
case pkType: case pkType:
if pk, ok := (id).(core.PK); ok { if pk, ok := (id).(core.PK); ok {
statement.IdParam = &pk statement.idParam = &pk
return statement return statement
} }
} }
switch idType.Kind() { switch idType.Kind() {
case reflect.String: case reflect.String:
statement.IdParam = &core.PK{idValue.Convert(reflect.TypeOf("")).Interface()} statement.idParam = &core.PK{idValue.Convert(reflect.TypeOf("")).Interface()}
return statement return statement
} }
statement.IdParam = &core.PK{id} statement.idParam = &core.PK{id}
return statement return statement
} }
@ -1281,14 +1274,14 @@ func (statement *Statement) genSelectSQL(columnStr, condSQL string) (a string) {
} }
func (statement *Statement) processIDParam() { func (statement *Statement) processIDParam() {
if statement.IdParam == nil { if statement.idParam == nil {
return return
} }
for i, col := range statement.RefTable.PKColumns() { for i, col := range statement.RefTable.PKColumns() {
var colName = statement.colName(col, statement.TableName()) var colName = statement.colName(col, statement.TableName())
if i < len(*(statement.IdParam)) { if i < len(*(statement.idParam)) {
statement.cond = statement.cond.And(builder.Eq{colName: (*(statement.IdParam))[i]}) statement.cond = statement.cond.And(builder.Eq{colName: (*(statement.idParam))[i]})
} else { } else {
statement.cond = statement.cond.And(builder.Eq{colName: ""}) statement.cond = statement.cond.And(builder.Eq{colName: ""})
} }