Merge pull request #155732 from yuzefovich/blathers/backport-release-25.4-155721

yuzefovich · web-flow · commit 6377611f4f3f · 2025-10-21T10:09:22.000-07:00
release-25.4: sql: add comment about skipped FKs
diff --git a/pkg/sql/explain_bundle.go b/pkg/sql/explain_bundle.go
@@ -894,9 +894,12 @@ func (b *stmtBundleBuilder) addEnv(ctx context.Context) {
 		for _, addFK := range addFKs {
 			fmt.Fprintf(&buf, "%s;\n", addFK)
 		}
-		// Include FK constraints that were skipped in commented out form.
-		for _, skipFK := range skipFKs {
-			fmt.Fprintf(&buf, "-- %s;\n", skipFK)
+		if len(skipFKs) > 0 {
+			// Include FK constraints that were skipped in commented out form.
+			fmt.Fprintf(&buf, "-- NOTE: these FKs are active and are only commented out for ease of bundle recreation.\n--\n")
+			for _, skipFK := range skipFKs {
+				fmt.Fprintf(&buf, "-- %s;\n", skipFK)
+			}
 		}
 	}
 	for i := range views {

Original file line number	Diff line number	Diff line change
`@@ -894,9 +894,12 @@ func (b *stmtBundleBuilder) addEnv(ctx context.Context) {`
`894`	`894`	`for _, addFK := range addFKs {`
`895`	`895`	`fmt.Fprintf(&buf, "%s;\n", addFK)`
`896`	`896`	`}`
`897`		`- // Include FK constraints that were skipped in commented out form.`
`898`		`- for _, skipFK := range skipFKs {`
`899`		`- fmt.Fprintf(&buf, "-- %s;\n", skipFK)`
	`897`	`+ if len(skipFKs) > 0 {`
	`898`	`+ // Include FK constraints that were skipped in commented out form.`
	`899`	`+ fmt.Fprintf(&buf, "-- NOTE: these FKs are active and are only commented out for ease of bundle recreation.\n--\n")`
	`900`	`+ for _, skipFK := range skipFKs {`
	`901`	`+ fmt.Fprintf(&buf, "-- %s;\n", skipFK)`
	`902`	`+ }`
`900`	`903`	`}`
`901`	`904`	`}`
`902`	`905`	`for i := range views {`