Adding upstream version 1.11.0.

Signed-off-by: Daniel Baumann <daniel@debian.org>

struct_test.go

@@ -0,0 +1,154 @@
+// Copyright 2016 Qiang Xue. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package dbx
+
+import (
+	"database/sql"
+	"reflect"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestDefaultFieldMapFunc(t *testing.T) {
+	tests := []struct {
+		input, output string
+	}{
+		{"Name", "name"},
+		{"FirstName", "first_name"},
+		{"Name0", "name0"},
+		{"ID", "id"},
+		{"UserID", "user_id"},
+		{"User0ID", "user0_id"},
+		{"MyURL", "my_url"},
+		{"URLPath", "urlpath"},
+		{"MyURLPath", "my_urlpath"},
+		{"First_Name", "first_name"},
+		{"first_name", "first_name"},
+		{"_FirstName", "_first_name"},
+		{"_First_Name", "_first_name"},
+	}
+	for _, test := range tests {
+		r := DefaultFieldMapFunc(test.input)
+		assert.Equal(t, test.output, r, test.input)
+	}
+}
+
+func Test_concat(t *testing.T) {
+	assert.Equal(t, "a.b", concat("a", "b"))
+	assert.Equal(t, "a", concat("a", ""))
+	assert.Equal(t, "b", concat("", "b"))
+}
+
+func Test_parseTag(t *testing.T) {
+	name, pk := parseTag("abc")
+	assert.Equal(t, "abc", name)
+	assert.False(t, pk)
+
+	name, pk = parseTag("pk,abc")
+	assert.Equal(t, "abc", name)
+	assert.True(t, pk)
+
+	name, pk = parseTag("pk")
+	assert.Equal(t, "", name)
+	assert.True(t, pk)
+}
+
+func Test_indirect(t *testing.T) {
+	var a int
+	assert.Equal(t, reflect.ValueOf(a).Kind(), indirect(reflect.ValueOf(a)).Kind())
+	var b *int
+	bi := indirect(reflect.ValueOf(&b))
+	assert.Equal(t, reflect.ValueOf(a).Kind(), bi.Kind())
+	if assert.NotNil(t, b) {
+		assert.Equal(t, 0, *b)
+	}
+}
+
+func Test_structValue_columns(t *testing.T) {
+	customer := Customer{
+		ID:     1,
+		Name:   "abc",
+		Status: 2,
+		Email:  "abc@example.com",
+	}
+	sv := newStructValue(&customer, DefaultFieldMapFunc, GetTableName)
+	cols := sv.columns(nil, nil)
+	assert.Equal(t, map[string]interface{}{"id": 1, "name": "abc", "status": 2, "email": "abc@example.com", "address": sql.NullString{}}, cols)
+
+	cols = sv.columns([]string{"ID", "name"}, nil)
+	assert.Equal(t, map[string]interface{}{"id": 1}, cols)
+
+	cols = sv.columns([]string{"ID", "Name"}, []string{"ID"})
+	assert.Equal(t, map[string]interface{}{"name": "abc"}, cols)
+
+	cols = sv.columns(nil, []string{"ID", "Address"})
+	assert.Equal(t, map[string]interface{}{"name": "abc", "status": 2, "email": "abc@example.com"}, cols)
+
+	sv = newStructValue(&customer, nil, GetTableName)
+	cols = sv.columns([]string{"ID", "Name"}, []string{"ID"})
+	assert.Equal(t, map[string]interface{}{"Name": "abc"}, cols)
+}
+
+func TestIssue37(t *testing.T) {
+	customer := Customer{
+		ID:     1,
+		Name:   "abc",
+		Status: 2,
+		Email:  "abc@example.com",
+	}
+	ev := struct {
+		Customer
+		Status string
+	}{customer, "20"}
+	sv := newStructValue(&ev, nil, GetTableName)
+	cols := sv.columns([]string{"ID", "Status"}, nil)
+	assert.Equal(t, map[string]interface{}{"ID": 1, "Status": "20"}, cols)
+
+	ev2 := struct {
+		Status string
+		Customer
+	}{"20", customer}
+	sv = newStructValue(&ev2, nil, GetTableName)
+	cols = sv.columns([]string{"ID", "Status"}, nil)
+	assert.Equal(t, map[string]interface{}{"ID": 1, "Status": "20"}, cols)
+}
+
+type MyCustomer struct{}
+
+func TestGetTableName(t *testing.T) {
+	var c1 Customer
+	assert.Equal(t, "customer", GetTableName(c1))
+
+	var c2 *Customer
+	assert.Equal(t, "customer", GetTableName(c2))
+
+	var c3 MyCustomer
+	assert.Equal(t, "my_customer", GetTableName(c3))
+
+	var c4 []Customer
+	assert.Equal(t, "customer", GetTableName(c4))
+
+	var c5 *[]Customer
+	assert.Equal(t, "customer", GetTableName(c5))
+
+	var c6 []MyCustomer
+	assert.Equal(t, "my_customer", GetTableName(c6))
+
+	var c7 []CustomerPtr
+	assert.Equal(t, "customer", GetTableName(c7))
+
+	var c8 **int
+	assert.Equal(t, "", GetTableName(c8))
+}
+
+type FA struct {
+	A1 string
+	A2 int
+}
+
+type FB struct {
+	B1 string
+}