fix: Correct comment statement for external tables on Cloudberry, GPDB 7+

Author: robertmu

Makefile

@@ -8,7 +8,7 @@ GINKGO_FLAGS := -r --keep-going --no-color
 GIT_VERSION := $(shell git describe --tags | perl -pe 's/(.*)-([0-9]*)-(g[0-9a-f]*)/\1+dev.\2.\3/')
 VERSION_STR="-X github.com/cloudberry-contrib/cbcopy/utils.Version=$(GIT_VERSION)"
 
-SUBDIRS_HAS_UNIT= meta/builtin/ testutils/ utils/
+SUBDIRS_HAS_UNIT= internal/dbconn/ meta/builtin/ testutils/ utils/
 GINKGO=$(shell go env GOPATH)/bin/ginkgo
 GOIMPORTS=$(shell go env GOPATH)/bin/goimports
 

meta/builtin/queries_table_defs.go

@@ -10,9 +10,9 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/apache/cloudberry-go-libs/gplog"
 	"github.com/cloudberry-contrib/cbcopy/internal/dbconn"
 	"github.com/cloudberry-contrib/cbcopy/meta/builtin/toc"
-	"github.com/apache/cloudberry-go-libs/gplog"
 )
 
 type Table struct {
@@ -27,9 +27,19 @@ func (t Table) SkipDataBackup() bool {
 
 func (t Table) GetMetadataEntry() (string, toc.MetadataEntry) {
 	objectType := "TABLE"
+	// This check identifies genuine foreign tables created with CREATE FOREIGN TABLE.
+	// It does not apply to external tables, which are identified by the IsExternal flag
+	// and have their own specific logic for GPDB 7+ below.
 	if (t.ForeignDef != ForeignTableDefinition{}) {
 		objectType = "FOREIGN TABLE"
 	}
+
+	// In GPDB 7+ and Cloudberry, external tables are implemented as foreign tables.
+	// We must set the objectType to "FOREIGN TABLE" so that the generated
+	// "COMMENT ON" statement is correct, otherwise it would fail during restore.
+	if t.IsExternal && ((srcDBVersion.IsGPDB() && srcDBVersion.AtLeast("7")) || srcDBVersion.IsCBDBFamily()) {
+		objectType = "FOREIGN TABLE"
+	}
 	// https://github.com/greenplum-db/gpbackup/commit/526b859245dcba8ecc61ea6d305330048b0ddba2
 	referenceObject := ""
 	if t.AttachPartitionInfo != (AttachPartitionInfo{}) {