xormplus 8 years ago
parent
commit
2a7c650ee3
2 changed files with 86 additions and 3 deletions
  1. 12 3
      statement.go
  2. 74 0
      types_test.go

+ 12 - 3
statement.go

@@ -410,7 +410,11 @@ func buildUpdates(engine *Engine, table *core.Table, bean interface{},
 				if fieldValue == reflect.Zero(fieldType) {
 					continue
 				}
-				if fieldValue.IsNil() || !fieldValue.IsValid() || fieldValue.Len() == 0 {
+				if fieldType.Kind() == reflect.Array {
+					if isArrayValueZero(fieldValue) {
+						continue
+					}
+				} else if fieldValue.IsNil() || !fieldValue.IsValid() || fieldValue.Len() == 0 {
 					continue
 				}
 			}
@@ -425,13 +429,16 @@ func buildUpdates(engine *Engine, table *core.Table, bean interface{},
 			} else if col.SQLType.IsBlob() {
 				var bytes []byte
 				var err error
-				if (fieldType.Kind() == reflect.Array || fieldType.Kind() == reflect.Slice) &&
+				if fieldType.Kind() == reflect.Slice &&
 					fieldType.Elem().Kind() == reflect.Uint8 {
 					if fieldValue.Len() > 0 {
 						val = fieldValue.Bytes()
 					} else {
 						continue
 					}
+				} else if fieldType.Kind() == reflect.Array &&
+					fieldType.Elem().Kind() == reflect.Uint8 {
+					val = fieldValue.Slice(0, 0).Interface()
 				} else {
 					bytes, err = json.Marshal(fieldValue.Interface())
 					if err != nil {
@@ -643,7 +650,9 @@ func buildConds(engine *Engine, table *core.Table, bean interface{},
 					}
 				}
 			}
-		case reflect.Array, reflect.Slice, reflect.Map:
+		case reflect.Array:
+			continue
+		case reflect.Slice, reflect.Map:
 			if fieldValue == reflect.Zero(fieldType) {
 				continue
 			}

+ 74 - 0
types_test.go

@@ -0,0 +1,74 @@
+// Copyright 2017 The Xorm Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package xorm
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestArrayField(t *testing.T) {
+	assert.NoError(t, prepareEngine())
+
+	type ArrayStruct struct {
+		Id   int64
+		Name [20]byte `xorm:"char(20)"`
+	}
+
+	assert.NoError(t, testEngine.Sync2(new(ArrayStruct)))
+
+	var as = ArrayStruct{
+		Name: [20]byte{
+			96, 96, 96, 96, 96,
+			96, 96, 96, 96, 96,
+			96, 96, 96, 96, 96,
+			96, 96, 96, 96, 96,
+		},
+	}
+	cnt, err := testEngine.Insert(&as)
+	assert.NoError(t, err)
+	assert.EqualValues(t, 1, cnt)
+
+	var arr ArrayStruct
+	has, err := testEngine.Id(1).Get(&arr)
+	assert.NoError(t, err)
+	assert.Equal(t, true, has)
+	assert.Equal(t, as.Name, arr.Name)
+
+	var arrs []ArrayStruct
+	err = testEngine.Find(&arrs)
+	assert.NoError(t, err)
+	assert.EqualValues(t, 1, len(arrs))
+	assert.Equal(t, as.Name, arrs[0].Name)
+
+	var newName = [20]byte{
+		90, 96, 96, 96, 96,
+		96, 96, 96, 96, 96,
+		96, 96, 96, 96, 96,
+		96, 96, 96, 96, 96,
+	}
+
+	cnt, err = testEngine.ID(1).Update(&ArrayStruct{
+		Name: newName,
+	})
+	assert.NoError(t, err)
+	assert.EqualValues(t, 1, cnt)
+
+	var newArr ArrayStruct
+	has, err = testEngine.ID(1).Get(&newArr)
+	assert.NoError(t, err)
+	assert.Equal(t, true, has)
+	assert.Equal(t, newName, newArr.Name)
+
+	cnt, err = testEngine.ID(1).Delete(new(ArrayStruct))
+	assert.NoError(t, err)
+	assert.EqualValues(t, 1, cnt)
+
+	var cfgArr ArrayStruct
+	has, err = testEngine.ID(1).Get(&cfgArr)
+	assert.NoError(t, err)
+	assert.Equal(t, false, has)
+}