sql: Fix TestRuleAssertions to only check active version elements

Previously, TestRuleAssertions was using ForEachLementType instead of
ForEachElementInActiveVersion. This caused invalid test fails when
a new element was added in a newer version.

Epic: CRDB-31283

Release note: None

Author: shghasemi

pkg/sql/schemachanger/scplan/internal/rules/current/BUILD.bazel

@@ -54,10 +54,12 @@ go_test(
     data = glob(["testdata/**"]),
     embed = [":current"],
     deps = [
+        "//pkg/clusterversion",
         "//pkg/sql/catalog/catpb",
         "//pkg/sql/schemachanger/rel",
         "//pkg/sql/schemachanger/scpb",
         "//pkg/sql/schemachanger/scplan/internal/opgen",
+        "//pkg/sql/schemachanger/scplan/internal/rules",
         "//pkg/sql/schemachanger/screl",
         "//pkg/sql/types",
         "//pkg/testutils/datapathutils",

pkg/sql/schemachanger/scplan/internal/rules/current/assertions_test.go

@@ -11,9 +11,11 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/cockroachdb/cockroach/pkg/clusterversion"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/catpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scplan/internal/opgen"
+	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scplan/internal/rules"
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/screl"
 	"github.com/cockroachdb/cockroach/pkg/sql/types"
 	"github.com/cockroachdb/errors"
@@ -38,7 +40,8 @@ func TestRuleAssertions(t *testing.T) {
 		nameParts := strings.Split(fullName, "rules.")
 		shortName := nameParts[len(nameParts)-1]
 		t.Run(shortName, func(t *testing.T) {
-			_ = scpb.ForEachElementType(func(e scpb.Element) error {
+			cv := clusterversion.ClusterVersion{Version: rulesVersionKey.Version()}
+			_ = rules.ForEachElementInActiveVersion(cv, func(e scpb.Element) error {
 				e = nonNilElement(e)
 				if err := fn(e); err != nil {
 					t.Errorf("%T: %+v", e, err)

pkg/sql/schemachanger/scplan/internal/rules/release_25_2/BUILD.bazel

@@ -52,10 +52,12 @@ go_test(
     data = glob(["testdata/**"]),
     embed = [":release_25_2"],
     deps = [
+        "//pkg/clusterversion",
         "//pkg/sql/catalog/catpb",
         "//pkg/sql/schemachanger/rel",
         "//pkg/sql/schemachanger/scpb",
         "//pkg/sql/schemachanger/scplan/internal/opgen",
+        "//pkg/sql/schemachanger/scplan/internal/rules",
         "//pkg/sql/schemachanger/screl",
         "//pkg/sql/types",
         "//pkg/testutils/datapathutils",

pkg/sql/schemachanger/scplan/internal/rules/release_25_2/assertions_test.go

@@ -11,9 +11,11 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/cockroachdb/cockroach/pkg/clusterversion"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/catpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scplan/internal/opgen"
+	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scplan/internal/rules"
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/screl"
 	"github.com/cockroachdb/cockroach/pkg/sql/types"
 	"github.com/cockroachdb/errors"
@@ -38,7 +40,8 @@ func TestRuleAssertions(t *testing.T) {
 		nameParts := strings.Split(fullName, "rules.")
 		shortName := nameParts[len(nameParts)-1]
 		t.Run(shortName, func(t *testing.T) {
-			_ = scpb.ForEachElementType(func(e scpb.Element) error {
+			cv := clusterversion.ClusterVersion{Version: rulesVersionKey.Version()}
+			_ = rules.ForEachElementInActiveVersion(cv, func(e scpb.Element) error {
 				e = nonNilElement(e)
 				if err := fn(e); err != nil {
 					t.Errorf("%T: %+v", e, err)

pkg/sql/schemachanger/scplan/internal/rules/release_25_3/BUILD.bazel

@@ -52,10 +52,12 @@ go_test(
     data = glob(["testdata/**"]),
     embed = [":release_25_3"],
     deps = [
+        "//pkg/clusterversion",
         "//pkg/sql/catalog/catpb",
         "//pkg/sql/schemachanger/rel",
         "//pkg/sql/schemachanger/scpb",
         "//pkg/sql/schemachanger/scplan/internal/opgen",
+        "//pkg/sql/schemachanger/scplan/internal/rules",
         "//pkg/sql/schemachanger/screl",
         "//pkg/sql/types",
         "//pkg/testutils/datapathutils",

pkg/sql/schemachanger/scplan/internal/rules/release_25_3/assertions_test.go

@@ -11,9 +11,11 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/cockroachdb/cockroach/pkg/clusterversion"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/catpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scplan/internal/opgen"
+	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scplan/internal/rules"
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/screl"
 	"github.com/cockroachdb/cockroach/pkg/sql/types"
 	"github.com/cockroachdb/errors"
@@ -38,7 +40,8 @@ func TestRuleAssertions(t *testing.T) {
 		nameParts := strings.Split(fullName, "rules.")
 		shortName := nameParts[len(nameParts)-1]
 		t.Run(shortName, func(t *testing.T) {
-			_ = scpb.ForEachElementType(func(e scpb.Element) error {
+			cv := clusterversion.ClusterVersion{Version: rulesVersionKey.Version()}
+			_ = rules.ForEachElementInActiveVersion(cv, func(e scpb.Element) error {
 				e = nonNilElement(e)
 				if err := fn(e); err != nil {
 					t.Errorf("%T: %+v", e, err)

pkg/sql/schemachanger/scplan/internal/rules/release_25_4/BUILD.bazel

@@ -54,10 +54,12 @@ go_test(
     data = glob(["testdata/**"]),
     embed = [":release_25_4"],
     deps = [
+        "//pkg/clusterversion",
         "//pkg/sql/catalog/catpb",
         "//pkg/sql/schemachanger/rel",
         "//pkg/sql/schemachanger/scpb",
         "//pkg/sql/schemachanger/scplan/internal/opgen",
+        "//pkg/sql/schemachanger/scplan/internal/rules",
         "//pkg/sql/schemachanger/screl",
         "//pkg/sql/types",
         "//pkg/testutils/datapathutils",

pkg/sql/schemachanger/scplan/internal/rules/release_25_4/assertions_test.go

@@ -11,9 +11,11 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/cockroachdb/cockroach/pkg/clusterversion"
 	"github.com/cockroachdb/cockroach/pkg/sql/catalog/catpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scpb"
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scplan/internal/opgen"
+	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/scplan/internal/rules"
 	"github.com/cockroachdb/cockroach/pkg/sql/schemachanger/screl"
 	"github.com/cockroachdb/cockroach/pkg/sql/types"
 	"github.com/cockroachdb/errors"
@@ -38,7 +40,8 @@ func TestRuleAssertions(t *testing.T) {
 		nameParts := strings.Split(fullName, "rules.")
 		shortName := nameParts[len(nameParts)-1]
 		t.Run(shortName, func(t *testing.T) {
-			_ = scpb.ForEachElementType(func(e scpb.Element) error {
+			cv := clusterversion.ClusterVersion{Version: rulesVersionKey.Version()}
+			_ = rules.ForEachElementInActiveVersion(cv, func(e scpb.Element) error {
 				e = nonNilElement(e)
 				if err := fn(e); err != nil {
 					t.Errorf("%T: %+v", e, err)