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

hack for ql support

This commit is contained in:
Lunny Xiao 2015-08-07 09:55:42 +08:00
parent 6cc6e18143
commit 29fd03b318
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
session.go
View File

@ -48,8 +48,8 @@ type Session struct {
cascadeDeep int cascadeDeep int
// !evalphobia! stored the last executed query on this session // !evalphobia! stored the last executed query on this session
lastSQL string lastSQL string
lastSQLArgs []interface{} lastSQLArgs []interface{}
} }
// Method Init reset the session as the init status. // Method Init reset the session as the init status.
@ -614,11 +614,15 @@ func (session *Session) DropTable(beanOrTableName interface{}) error {
return nil return nil
} }
func (statement *Statement) JoinColumns(cols []*core.Column) string { func (statement *Statement) JoinColumns(cols []*core.Column, includeTableName bool) string {
var colnames = make([]string, len(cols)) var colnames = make([]string, len(cols))
for i, col := range cols { for i, col := range cols {
colnames[i] = statement.Engine.Quote(statement.TableName()) + if includeTableName {
"." + statement.Engine.Quote(col.Name) colnames[i] = statement.Engine.Quote(statement.TableName()) +
"." + statement.Engine.Quote(col.Name)
} else {
colnames[i] = statement.Engine.Quote(col.Name)
}
} }
return strings.Join(colnames, ", ") return strings.Join(colnames, ", ")
} }
@ -630,11 +634,14 @@ func (statement *Statement) convertIdSql(sqlStr string) string {
return "" return ""
} }
colstrs := statement.JoinColumns(cols) colstrs := statement.JoinColumns(cols, false)
sqls := splitNNoCase(sqlStr, " from ", 2) sqls := splitNNoCase(sqlStr, " from ", 2)
if len(sqls) != 2 { if len(sqls) != 2 {
return "" return ""
} }
if statement.Engine.dialect.DBType() == "ql" {
return fmt.Sprintf("SELECT id() FROM %v", sqls[1])
}
return fmt.Sprintf("SELECT %s FROM %v", colstrs, sqls[1]) return fmt.Sprintf("SELECT %s FROM %v", colstrs, sqls[1])
} }
return "" return ""
@ -3280,7 +3287,7 @@ func (statement *Statement) convertUpdateSql(sqlStr string) (string, string) {
return "", "" return "", ""
} }
colstrs := statement.JoinColumns(statement.RefTable.PKColumns()) colstrs := statement.JoinColumns(statement.RefTable.PKColumns(), true)
sqls := splitNNoCase(sqlStr, "where", 2) sqls := splitNNoCase(sqlStr, "where", 2)
if len(sqls) != 2 { if len(sqls) != 2 {
if len(sqls) == 1 { if len(sqls) == 1 {