@@ -81,9 +81,9 @@ var boolGetter = record.BoolGetter[*user]{
8181 Get : func (item * user ) bool { return item .bool },
8282}
8383
84- var enum8Getter = record.EnumGetter [* user , uint8 ]{
84+ var enum8Getter = record.ComparableGetter [* user , enum8 ]{
8585 Field : fields .New ("enum8" ),
86- Get : func (item * user ) record. Enum [ uint8 ] { return item .enum8 },
86+ Get : func (item * user ) enum8 { return item .enum8 },
8787}
8888
8989var enum16Getter = record.EnumGetter [* user , uint16 ]{
@@ -220,39 +220,39 @@ func TestComparators(t *testing.T) { //nolint:maintidx
220220 checkTestCases (t , []testCase {
221221 {
222222 name : "2 = 2" ,
223- comparator : NewEnumFieldComparator [* user , uint8 ](where .EQ , enum8Getter , enum8 (2 )),
223+ comparator : NewComparableFieldComparator [* user , enum8 ](where .EQ , enum8Getter , enum8 (2 )),
224224 expectedResult : true ,
225225 expectedCmp : where .EQ ,
226226 expectedField : "enum8" ,
227227 expectedValues : []any {enum8 (2 )},
228228 },
229229 {
230230 name : "2 = 3" ,
231- comparator : NewEnumFieldComparator [* user , uint8 ](where .EQ , enum8Getter , enum8 (3 )),
231+ comparator : NewComparableFieldComparator [* user , enum8 ](where .EQ , enum8Getter , enum8 (3 )),
232232 expectedResult : false ,
233233 expectedCmp : where .EQ ,
234234 expectedField : "enum8" ,
235235 expectedValues : []any {enum8 (3 )},
236236 },
237237 {
238238 name : "2 IN (1, 2)" ,
239- comparator : NewEnumFieldComparator [* user , uint8 ](where .InArray , enum8Getter , enum8 (1 ), enum8 (2 )),
239+ comparator : NewComparableFieldComparator [* user , enum8 ](where .InArray , enum8Getter , enum8 (1 ), enum8 (2 )),
240240 expectedResult : true ,
241241 expectedCmp : where .InArray ,
242242 expectedField : "enum8" ,
243243 expectedValues : []any {enum8 (1 ), enum8 (2 )},
244244 },
245245 {
246246 name : "2 IN (1, 3)" ,
247- comparator : NewEnumFieldComparator [* user , uint8 ](where .InArray , enum8Getter , enum8 (1 ), enum8 (3 )),
247+ comparator : NewComparableFieldComparator [* user , enum8 ](where .InArray , enum8Getter , enum8 (1 ), enum8 (3 )),
248248 expectedResult : false ,
249249 expectedCmp : where .InArray ,
250250 expectedField : "enum8" ,
251251 expectedValues : []any {enum8 (1 ), enum8 (3 )},
252252 },
253253 {
254254 name : "2 ? 2" ,
255- comparator : NewEnumFieldComparator [* user , uint8 ](0 , enum8Getter , enum8 (2 )),
255+ comparator : NewComparableFieldComparator [* user , enum8 ](0 , enum8Getter , enum8 (2 )),
256256 expectedResult : false ,
257257 expectedError : NewNotImplementComparatorError (enum8Getter .Field , 0 ),
258258 expectedCmp : 0 ,
0 commit comments