Squashed commit of the following:

commit 3d5ab00 Author: xormplus <[email protected]> Date: Fri Nov 18 11:45:06 2016 +0800 修正session调用SqlTemplateClient函数错误修正session调用SqlTemplateClient函数错误 commit c0b4627 Author: xormplus <[email protected]> Date: Fri Nov 18 11:43:30 2016 +0800 修正session调用SqlTemplateClient函数错误修正session调用SqlTemplateClient函数错误
xormplus · Nov 18, 2016 · 62622f9 · 62622f9
1 parent 96cf41c
commit 62622f9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/engineplus.go b/engineplus.go
@@ -26,6 +26,7 @@ func (engine *Engine) SqlTemplateClient(sqlTagName string, args ...interface{})
 	session.IsAutoClose = true
 	session.IsSqlFuc = true
 	return session.SqlTemplateClient(sqlTagName, args...)
+
 }
 
 func (engine *Engine) Search(beans interface{}, condiBeans ...interface{}) *ResultStructs {

diff --git a/session.go b/session.go
@@ -124,6 +124,7 @@ func (session *Session) Sql(query string, args ...interface{}) *Session {
 // SQL provides raw sql input parameter. When you have a complex SQL statement
 // and cannot use Where, Id, In and etc. Methods to describe, you can use SQL.
 func (session *Session) SQL(query interface{}, args ...interface{}) *Session {
+	session.IsSqlFuc = true
 	session.Statement.SQL(query, args...)
 	return session
 }

diff --git a/sessionplus.go b/sessionplus.go
@@ -19,6 +19,7 @@ import (
 
 	"github.com/Chronokeeper/anyxml"
 	"github.com/xormplus/core"
+	"gopkg.in/flosch/pongo2.v3"
 )
 
 type ResultBean struct {
@@ -384,6 +385,7 @@ func (session *Session) SqlMapClient(sqlTagName string, args ...interface{}) *Se
 }
 
 func (session *Session) SqlTemplateClient(sqlTagName string, args ...interface{}) *Session {
+	session.IsSqlFuc = true
 	if session.Engine.sqlTemplate.Template[sqlTagName] == nil {
 		if len(args) == 0 {
 			return session.Sql("")