Merge pull request #158406 from fqazi/skipDropColumnError

fqazi · web-flow · commit ca3452b2ae08 · 2025-11-27T08:15:02.000-05:00
release-24.3: sql: TestExplainGist ignore DROP COLUMN flakes
diff --git a/pkg/ccl/testccl/sqlccl/explain_test.go b/pkg/ccl/testccl/sqlccl/explain_test.go
@@ -215,6 +215,17 @@ func TestExplainGist(t *testing.T) {
 						return
 					}
 				}
+				// Check for declarative schema changer errors.
+				for _, stmtAndError := range []struct {
+					stmt string
+					err  string
+				}{
+					{"DROP COLUMN", "ALTER TABLE: unable to make progress"}, // #152841
+				} {
+					if strings.Contains(err.Error(), stmtAndError.err) && strings.Contains(stmt, stmtAndError.stmt) {
+						return
+					}
+				}
 				t.Log(stmts.String())
 				t.Fatalf("%v:\n%s;", err, stmt)
 			}

Original file line number	Diff line number	Diff line change
`@@ -215,6 +215,17 @@ func TestExplainGist(t *testing.T) {`
`215`	`215`	`return`
`216`	`216`	`}`
`217`	`217`	`}`
	`218`	`+ // Check for declarative schema changer errors.`
	`219`	`+ for _, stmtAndError := range []struct {`
	`220`	`+ stmt string`
	`221`	`+ err string`
	`222`	`+ }{`
	`223`	`+ {"DROP COLUMN", "ALTER TABLE: unable to make progress"}, // #152841`
	`224`	`+ } {`
	`225`	`+ if strings.Contains(err.Error(), stmtAndError.err) && strings.Contains(stmt, stmtAndError.stmt) {`
	`226`	`+ return`
	`227`	`+ }`
	`228`	`+ }`
`218`	`229`	`t.Log(stmts.String())`
`219`	`230`	`t.Fatalf("%v:\n%s;", err, stmt)`
`220`	`231`	`}`