From 8f0aba838f56fe7ead42aa2c694abc435073aca3 Mon Sep 17 00:00:00 2001 From: Nash Tsai Date: Sun, 29 Dec 2013 17:37:43 +0800 Subject: [PATCH] use session.queryPreprocess implementations instead of calling session.queryPreprocess to void sql error --- session.go | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/session.go b/session.go index 11164215..36a7e193 100644 --- a/session.go +++ b/session.go @@ -886,7 +886,16 @@ func (session *Session) Get(bean interface{}) (bool, error) { } var rawRows *sql.Rows - session.queryPreprocess(sqlStr, args...) + // !nashtsai! TODO calling session.queryPreprocess with cause error + // session.queryPreprocess(sqlStr, args...) + + for _, filter := range session.Engine.Filters { + sqlStr = filter.Do(sqlStr, session) + } + + session.Engine.LogSQL(sqlStr) + session.Engine.LogSQL(args) + if session.IsAutoCommit { stmt, err := session.Db.Prepare(sqlStr) if err != nil { @@ -1043,7 +1052,15 @@ func (session *Session) Find(rowsSlicePtr interface{}, condiBean ...interface{}) if sliceValue.Kind() != reflect.Map { var rawRows *sql.Rows - session.queryPreprocess(sqlStr, args...) + // !nashtsai! TODO calling session.queryPreprocess with cause error + // session.queryPreprocess(sqlStr, args...) + for _, filter := range session.Engine.Filters { + sqlStr = filter.Do(sqlStr, session) + } + + session.Engine.LogSQL(sqlStr) + session.Engine.LogSQL(args) + // err = session.queryRows(&stmt, &rawRows, sqlStr, args...) // if err != nil { // return err