Merge pull request #1810 from miraclesu/fix/orm_miss_pk

orm: fix miss pk when pk is negative

orm/db.go

@@ -181,7 +181,7 @@ func (d *dbBase) collectFieldValue(mi *modelInfo, fi *fieldInfo, ind reflect.Val
 				}
 			default:
 				switch {
-				case fi.fieldType&IsPostiveIntegerField > 0:
+				case fi.fieldType&IsPositiveIntegerField > 0:
 					if field.Kind() == reflect.Ptr {
 						if field.IsNil() {
 							value = nil
@@ -516,7 +516,7 @@ func (d *dbBase) Delete(q dbQuerier, mi *modelInfo, ind reflect.Value, tz *time.
 		}
 		if num > 0 {
 			if mi.fields.pk.auto {
-				if mi.fields.pk.fieldType&IsPostiveIntegerField > 0 {
+				if mi.fields.pk.fieldType&IsPositiveIntegerField > 0 {
 					ind.FieldByIndex(mi.fields.pk.fieldIndex).SetUint(0)
 				} else {
 					ind.FieldByIndex(mi.fields.pk.fieldIndex).SetInt(0)
@@ -1140,7 +1140,7 @@ setValue:
 				tErr = err
 				goto end
 			}
-			if fieldType&IsPostiveIntegerField > 0 {
+			if fieldType&IsPositiveIntegerField > 0 {
 				v, _ := str.Uint64()
 				value = v
 			} else {
@@ -1292,7 +1292,7 @@ setValue:
 			field.Set(reflect.ValueOf(&v))
 		}
 	case fieldType&IsIntegerField > 0:
-		if fieldType&IsPostiveIntegerField > 0 {
+		if fieldType&IsPositiveIntegerField > 0 {
 			if isNative {
 				if value == nil {
 					value = uint64(0)

orm/db_utils.go

@@ -33,13 +33,13 @@ func getExistPk(mi *modelInfo, ind reflect.Value) (column string, value interfac
 	fi := mi.fields.pk
 
 	v := ind.FieldByIndex(fi.fieldIndex)
-	if fi.fieldType&IsPostiveIntegerField > 0 {
+	if fi.fieldType&IsPositiveIntegerField > 0 {
 		vu := v.Uint()
 		exist = vu > 0
 		value = vu
 	} else if fi.fieldType&IsIntegerField > 0 {
 		vu := v.Int()
-		exist = vu > 0
+		exist = true
 		value = vu
 	} else {
 		vu := v.String()

orm/models_fields.go

@@ -47,7 +47,7 @@ const (
 // Define some logic enum
 const (
 	IsIntegerField         = ^-TypePositiveBigIntegerField >> 4 << 5
-	IsPostiveIntegerField = ^-TypePositiveBigIntegerField >> 8 << 9
+	IsPositiveIntegerField = ^-TypePositiveBigIntegerField >> 8 << 9
 	IsRelField             = ^-RelReverseMany >> 14 << 15
 	IsFieldType            = ^-RelReverseMany<<1 + 1
 )

orm/models_test.go

@@ -387,6 +387,11 @@ func NewInLineOneToOne() *InLineOneToOne {
 	return new(InLineOneToOne)
 }
 
+type IntegerPk struct {
+	Id    int64 `orm:"pk"`
+	Value string
+}
+
 var DBARGS = struct {
 	Driver string
 	Source string

orm/orm.go

@@ -159,7 +159,7 @@ func (o *orm) Insert(md interface{}) (int64, error) {
 // set auto pk field
 func (o *orm) setPk(mi *modelInfo, ind reflect.Value, id int64) {
 	if mi.fields.pk.auto {
-		if mi.fields.pk.fieldType&IsPostiveIntegerField > 0 {
+		if mi.fields.pk.fieldType&IsPositiveIntegerField > 0 {
 			ind.FieldByIndex(mi.fields.pk.fieldIndex).SetUint(uint64(id))
 		} else {
 			ind.FieldByIndex(mi.fields.pk.fieldIndex).SetInt(id)

orm/orm_object.go

@@ -50,7 +50,7 @@ func (o *insertSet) Insert(md interface{}) (int64, error) {
 	}
 	if id > 0 {
 		if o.mi.fields.pk.auto {
-			if o.mi.fields.pk.fieldType&IsPostiveIntegerField > 0 {
+			if o.mi.fields.pk.fieldType&IsPositiveIntegerField > 0 {
 				ind.FieldByIndex(o.mi.fields.pk.fieldIndex).SetUint(uint64(id))
 			} else {
 				ind.FieldByIndex(o.mi.fields.pk.fieldIndex).SetInt(id)

orm/orm_test.go

@@ -19,6 +19,7 @@ import (
 	"database/sql"
 	"fmt"
 	"io/ioutil"
+	"math"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -189,6 +190,7 @@ func TestSyncDb(t *testing.T) {
 	RegisterModel(new(GroupPermissions))
 	RegisterModel(new(InLine))
 	RegisterModel(new(InLineOneToOne))
+	RegisterModel(new(IntegerPk))
 
 	err := RunSyncdb("default", true, Debug)
 	throwFail(t, err)
@@ -210,6 +212,7 @@ func TestRegisterModels(t *testing.T) {
 	RegisterModel(new(GroupPermissions))
 	RegisterModel(new(InLine))
 	RegisterModel(new(InLineOneToOne))
+	RegisterModel(new(IntegerPk))
 
 	BootStrap()
 
@@ -1991,3 +1994,22 @@ func TestInLineOneToOne(t *testing.T) {
 	throwFail(t, AssertIs(rinline.Name, name))
 	throwFail(t, AssertIs(rinline.Email, email))
 }
+
+func TestIntegerPk(t *testing.T) {
+	its := []IntegerPk{
+		{Id: math.MinInt64, Value: "-"},
+		{Id: 0, Value: "0"},
+		{Id: math.MaxInt64, Value: "+"},
+	}
+
+	num, err := dORM.InsertMulti(len(its), its)
+	throwFail(t, err)
+	throwFail(t, AssertIs(num, len(its)))
+
+	for _, intPk := range its {
+		out := IntegerPk{Id: intPk.Id}
+		err = dORM.Read(&out)
+		throwFail(t, err)
+		throwFail(t, AssertIs(out.Value, intPk.Value))
+	}
+}