From 9ca9535c48b38387a7af5ff5d8c5235465ba7273 Mon Sep 17 00:00:00 2001
From: jianzhiyao <zhiyao.jian@dreampix.cn>
Date: Tue, 11 Aug 2020 16:53:31 +0800
Subject: [PATCH] fix:return error after inserting data when primary key is
 string

---
 pkg/orm/db.go          |  7 ++++++-
 pkg/orm/db_oracle.go   |  7 ++++++-
 pkg/orm/models_test.go |  5 +++++
 pkg/orm/orm_test.go    | 19 +++++++++++++++++++
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/pkg/orm/db.go b/pkg/orm/db.go
index 9a1827e8..9024cf01 100644
--- a/pkg/orm/db.go
+++ b/pkg/orm/db.go
@@ -484,7 +484,12 @@ func (d *dbBase) InsertValue(q dbQuerier, mi *modelInfo, isMulti bool, names []s
 			if isMulti {
 				return res.RowsAffected()
 			}
-			return res.LastInsertId()
+
+			lastInsertId, err:=res.LastInsertId()
+			if err != nil {
+				DebugLog.Println("[WARN] return LastInsertId error:", err)
+			}
+			return lastInsertId, nil
 		}
 		return 0, err
 	}
diff --git a/pkg/orm/db_oracle.go b/pkg/orm/db_oracle.go
index 5d121f83..c8e71849 100644
--- a/pkg/orm/db_oracle.go
+++ b/pkg/orm/db_oracle.go
@@ -126,7 +126,12 @@ func (d *dbBaseOracle) InsertValue(q dbQuerier, mi *modelInfo, isMulti bool, nam
 			if isMulti {
 				return res.RowsAffected()
 			}
-			return res.LastInsertId()
+
+			lastInsertId, err := res.LastInsertId()
+			if err != nil {
+				DebugLog.Println("[WARN] return LastInsertId error:", err)
+			}
+			return lastInsertId, nil
 		}
 		return 0, err
 	}
diff --git a/pkg/orm/models_test.go b/pkg/orm/models_test.go
index ae166dc7..3c7bbbc8 100644
--- a/pkg/orm/models_test.go
+++ b/pkg/orm/models_test.go
@@ -412,6 +412,11 @@ type PtrPk struct {
 	Positive bool
 }
 
+type StrPk struct {
+	Id    string  `orm:"column(id);size(64);pk"`
+	Value string
+}
+
 var DBARGS = struct {
 	Driver string
 	Source string
diff --git a/pkg/orm/orm_test.go b/pkg/orm/orm_test.go
index f5242a46..1a8a88ea 100644
--- a/pkg/orm/orm_test.go
+++ b/pkg/orm/orm_test.go
@@ -200,6 +200,7 @@ func TestSyncDb(t *testing.T) {
 	RegisterModel(new(IntegerPk))
 	RegisterModel(new(UintPk))
 	RegisterModel(new(PtrPk))
+	RegisterModel(new(StrPk))
 
 	err := RunSyncdb("default", true, Debug)
 	throwFail(t, err)
@@ -224,6 +225,7 @@ func TestRegisterModels(t *testing.T) {
 	RegisterModel(new(IntegerPk))
 	RegisterModel(new(UintPk))
 	RegisterModel(new(PtrPk))
+	RegisterModel(new(StrPk))
 
 	BootStrap()
 
@@ -2487,4 +2489,21 @@ func TestInsertOrUpdate(t *testing.T) {
 	}
 }
 
+func TestStrPkInsert(t *testing.T) {
+	RegisterModel(new(StrPk))
+	value := `StrPkValues(*56`
+	strPk := &StrPk{
+		Id:    "1",
+		Value: value,
+	}
+
+	var err error
+	_, err = dORM.Insert(strPk)
+	throwFailNow(t, AssertIs(err, nil))
+
+	var vForTesting StrPk
+	err = dORM.QueryTable(new(StrPk)).Filter(`id`, `1`).One(&vForTesting)
+	throwFailNow(t, AssertIs(err, nil))
+	throwFailNow(t, AssertIs(vForTesting.Value, value))
+}