Added tw omore tests on makeComments function of pgComment.

Author: vvuwei

database/pgComment.go

@@ -16,10 +16,9 @@ func makeComments(ctx context.Context, conn PgGoConnection, model interface{}) e
 		fieldType := modelType.Field(i)
 
 		if fieldType.Name == "tableName" {
-
-			readFromModelName := true
-			tableName, readFromModelName = getPgName(fieldType)
-			if readFromModelName {
+			var ok bool
+			tableName, ok = getPgName(fieldType)
+			if !ok {
 				tableName = pg.Safe(hasura.ToSnakeCase(modelType.Name()))
 			}
 
@@ -42,8 +41,8 @@ func makeComments(ctx context.Context, conn PgGoConnection, model interface{}) e
 			continue
 		}
 
-		columnName, readFromFieldName := getPgName(fieldType)
-		if readFromFieldName {
+		columnName, ok := getPgName(fieldType)
+		if !ok {
 			columnName = pg.Safe(hasura.ToSnakeCase(fieldType.Name))
 		}
 

database/pgComment_test.go

@@ -79,6 +79,83 @@ func TestMakeCommentsWithTableNameWithoutPgComment(t *testing.T) {
 	assert.Empty(t, err)
 }
 
+func TestMakeCommentsFieldWithPgComment(t *testing.T) {
+	type Ballot struct {
+		//nolint
+		tableName struct{} `pg:"ballots"`
+		Ballot    string   `json:"ballot" pg-comment:"This is field comment"`
+	}
+
+	mockCtrl, mockPgDB, pgGo, ctx := createPgDbMock(t)
+	defer mockCtrl.Finish()
+
+	model := Ballot{}
+
+	// Assert prepare
+	expectedParams := toInterfaceSlice([]pg.Safe{"ballots", "ballot", "This is field comment"})
+	mockPgDB.
+		EXPECT().
+		ExecContext(ctx, "COMMENT ON COLUMN ?.? IS ?",
+			gomock.Eq(expectedParams)).
+		Times(1).
+		Return(nil, nil)
+
+	// Act
+	err := makeComments(ctx, pgGo, model)
+
+	// Assert
+	assert.Empty(t, err)
+}
+
+func TestMakeCommentsWithTableNameAndFieldsWithPgComment(t *testing.T) {
+	type Ballot struct {
+		//nolint
+		tableName       struct{}    `pg:"ballots" pg-comment:"Ballot table"`
+		CreatedAt       int64       `json:"-" pg-comment:"This is field comment"`
+		UpdatedAt       int64       `json:"-" pg-comment:"This is field comment"`
+		Network         string      `json:"network" pg:",pk" pg-comment:"This is field comment"`
+		Hash            string      `json:"hash" pg:",pk" pg-comment:"This is field comment"`
+		Branch          string      `json:"branch" pg-comment:"This is field comment"`
+		Status          string      `json:"status" pg-comment:"This is field comment"`
+		Kind            string      `json:"kind" pg-comment:"This is field comment"`
+		Signature       string      `json:"signature" pg-comment:"This is field comment"`
+		Protocol        string      `json:"protocol" pg-comment:"This is field comment"`
+		Level           uint64      `json:"level" pg-comment:"This is field comment"`
+		Errors          interface{} `json:"errors,omitempty" pg:"type:jsonb" pg-comment:"This is field comment"`
+		ExpirationLevel *uint64     `json:"expiration_level" pg-comment:"This is field comment"`
+		Raw             interface{} `json:"raw,omitempty" pg:"type:jsonb" pg-comment:"This is field comment"`
+		Ballot          string      `json:"ballot" pg-comment:"This is field comment"`
+		Period          int64       `json:"period" pg-comment:"This is field comment"`
+	}
+
+	mockCtrl, mockPgDB, pgGo, ctx := createPgDbMock(t)
+	defer mockCtrl.Finish()
+
+	model := Ballot{}
+
+	// Assert prepare
+	expectedParams := toInterfaceSlice([]pg.Safe{"ballots", "Ballot table"})
+	commentOnTableCall := mockPgDB.
+		EXPECT().
+		ExecContext(ctx, "COMMENT ON TABLE ? IS ?",
+			gomock.Eq(expectedParams)).
+		Times(1).
+		Return(nil, nil)
+
+	mockPgDB.
+		EXPECT().
+		ExecContext(ctx, "COMMENT ON COLUMN ?.? IS ?", gomock.Any()).
+		Times(15).
+		After(commentOnTableCall).
+		Return(nil, nil)
+
+	// Act
+	err := makeComments(ctx, pgGo, model)
+
+	// Assert
+	assert.Empty(t, err)
+}
+
 func createPgDbMock(t *testing.T) (*gomock.Controller, *mocks.MockPgDB, *PgGoMock, context.Context) {
 	mockCtrl := gomock.NewController(t)
 	mockPgDB := mocks.NewMockPgDB(mockCtrl)