From c039d40ada322aecf54fe0a611cc11cd28d8f755 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Wed, 25 Jun 2014 17:09:49 +0800 Subject: [PATCH] bug fixed for joinstr when has two Join --- session.go | 3 ++- statement.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/session.go b/session.go index b1636f4e..ea7ae3c6 100644 --- a/session.go +++ b/session.go @@ -389,7 +389,8 @@ func (session *Session) scanMapIntoStruct(obj interface{}, objMap map[string][]b for key, data := range objMap { if col = table.GetColumn(key); col == nil { - session.Engine.LogWarn(fmt.Sprintf("table %v's has not column %v. %v", table.Name, key, table.Columns())) + session.Engine.LogWarn(fmt.Sprintf("struct %v's has not field %v. %v", + table.Type.Name(), key, table.ColumnsSeq())) continue } diff --git a/statement.go b/statement.go index 33aa20a7..28b0d0dc 100644 --- a/statement.go +++ b/statement.go @@ -833,7 +833,7 @@ func (statement *Statement) OrderBy(order string) *Statement { //The join_operator should be one of INNER, LEFT OUTER, CROSS etc - this will be prepended to JOIN func (statement *Statement) Join(join_operator, tablename, condition string) *Statement { if statement.JoinStr != "" { - statement.JoinStr = statement.JoinStr + fmt.Sprintf("%v JOIN %v ON %v", join_operator, tablename, condition) + statement.JoinStr = statement.JoinStr + fmt.Sprintf(" %v JOIN %v ON %v", join_operator, tablename, condition) } else { statement.JoinStr = fmt.Sprintf("%v JOIN %v ON %v", join_operator, tablename, condition) }