From dded1f3253c7f4173b7989c7e7fd443418c6967e Mon Sep 17 00:00:00 2001
From: xormplus <xormplus@163.com>
Date: Mon, 23 Oct 2017 18:49:25 +0800
Subject: [PATCH] add session id for sql log

---
 engine.go      |  9 +++++----
 session.go     |  2 +-
 session_raw.go | 16 ++++++++--------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/engine.go b/engine.go
index 2b986966..a6daf6ea 100644
--- a/engine.go
+++ b/engine.go
@@ -290,12 +290,12 @@ func (engine *Engine) Ping() error {
 }
 
 // logging sql
-func (engine *Engine) logSQL(sqlStr string, sqlArgs ...interface{}) {
+func (engine *Engine) logSQL(session *Session, sqlStr string, sqlArgs ...interface{}) {
 	if engine.showSQL && !engine.showExecTime {
 		if len(sqlArgs) > 0 {
-			engine.logger.Infof("[SQL] %v %#v", sqlStr, sqlArgs)
+			engine.logger.Infof("[SQL][Session ID : %p] %v %#v", session, sqlStr, sqlArgs)
 		} else {
-			engine.logger.Infof("[SQL] %v", sqlStr)
+			engine.logger.Infof("[SQL][Session ID : %p] %v", session, sqlStr)
 		}
 	}
 }
@@ -1532,7 +1532,8 @@ func (engine *Engine) Import(r io.Reader) ([]sql.Result, error) {
 	for scanner.Scan() {
 		query := strings.Trim(scanner.Text(), " \t\n\r")
 		if len(query) > 0 {
-			engine.logSQL(query)
+			//			engine.logSQL(query)
+			engine.logger.Infof("[SQL] %v", query)
 			result, err := engine.DB().Exec(query)
 			results = append(results, result)
 			if err != nil {
diff --git a/session.go b/session.go
index 4c8727b3..6fe8a249 100644
--- a/session.go
+++ b/session.go
@@ -816,7 +816,7 @@ func (session *Session) slice2Bean(scanResults []interface{}, fields []string, b
 func (session *Session) saveLastSQL(sql string, args ...interface{}) {
 	session.lastSQL = sql
 	session.lastSQLArgs = args
-	session.engine.logSQL(sql, args...)
+	session.engine.logSQL(session, sql, args...)
 }
 
 // LastSQL returns last query information
diff --git a/session_raw.go b/session_raw.go
index 69bf9b3c..4dc4101c 100644
--- a/session_raw.go
+++ b/session_raw.go
@@ -32,16 +32,16 @@ func (session *Session) queryRows(sqlStr string, args ...interface{}) (*core.Row
 			defer func() {
 				execDuration := time.Since(b4ExecTime)
 				if len(args) > 0 {
-					session.engine.logger.Infof("[SQL] %s %#v - took: %v", sqlStr, args, execDuration)
+					session.engine.logger.Infof("[SQL][Session ID : %p] %s %#v - took: %v", session, sqlStr, args, execDuration)
 				} else {
-					session.engine.logger.Infof("[SQL] %s - took: %v", sqlStr, execDuration)
+					session.engine.logger.Infof("[SQL][Session ID : %p] %s - took: %v", session, sqlStr, execDuration)
 				}
 			}()
 		} else {
 			if len(args) > 0 {
-				session.engine.logger.Infof("[SQL] %v %#v", sqlStr, args)
+				session.engine.logger.Infof("[SQL][Session ID : %p] %v %#v", session, sqlStr, args)
 			} else {
-				session.engine.logger.Infof("[SQL] %v", sqlStr)
+				session.engine.logger.Infof("[SQL][Session ID : %p] %v", session, sqlStr)
 			}
 		}
 	}
@@ -159,16 +159,16 @@ func (session *Session) exec(sqlStr string, args ...interface{}) (sql.Result, er
 			defer func() {
 				execDuration := time.Since(b4ExecTime)
 				if len(args) > 0 {
-					session.engine.logger.Infof("[SQL] %s %#v - took: %v", sqlStr, args, execDuration)
+					session.engine.logger.Infof("[SQL][Session ID : %p] %s %#v - took: %v", session, sqlStr, args, execDuration)
 				} else {
-					session.engine.logger.Infof("[SQL] %s - took: %v", sqlStr, execDuration)
+					session.engine.logger.Infof("[SQL][Session ID : %p] %s - took: %v", session, sqlStr, execDuration)
 				}
 			}()
 		} else {
 			if len(args) > 0 {
-				session.engine.logger.Infof("[SQL] %v %#v", sqlStr, args)
+				session.engine.logger.Infof("[SQL][Session ID : %p] %v %#v", session, sqlStr, args)
 			} else {
-				session.engine.logger.Infof("[SQL] %v", sqlStr)
+				session.engine.logger.Infof("[SQL][Session ID : %p] %v", session, sqlStr)
 			}
 		}
 	}