Fixed getPgName logic.

Author: vvuwei

database/pgComment.go

@@ -58,16 +58,18 @@ func makeComments(ctx context.Context, conn PgGoConnection, model interface{}) e
 
 func getPgName(fieldType reflect.StructField) (name pg.Safe, ok bool) {
 	pgTag, ok := fieldType.Tag.Lookup("pg")
-	if ok {
-		tags := strings.Split(pgTag, ",")
+	if !ok {
+		return "", false
+	}
 
-		if tags[0] != "" {
-			name = pg.Safe(tags[0])
-			ok = false
-		}
+	tags := strings.Split(pgTag, ",")
+
+	if tags[0] != "" {
+		name = pg.Safe(tags[0])
+		return name, ok
 	}
 
-	return name, ok
+	return "", false
 }
 
 func getPgComment(fieldType reflect.StructField) (pg.Safe, bool) {

database/pgComment_test.go

@@ -51,7 +51,7 @@ func TestMakeCommentsWithTableName(t *testing.T) {
 	assert.Empty(t, err)
 }
 
-func TestMakeCommentsWithTableNameWithoutPgComment(t *testing.T) {
+func TestMakeCommentsWithoutPgComment(t *testing.T) {
 	type Ballot struct {
 		//nolint
 		tableName struct{} `pg:"ballots"`
@@ -64,11 +64,15 @@ func TestMakeCommentsWithTableNameWithoutPgComment(t *testing.T) {
 	model := Ballot{}
 
 	// Assert prepare
-	expectedParams := toInterfaceSlice([]pg.Safe{"ballots", "Ballot table"})
 	mockPgDB.
 		EXPECT().
-		ExecContext(ctx, "COMMENT ON TABLE ? IS ?",
-			gomock.Eq(expectedParams)).
+		ExecContext(ctx, "COMMENT ON TABLE ? IS ?", gomock.Any()).
+		Times(0).
+		Return(nil, nil)
+
+	mockPgDB.
+		EXPECT().
+		ExecContext(ctx, "COMMENT ON COLUMN ?.? IS ?", gomock.Any()).
 		Times(0).
 		Return(nil, nil)