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

Revert: remove support for Table(~tablename)

This commit is contained in:
Lunny Xiao 2015-02-12 14:53:59 +08:00
parent 2876528540
commit a2fe082f1a
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
statement.go
View File

@ -160,9 +160,6 @@ func (statement *Statement) Table(tableNameOrBean interface{}) *Statement {
t := v.Type() t := v.Type()
if t.Kind() == reflect.String { if t.Kind() == reflect.String {
statement.AltTableName = tableNameOrBean.(string) statement.AltTableName = tableNameOrBean.(string)
if statement.AltTableName[0] == '~' {
statement.AltTableName = statement.Engine.TableMapper.TableName(statement.AltTableName[1:])
}
} else if t.Kind() == reflect.Struct { } else if t.Kind() == reflect.Struct {
statement.RefTable = statement.Engine.autoMapType(v) statement.RefTable = statement.Engine.autoMapType(v)
} }
@ -960,15 +957,9 @@ func (statement *Statement) Join(join_operator string, tablename interface{}, co
l := len(t) l := len(t)
if l > 1 { if l > 1 {
table := t[0] table := t[0]
if table[0] == '~' {
table = statement.Engine.TableMapper.TableName(table[1:])
}
joinTable = statement.Engine.Quote(table) + " AS " + statement.Engine.Quote(t[1]) joinTable = statement.Engine.Quote(table) + " AS " + statement.Engine.Quote(t[1])
} else if l == 1 { } else if l == 1 {
table := t[0] table := t[0]
if table[0] == '~' {
table = statement.Engine.TableMapper.TableName(table[1:])
}
joinTable = statement.Engine.Quote(table) joinTable = statement.Engine.Quote(table)
} }
case []interface{}: case []interface{}:
@ -981,9 +972,6 @@ func (statement *Statement) Join(join_operator string, tablename interface{}, co
t := v.Type() t := v.Type()
if t.Kind() == reflect.String { if t.Kind() == reflect.String {
table = f.(string) table = f.(string)
if table[0] == '~' {
table = statement.Engine.TableMapper.TableName(table[1:])
}
} else if t.Kind() == reflect.Struct { } else if t.Kind() == reflect.Struct {
r := statement.Engine.autoMapType(v) r := statement.Engine.autoMapType(v)
table = r.Name table = r.Name
@ -996,9 +984,6 @@ func (statement *Statement) Join(join_operator string, tablename interface{}, co
} }
default: default:
t := fmt.Sprintf("%v", tablename) t := fmt.Sprintf("%v", tablename)
if t[0] == '~' {
t = statement.Engine.TableMapper.TableName(t[1:])
}
joinTable = statement.Engine.Quote(t) joinTable = statement.Engine.Quote(t)
} }
if statement.JoinStr != "" { if statement.JoinStr != "" {