From b8b1711cde4d9c68da95cd0ff8de0de0cb491df3 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Mon, 11 Jul 2016 07:21:12 +0800
Subject: [PATCH] resolved gogits/gogs#3251

---
 VERSION    |  2 +-
 rows.go    | 16 +---------------
 session.go |  4 ++++
 xorm.go    |  2 +-
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/VERSION b/VERSION
index 11db5018..0976f6e1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-xorm v0.5.5.0709
+xorm v0.5.5.0711
diff --git a/rows.go b/rows.go
index e04a8c77..ba450532 100644
--- a/rows.go
+++ b/rows.go
@@ -94,7 +94,7 @@ func (rows *Rows) Err() error {
 	return rows.lastError
 }
 
-// scan row record to bean properties
+// Scan row record to bean properties
 func (rows *Rows) Scan(bean interface{}) error {
 	if rows.lastError != nil {
 		return rows.lastError
@@ -105,22 +105,8 @@ func (rows *Rows) Scan(bean interface{}) error {
 	}
 
 	return rows.session.row2Bean(rows.rows, rows.fields, rows.fieldsCount, bean)
-
-	// result, err := row2map(rows.rows, rows.fields) // !nashtsai! TODO remove row2map then scanMapIntoStruct conversation for better performance
-	// if err == nil {
-	// 	err = rows.session.scanMapIntoStruct(bean, result)
-	// }
-	// return err
 }
 
-// // Columns returns the column names. Columns returns an error if the rows are closed, or if the rows are from QueryRow and there was a deferred error.
-// func (rows *Rows) Columns() ([]string, error) {
-// 	if rows.lastError == nil && rows.rows != nil {
-// 		return rows.rows.Columns()
-// 	}
-// 	return nil, rows.lastError
-// }
-
 // close session if session.IsAutoClose is true, and claimed any opened resources
 func (rows *Rows) Close() error {
 	if rows.session.IsAutoClose {
diff --git a/session.go b/session.go
index b68afe77..5a48a81f 100644
--- a/session.go
+++ b/session.go
@@ -503,6 +503,7 @@ func (session *Session) innerExec(sqlStr string, args ...interface{}) (sql.Resul
 
 func (session *Session) exec(sqlStr string, args ...interface{}) (sql.Result, error) {
 	for _, filter := range session.Engine.dialect.Filters() {
+		// TODO: for table name, it's no need to RefTable
 		sqlStr = filter.Do(sqlStr, session.Engine.dialect, session.Statement.RefTable)
 	}
 
@@ -4064,6 +4065,7 @@ func (s *Session) Sync2(beans ...interface{}) error {
 				} else {
 					session := engine.NewSession()
 					session.Statement.RefTable = table
+					session.Statement.tableName = tbName
 					defer session.Close()
 					err = session.addColumn(col.Name)
 				}
@@ -4115,11 +4117,13 @@ func (s *Session) Sync2(beans ...interface{}) error {
 				if index.Type == core.UniqueType {
 					session := engine.NewSession()
 					session.Statement.RefTable = table
+					session.Statement.tableName = tbName
 					defer session.Close()
 					err = session.addUnique(tbName, name)
 				} else if index.Type == core.IndexType {
 					session := engine.NewSession()
 					session.Statement.RefTable = table
+					session.Statement.tableName = tbName
 					defer session.Close()
 					err = session.addIndex(tbName, name)
 				}
diff --git a/xorm.go b/xorm.go
index 975f7cbe..fdd995bd 100644
--- a/xorm.go
+++ b/xorm.go
@@ -17,7 +17,7 @@ import (
 
 const (
 	// Version show the xorm's version
-	Version string = "0.5.5.0709"
+	Version string = "0.5.5.0711"
 )
 
 func regDrvsNDialects() bool {