From dcad231b8a36a45f1fda220b3e9cd974bf91d330 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Thu, 10 Oct 2019 16:34:32 +0800
Subject: [PATCH 1/2] Fix update with Alias

---
 session_update.go      |  7 ++++++-
 session_update_test.go | 31 +++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/session_update.go b/session_update.go
index c5c65a45..81dcc800 100644
--- a/session_update.go
+++ b/session_update.go
@@ -377,9 +377,14 @@ func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int6
 		return 0, errors.New("No content found to be updated")
 	}
 
+	var tableAlias = session.engine.Quote(tableName)
+	if session.statement.TableAlias != "" {
+		tableAlias = fmt.Sprintf("%s AS %s", tableAlias, session.statement.TableAlias)
+	}
+
 	sqlStr = fmt.Sprintf("UPDATE %v%v SET %v %v",
 		top,
-		session.engine.Quote(tableName),
+		tableAlias,
 		strings.Join(colNames, ", "),
 		condSQL)
 
diff --git a/session_update_test.go b/session_update_test.go
index e6c88bf8..df9f0420 100644
--- a/session_update_test.go
+++ b/session_update_test.go
@@ -1421,3 +1421,34 @@ func TestUpdateExprs(t *testing.T) {
 	assert.EqualValues(t, 2, ue.NumIssues)
 	assert.EqualValues(t, "lunny xiao", ue.Name)
 }
+
+func TestUpdateAlias(t *testing.T) {
+	assert.NoError(t, prepareEngine())
+
+	type UpdateAlias struct {
+		Id        int64
+		NumIssues int
+		Name      string
+	}
+
+	assertSync(t, new(UpdateAlias))
+
+	_, err := testEngine.Insert(&UpdateAlias{
+		NumIssues: 1,
+		Name:      "lunny",
+	})
+	assert.NoError(t, err)
+
+	_, err = testEngine.Alias("ua").Where("ua.id = ?", 1).Update(&UpdateAlias{
+		NumIssues: 2,
+		Name:      "lunny xiao",
+	})
+	assert.NoError(t, err)
+
+	var ue UpdateAlias
+	has, err := testEngine.Get(&ue)
+	assert.NoError(t, err)
+	assert.True(t, has)
+	assert.EqualValues(t, 2, ue.NumIssues)
+	assert.EqualValues(t, "lunny xiao", ue.Name)
+}

From 8b1aac375d09ce058e467203ac2c2172294f4810 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Thu, 10 Oct 2019 19:34:10 +0800
Subject: [PATCH 2/2] fix alias on mssql

---
 session_update.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/session_update.go b/session_update.go
index 81dcc800..d6aa1f61 100644
--- a/session_update.go
+++ b/session_update.go
@@ -379,7 +379,12 @@ func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int6
 
 	var tableAlias = session.engine.Quote(tableName)
 	if session.statement.TableAlias != "" {
-		tableAlias = fmt.Sprintf("%s AS %s", tableAlias, session.statement.TableAlias)
+		switch session.engine.dialect.DBType() {
+		case core.MSSQL:
+			tableAlias = fmt.Sprintf("%s %s", tableAlias, session.statement.TableAlias)
+		default:
+			tableAlias = fmt.Sprintf("%s AS %s", tableAlias, session.statement.TableAlias)
+		}
 	}
 
 	sqlStr = fmt.Sprintf("UPDATE %v%v SET %v %v",