Set kind during initialisation

Author: AlekSi

internal/test/models/extra_reform.go

@@ -130,9 +130,10 @@ func (s *StructInfo) PKField() FieldInfo {
 	return s.Fields[s.PKFieldIndex]
 }
 
-// AssertUpToDate checks that given StructInfo matches given object.
-// It is used during program initialization to check that generated files are up-to-date.
-func AssertUpToDate(si *StructInfo, obj interface{}) {
+// Init checks that given generated StructInfo matches object's runtime information
+// (those checking that generated file is up-to-date),
+// then adds information from the runtime parser.
+func Init(si *StructInfo, obj interface{}) {
 	msg := fmt.Sprintf(`reform:
 		%s struct information is not up-to-date.
 		Typically this means that %s type definition was changed, but 'reform' command / 'go generate' was not run.
@@ -145,9 +146,14 @@ func AssertUpToDate(si *StructInfo, obj interface{}) {
 	if !structInfoInSync(si, si2) {
 		panic(msg)
 	}
+
+	// set runtime fields
+	for i := range si.Fields {
+		si.Fields[i].Kind = si2.Fields[i].Kind
+	}
 }
 
-// parseStructFieldTag is used by both file and runtime parsers
+// parseStructFieldTag is used by both file and runtime parsers.
 func parseStructFieldTag(tag string) (sqlName string, isPK bool) {
 	parts := strings.Split(tag, ",")
 	if len(parts) == 0 || len(parts) > 2 {
@@ -167,7 +173,7 @@ func parseStructFieldTag(tag string) (sqlName string, isPK bool) {
 	return
 }
 
-// checkFields is used by both file and runtime parsers
+// checkFields is used by both file and runtime parsers.
 func checkFields(res *StructInfo) error {
 	if len(res.Fields) == 0 {
 		return fmt.Errorf(`reform: %s has no fields with "reform:" tag, it is not allowed`, res.Type)

internal/test/models/good_reform.go

@@ -2,6 +2,7 @@ package parse_test
 
 import (
 	"errors"
+	"fmt"
 	"path/filepath"
 	"reflect"
 	"strings"
@@ -132,6 +133,8 @@ func cloneFile(s StructInfo) StructInfo {
 }
 
 func TestFileGood(t *testing.T) {
+	t.Parallel()
+
 	s, err := File(filepath.FromSlash("../internal/test/models/good.go"))
 	assert.NoError(t, err)
 	require.Len(t, s, 6)
@@ -144,6 +147,8 @@ func TestFileGood(t *testing.T) {
 }
 
 func TestFileExtra(t *testing.T) {
+	t.Parallel()
+
 	s, err := File(filepath.FromSlash("../internal/test/models/extra.go"))
 	assert.NoError(t, err)
 	require.Len(t, s, 2)
@@ -152,6 +157,8 @@ func TestFileExtra(t *testing.T) {
 }
 
 func TestFileBogus(t *testing.T) {
+	t.Parallel()
+
 	dir := filepath.FromSlash("../internal/test/models/bogus/")
 	for file, msg := range map[string]error{
 		"bogus1.go": errors.New(`reform: Bogus1 has anonymous field BogusType with "reform:" tag, it is not allowed`),
@@ -169,13 +176,20 @@ func TestFileBogus(t *testing.T) {
 
 		"bogus_ignore.go": nil,
 	} {
-		s, err := File(filepath.Join(dir, file))
-		assert.Nil(t, s)
-		assert.Equal(t, msg, err)
+		file, msg := file, msg
+		t.Run(file, func(t *testing.T) {
+			t.Parallel()
+
+			s, err := File(filepath.Join(dir, file))
+			assert.Nil(t, s)
+			assert.Equal(t, msg, err)
+		})
 	}
 }
 
 func TestObjectGood(t *testing.T) {
+	t.Parallel()
+
 	s, err := Object(new(models.Person), "", "people")
 	assert.NoError(t, err)
 	assert.Equal(t, &person, s)
@@ -202,6 +216,8 @@ func TestObjectGood(t *testing.T) {
 }
 
 func TestObjectExtra(t *testing.T) {
+	t.Parallel()
+
 	s, err := Object(new(models.Extra), "", "extra")
 	assert.NoError(t, err)
 	assert.Equal(t, &extra, s)
@@ -212,6 +228,8 @@ func TestObjectExtra(t *testing.T) {
 }
 
 func TestObjectBogus(t *testing.T) {
+	t.Parallel()
+
 	for obj, msg := range map[interface{}]error{
 		new(bogus.Bogus1): errors.New(`reform: Bogus1 has anonymous field BogusType with "reform:" tag, it is not allowed`),
 		new(bogus.Bogus2): errors.New(`reform: Bogus2 has anonymous field bogusType with "reform:" tag, it is not allowed`),
@@ -228,14 +246,23 @@ func TestObjectBogus(t *testing.T) {
 
 		// new(bogus.BogusIgnore): do not test,
 	} {
-		s, err := Object(obj, "", "bogus")
-		assert.Nil(t, s)
-		assert.Equal(t, msg, err)
+		obj, msg := obj, msg
+		t.Run(fmt.Sprint(obj), func(t *testing.T) {
+			t.Parallel()
+
+			s, err := Object(obj, "", "bogus")
+			assert.Nil(t, s)
+			assert.Equal(t, msg, err)
+		})
 	}
 }
 
 func TestHelpersGood(t *testing.T) {
+	t.Parallel()
+
 	t.Run("person", func(t *testing.T) {
+		t.Parallel()
+
 		assert.Equal(t, strings.TrimSpace(`
 parse.StructInfo{
 	Type: "Person",
@@ -265,6 +292,8 @@ parse.StructInfo{
 	})
 
 	t.Run("project", func(t *testing.T) {
+		t.Parallel()
+
 		assert.Equal(t, strings.TrimSpace(`
 parse.StructInfo{
 	Type: "Project",
@@ -290,6 +319,8 @@ parse.StructInfo{
 	})
 
 	t.Run("personProject", func(t *testing.T) {
+		t.Parallel()
+
 		assert.Equal(t, strings.TrimSpace(`
 parse.StructInfo{
 	Type: "PersonProject",
@@ -310,6 +341,8 @@ parse.StructInfo{
 	})
 
 	t.Run("constraints", func(t *testing.T) {
+		t.Parallel()
+
 		assert.Equal(t, strings.TrimSpace(`
 parse.StructInfo{
 	Type: "Constraints",
@@ -331,6 +364,8 @@ parse.StructInfo{
 	})
 
 	t.Run("idOnly", func(t *testing.T) {
+		t.Parallel()
+
 		assert.Equal(t, strings.TrimSpace(`
 parse.StructInfo{
 	Type: "IDOnly",
@@ -350,6 +385,8 @@ parse.StructInfo{
 	})
 
 	t.Run("legacyPerson", func(t *testing.T) {
+		t.Parallel()
+
 		assert.Equal(t, strings.TrimSpace(`
 parse.StructInfo{
 	Type: "LegacyPerson",
@@ -373,7 +410,11 @@ parse.StructInfo{
 }
 
 func TestHelpersExtra(t *testing.T) {
+	t.Parallel()
+
 	t.Run("extra", func(t *testing.T) {
+		t.Parallel()
+
 		assert.Equal(t, strings.TrimSpace(`
 parse.StructInfo{
 	Type: "Extra",
@@ -420,6 +461,8 @@ parse.StructInfo{
 	})
 
 	t.Run("notExported", func(t *testing.T) {
+		t.Parallel()
+
 		assert.Equal(t, strings.TrimSpace(`
 parse.StructInfo{
 	Type: "notExported",
@@ -439,21 +482,30 @@ parse.StructInfo{
 	})
 }
 
-func TestAssertUpToDate(t *testing.T) {
-	AssertUpToDate(&person, new(models.Person))
+func TestInit(t *testing.T) {
+	t.Parallel()
+
+	t.Run("NotPanics", func(t *testing.T) {
+		t.Parallel()
 
-	func() {
-		defer func() {
-			expected := `reform:
+		p := cloneFile(person)
+		assert.Empty(t, p.PKField().Kind)
+		Init(&p, new(models.Person))
+		assert.NotEmpty(t, p.PKField().Kind)
+	})
+
+	t.Run("Panics", func(t *testing.T) {
+		t.Parallel()
+
+		expected := `reform:
 		Person struct information is not up-to-date.
 		Typically this means that Person type definition was changed, but 'reform' command / 'go generate' was not run.
 
 		`
-			assert.Equal(t, expected, recover())
-		}()
-
-		p := person
-		p.PKFieldIndex = 1
-		AssertUpToDate(&p, new(models.Person))
-	}()
+		assert.PanicsWithValue(t, expected, func() {
+			p := cloneFile(person)
+			p.PKFieldIndex = 1
+			Init(&p, new(models.Person))
+		})
+	})
 }

parse/base.go

@@ -153,7 +153,7 @@ var (
 	initTemplate = template.Must(template.New("init").Parse(`
 func init() {
 	{{- range $i, $sd := . }}
-	parse.AssertUpToDate(&{{ $sd.TableVar }}.s, new({{ $sd.Type }}))
+	parse.Init(&{{ $sd.TableVar }}.s, new({{ $sd.Type }}))
 	{{- end }}
 }
 `))