From bd20ffba3b5c309c7bd9e6db0ccf5a4f705a7408 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Mon, 20 Jan 2020 05:24:12 +0000
Subject: [PATCH] fix update map with version (#1448)

fix test

fix update map with version

SetExpr support more go types (#1499)

Improve tests

SetExpr support more go types

fix vet

fix drone lint

remove go1.10 test on drone

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1499

fix vet

fix drone lint

remove go1.10 test on drone

Fix update with Alias (#1455)

Reviewed-on: https://gitea.com/xorm/xorm/pulls/1448
---
 interface.go           |  2 ++
 session_update.go      | 20 ++++++++++++--------
 session_update_test.go | 42 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/interface.go b/interface.go
index a564db12..81a4b68a 100644
--- a/interface.go
+++ b/interface.go
@@ -92,6 +92,7 @@ type EngineInterface interface {
 	Quote(string) string
 	SetCacher(string, core.Cacher)
 	SetConnMaxLifetime(time.Duration)
+	SetColumnMapper(core.IMapper)
 	SetDefaultCacher(core.Cacher)
 	SetLogger(logger core.ILogger)
 	SetLogLevel(core.LogLevel)
@@ -99,6 +100,7 @@ type EngineInterface interface {
 	SetMaxOpenConns(int)
 	SetMaxIdleConns(int)
 	SetSchema(string)
+	SetTableMapper(core.IMapper)
 	SetTZDatabase(tz *time.Location)
 	SetTZLocation(tz *time.Location)
 	ShowExecTime(...bool)
diff --git a/session_update.go b/session_update.go
index 47ced66d..22d516e7 100644
--- a/session_update.go
+++ b/session_update.go
@@ -300,21 +300,25 @@ func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int6
 
 	st := &session.statement
 
-	var sqlStr string
-	var condArgs []interface{}
-	var condSQL string
-	cond := session.statement.cond.And(autoCond)
+	var (
+		sqlStr   string
+		condArgs []interface{}
+		condSQL  string
+		cond     = session.statement.cond.And(autoCond)
 
-	var doIncVer = (table != nil && table.Version != "" && session.statement.checkVersion)
-	var verValue *reflect.Value
+		doIncVer = isStruct && (table != nil && table.Version != "" && session.statement.checkVersion)
+		verValue *reflect.Value
+	)
 	if doIncVer {
 		verValue, err = table.VersionColumn().ValueOf(bean)
 		if err != nil {
 			return 0, err
 		}
 
-		cond = cond.And(builder.Eq{session.engine.Quote(table.Version): verValue.Interface()})
-		colNames = append(colNames, session.engine.Quote(table.Version)+" = "+session.engine.Quote(table.Version)+" + 1")
+		if verValue != nil {
+			cond = cond.And(builder.Eq{session.engine.Quote(table.Version): verValue.Interface()})
+			colNames = append(colNames, session.engine.Quote(table.Version)+" = "+session.engine.Quote(table.Version)+" + 1")
+		}
 	}
 
 	condSQL, condArgs, err = builder.ToSQL(cond)
diff --git a/session_update_test.go b/session_update_test.go
index d0ecef33..274a6bfa 100644
--- a/session_update_test.go
+++ b/session_update_test.go
@@ -1404,3 +1404,45 @@ func TestUpdateExprs2(t *testing.T) {
 	assert.EqualValues(t, 0, uer2.NumCommits)
 	assert.EqualValues(t, "", uer2.Sha1)
 }
+
+func TestUpdateMap3(t *testing.T) {
+	assert.NoError(t, prepareEngine())
+
+	type UpdateMapUser struct {
+		Id   uint64 `xorm:"PK autoincr"`
+		Name string `xorm:""`
+		Ver  uint64 `xorm:"version"`
+	}
+
+	oldMapper := testEngine.GetColumnMapper()
+	defer func() {
+		testEngine.SetColumnMapper(oldMapper)
+	}()
+
+	mapper := core.NewPrefixMapper(core.SnakeMapper{}, "F")
+	testEngine.SetColumnMapper(mapper)
+
+	assertSync(t, new(UpdateMapUser))
+
+	_, err := testEngine.Table(new(UpdateMapUser)).Insert(map[string]interface{}{
+		"Fname": "first user name",
+		"Fver":  1,
+	})
+	assert.NoError(t, err)
+
+	update := map[string]interface{}{
+		"Fname": "user name",
+		"Fver":  1,
+	}
+	rows, err := testEngine.Table(new(UpdateMapUser)).ID(1).Update(update)
+	assert.NoError(t, err)
+	assert.EqualValues(t, 1, rows)
+
+	update = map[string]interface{}{
+		"Name": "user name",
+		"Ver":  1,
+	}
+	rows, err = testEngine.Table(new(UpdateMapUser)).ID(1).Update(update)
+	assert.Error(t, err)
+	assert.EqualValues(t, 0, rows)
+}